Skip to content

Commit d752ba2

Browse files
ShokerStlkXottab-DUTY
authored andcommitted
SWM: Ported Editors\ECore
1 parent 03e0948 commit d752ba2

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/editors/ECore/Editor/EditObject.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,10 @@ class ECORE_API CEditableObject :
572572
virtual void LL_SetBoneVisible(u16 bone_id, BOOL val, BOOL bRecursive) { VERIFY(false); }
573573
virtual u64 LL_GetBonesVisible() { return u64(-1); }
574574
virtual void LL_SetBonesVisible(u64 mask) { VERIFY(false); }
575+
576+
virtual void LL_AddTransformToBone(KinematicsABT::additional_bone_transform& offset){}; //--#SM+#--
577+
virtual void LL_ClearAdditionalTransform(u16 bone_id){}; //--#SM+#--
578+
575579
// Main functionality
576580
virtual void CalculateBones(BOOL bForceExact = FALSE) {} // Recalculate skeleton
577581
virtual void CalculateBones_Invalidate() {}

src/editors/ECore/Editor/PhysicsShellHolderEditorBase.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
1414
protected:
1515
CPhysicsShellHolderEditorBase() : m_physics_shell(0), m_object_xform(Fidentity) {}
1616
~CPhysicsShellHolderEditorBase() { /*DeletePhysicsShell ();*/}
17+
1718
protected:
1819
CPhysicsShell* m_physics_shell;
1920
Fmatrix m_object_xform;
@@ -25,6 +26,7 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
2526
virtual bool _BCL ObjectGetDestroy() const { return false; };
2627
virtual ICollisionHitCallback* _BCL ObjectGetCollisionHitCallback() { return 0; }
2728
virtual u16 _BCL ObjectID() const { return u16(-1); }
29+
virtual IGameObject* _BCL IObject() { return 0; } //--#SM+#--
2830
virtual ICollisionForm* _BCL ObjectCollisionModel()
2931
{
3032
VERIFY(false);
@@ -44,14 +46,18 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
4446
virtual bool _BCL IsInventoryItem() { return false; }
4547
virtual bool _BCL IsActor() { return false; }
4648
virtual bool _BCL IsStalker() { return false; }
49+
virtual bool _BCL IsCollideWithBullets() { return false; } //--#SM+#--
50+
virtual bool _BCL IsCollideWithActorCamera() { return false; } //--#SM+#--
4751
// virtual void SetWeaponHideState ( u16 State, bool bSet )=0;
4852
virtual void _BCL HideAllWeapons(bool v) {} //(SetWeaponHideState(INV_STATE_BLOCK_ALL,true))
4953
virtual void _BCL MovementCollisionEnable(bool enable) {}
5054
virtual CPHSoundPlayer* _BCL ObjectPhSoundPlayer() { return 0; }
5155
virtual ICollisionDamageReceiver* _BCL ObjectPhCollisionDamageReceiver() { return 0; }
5256
virtual void _BCL BonceDamagerCallback(float& damage_factor) {}
57+
5358
public:
5459
virtual Fmatrix& _BCL ObjectXFORM() { return m_object_xform; }
60+
5561
private:
5662
virtual Fvector& _BCL ObjectPosition() { return m_object_xform.c; }
5763
#ifdef DEBUG

0 commit comments

Comments
 (0)