SWM: Ported Editors\ECore

OpenXRay · Jan 15, 2018 · d752ba2 · d752ba2
1 parent 03e0948
commit d752ba2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/editors/ECore/Editor/EditObject.h b/src/editors/ECore/Editor/EditObject.h
@@ -572,6 +572,10 @@ class ECORE_API CEditableObject :
     virtual void LL_SetBoneVisible(u16 bone_id, BOOL val, BOOL bRecursive) { VERIFY(false); }
     virtual u64 LL_GetBonesVisible() { return u64(-1); }
     virtual void LL_SetBonesVisible(u64 mask) { VERIFY(false); }
+
+    virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset){}; //--#SM+#--
+    virtual void LL_ClearAdditionalTransform(u16 bone_id){}; //--#SM+#--
+
     // Main functionality
     virtual void CalculateBones(BOOL bForceExact = FALSE) {} // Recalculate skeleton
     virtual void CalculateBones_Invalidate() {}

diff --git a/src/editors/ECore/Editor/PhysicsShellHolderEditorBase.h b/src/editors/ECore/Editor/PhysicsShellHolderEditorBase.h
@@ -14,6 +14,7 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
 protected:
     CPhysicsShellHolderEditorBase() : m_physics_shell(0), m_object_xform(Fidentity) {}
     ~CPhysicsShellHolderEditorBase() { /*DeletePhysicsShell	();*/}
+
 protected:
     CPhysicsShell* m_physics_shell;
     Fmatrix m_object_xform;
@@ -25,6 +26,7 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
     virtual bool _BCL ObjectGetDestroy() const { return false; };
     virtual ICollisionHitCallback* _BCL ObjectGetCollisionHitCallback() { return 0; }
     virtual u16 _BCL ObjectID() const { return u16(-1); }
+    virtual IGameObject* _BCL IObject() { return 0; } //--#SM+#--
     virtual ICollisionForm* _BCL ObjectCollisionModel()
     {
         VERIFY(false);
@@ -44,14 +46,18 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
     virtual bool _BCL IsInventoryItem() { return false; }
     virtual bool _BCL IsActor() { return false; }
     virtual bool _BCL IsStalker() { return false; }
+    virtual bool _BCL IsCollideWithBullets() { return false; } //--#SM+#--
+    virtual bool _BCL IsCollideWithActorCamera() { return false; } //--#SM+#--
     // virtual	void						SetWeaponHideState					( u16 State, bool bSet )=0;
     virtual void _BCL HideAllWeapons(bool v) {} //(SetWeaponHideState(INV_STATE_BLOCK_ALL,true))
     virtual void _BCL MovementCollisionEnable(bool enable) {}
     virtual CPHSoundPlayer* _BCL ObjectPhSoundPlayer() { return 0; }
     virtual ICollisionDamageReceiver* _BCL ObjectPhCollisionDamageReceiver() { return 0; }
     virtual void _BCL BonceDamagerCallback(float& damage_factor) {}
+
 public:
     virtual Fmatrix& _BCL ObjectXFORM() { return m_object_xform; }
+
 private:
     virtual Fvector& _BCL ObjectPosition() { return m_object_xform.c; }
 #ifdef DEBUG