Skip to content

Commit

Permalink
ECore: removed some files, edited others
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Mar 19, 2018
1 parent fd363b4 commit d39c7f0
Show file tree
Hide file tree
Showing 44 changed files with 128 additions and 3,645 deletions.
10 changes: 5 additions & 5 deletions src/editors/ActorEditor/UI_ActorTools.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class EngineModel : public CPhysicsShellHolderEditorBase

struct BPPlayItem
{
AnsiString name;
xr_string name;
u16 slot;
};

Expand Down Expand Up @@ -93,10 +93,10 @@ class EngineModel : public CPhysicsShellHolderEditorBase
CMotion* FindMotionKeys(LPCSTR name, u16 slot);

private:
// virtual Fmatrix& _BCL ObjectXFORM() { return m_pobject_matrix; }
// virtual Fvector& _BCL ObjectPosition() { return m_pobject_matrix.c; }
// virtual IRenderVisual* _BCL ObjectVisual() { return m_pVisual; }
virtual IKinematics* _BCL ObjectKinematics()
// virtual Fmatrix& ObjectXFORM() { return m_pobject_matrix; }
// virtual Fvector& ObjectPosition() { return m_pobject_matrix.c; }
// virtual IRenderVisual* ObjectVisual() { return m_pVisual; }
virtual IKinematics* ObjectKinematics()
{
if (!m_pVisual)
return 0;
Expand Down
17 changes: 0 additions & 17 deletions src/editors/ECore/ECore.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,10 @@
<ClInclude Include="Editor\D3DUtils.h" />
<ClInclude Include="Editor\D3DX_Wrapper.h" />
<ClInclude Include="Editor\device.h" />
<ClInclude Include="Editor\DrawUtils.h" />
<ClInclude Include="Editor\du_box.h" />
<ClInclude Include="Editor\du_cone.h" />
<ClInclude Include="Editor\du_cylinder.h" />
<ClInclude Include="Editor\du_sphere.h" />
<ClInclude Include="Editor\du_sphere_part.h" />
<ClInclude Include="Editor\EDetailModel.h" />
<ClInclude Include="Editor\EditMesh.h" />
<ClInclude Include="Editor\EditObject.h" />
Expand Down Expand Up @@ -102,15 +100,8 @@
<ClInclude Include="Editor\UI_MainCommand.h" />
<ClInclude Include="Editor\UI_ToolsCustom.h" />
<ClInclude Include="Engine\ai_sounds.h" />
<ClInclude Include="Engine\cl_collector.h" />
<ClInclude Include="Engine\cl_intersect.h" />
<ClInclude Include="Engine\GameMtlLib.h" />
<ClInclude Include="Engine\guid_generator.h" />
<ClInclude Include="Engine\Image.h" />
<ClInclude Include="Engine\NVMeshMender.h" />
<ClInclude Include="Engine\nv_algebra.h" />
<ClInclude Include="Engine\nv_math.h" />
<ClInclude Include="Engine\nv_mathdecl.h" />
<ClInclude Include="Engine\Texture.h" />
<ClInclude Include="stdafx.h" />
</ItemGroup>
Expand All @@ -125,7 +116,6 @@
<ClCompile Include="Editor\du_cone.cpp" />
<ClCompile Include="Editor\du_cylinder.cpp" />
<ClCompile Include="Editor\du_sphere.cpp" />
<ClCompile Include="Editor\du_sphere_part.cpp" />
<ClCompile Include="Editor\EDetailModel.cpp" />
<ClCompile Include="Editor\EditMesh.cpp" />
<ClCompile Include="Editor\EditMeshIO.cpp" />
Expand Down Expand Up @@ -169,16 +159,9 @@
<ClCompile Include="Editor\UI_MainCommand.cpp" />
<ClCompile Include="Editor\UI_MainMail.cpp" />
<ClCompile Include="Editor\UI_ToolsCustom.cpp" />
<ClCompile Include="Editor\xrLoadSurface.cpp" />
<ClCompile Include="Engine\ai_sounds.cpp" />
<ClCompile Include="Engine\bone.cpp" />
<ClCompile Include="Engine\cl_collector.cpp" />
<ClCompile Include="Engine\GameMtlLib.cpp" />
<ClCompile Include="Engine\GameMtlLib_Engine.cpp" />
<ClCompile Include="Engine\guid_generator.cpp" />
<ClCompile Include="Engine\Image.cpp" />
<ClCompile Include="Engine\NVMeshMender.cpp" />
<ClCompile Include="Engine\nv_algebra.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
Expand Down
51 changes: 0 additions & 51 deletions src/editors/ECore/ECore.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
<ClInclude Include="Editor\device.h">
<Filter>editor</Filter>
</ClInclude>
<ClInclude Include="Editor\DrawUtils.h">
<Filter>editor</Filter>
</ClInclude>
<ClInclude Include="Editor\du_box.h">
<Filter>editor</Filter>
</ClInclude>
Expand All @@ -40,9 +37,6 @@
<ClInclude Include="Editor\du_sphere.h">
<Filter>editor</Filter>
</ClInclude>
<ClInclude Include="Editor\du_sphere_part.h">
<Filter>editor</Filter>
</ClInclude>
<ClInclude Include="Editor\EDetailModel.h">
<Filter>editor</Filter>
</ClInclude>
Expand Down Expand Up @@ -142,33 +136,12 @@
<ClInclude Include="Engine\ai_sounds.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\cl_collector.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\cl_intersect.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\GameMtlLib.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\guid_generator.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\Image.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\nv_algebra.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\nv_math.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\nv_mathdecl.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\NVMeshMender.h">
<Filter>engine</Filter>
</ClInclude>
<ClInclude Include="Engine\Texture.h">
<Filter>engine</Filter>
</ClInclude>
Expand Down Expand Up @@ -205,9 +178,6 @@
<ClCompile Include="Editor\du_sphere.cpp">
<Filter>editor</Filter>
</ClCompile>
<ClCompile Include="Editor\du_sphere_part.cpp">
<Filter>editor</Filter>
</ClCompile>
<ClCompile Include="Editor\EDetailModel.cpp">
<Filter>editor</Filter>
</ClCompile>
Expand Down Expand Up @@ -337,36 +307,15 @@
<ClCompile Include="Editor\UI_ToolsCustom.cpp">
<Filter>editor</Filter>
</ClCompile>
<ClCompile Include="Editor\xrLoadSurface.cpp">
<Filter>editor</Filter>
</ClCompile>
<ClCompile Include="Engine\ai_sounds.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\bone.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\cl_collector.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\GameMtlLib.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\GameMtlLib_Engine.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\guid_generator.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\Image.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\nv_algebra.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="Engine\NVMeshMender.cpp">
<Filter>engine</Filter>
</ClCompile>
<ClCompile Include="stdafx.cpp" />
</ItemGroup>
</Project>
18 changes: 11 additions & 7 deletions src/editors/ECore/Editor/ColorPicker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include "ColorPicker.h"

/*
class CTCD
{
public:
Expand All @@ -19,13 +20,15 @@ class CTCD
~CTCD() { xr_delete(cdColor); }
};
static CTCD TCD;
static CTCD TCD;*/

// XXX: Find and delete.
extern "C" DLL_API bool FSColorPickerExecute(u32* currentColor, LPDWORD originalColor, const int initialExpansionState);

bool SelectColor(u32* currentcolor, bool bDefaultPicker)
[[deprecated]] bool SelectColor(u32* currentcolor, bool bDefaultPicker)
{
VERIFY(currentcolor);
return false;
/*VERIFY(currentcolor);
if (bDefaultPicker)
{
TCD.cdColor->Color = TColor(rgb2bgr(*currentcolor));
Expand All @@ -45,12 +48,13 @@ bool SelectColor(u32* currentcolor, bool bDefaultPicker)
return true;
}
return false;
}
}*/
}

bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
[[deprecated]] bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
{
VERIFY(currentcolor);
return false;
/*VERIFY(currentcolor);
if (bDefaultPicker)
{
TCD.cdColor->Color = TColor(*currentcolor);
Expand All @@ -70,5 +74,5 @@ bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
return true;
}
return false;
}
}*/
}
1 change: 0 additions & 1 deletion src/editors/ECore/Editor/DrawUtils.h
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/editors/ECore/Editor/EThumbnail.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "Layers/xrRender/ETextureParams.h"
#include "xrServerEntities/PropertiesListHelper.h"

#include "MXCtrls.hpp"
//#include "MXCtrls.hpp"
//------------------------------------------------------------------------------
// Custom class
//------------------------------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions src/editors/ECore/Editor/EThumbnailObject.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ void EObjectThumbnail::Save(int age, LPCSTR path)

void EObjectThumbnail::FillProp(PropItemVec& items)
{
PHelper().CreateCaption(items, "Face Count", AnsiString(face_count).c_str());
PHelper().CreateCaption(items, "Vertex Count", AnsiString(vertex_count).c_str());
PHelper().CreateCaption(items, "Face Count", xr_string(face_count).c_str());
PHelper().CreateCaption(items, "Vertex Count", xr_string(vertex_count).c_str());
}

//------------------------------------------------------------------------------

void EObjectThumbnail::FillInfo(PropItemVec& items)
{
PHelper().CreateCaption(items, "Face Count", AnsiString(face_count).c_str());
PHelper().CreateCaption(items, "Vertex Count", AnsiString(vertex_count).c_str());
PHelper().CreateCaption(items, "Face Count", xr_string(face_count).c_str());
PHelper().CreateCaption(items, "Vertex Count", xr_string(vertex_count).c_str());
}

//------------------------------------------------------------------------------
4 changes: 2 additions & 2 deletions src/editors/ECore/Editor/GeometryCollector.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ VCPacked::VCPacked(const Fbox& bb, float _eps, u32 _sx, u32 _sy, u32 _sz, int ap
VM.resize(sx * sy * sz);

// Params
VMscale.set(bb.max.x - bb.min.x, bb.max.y - bb.min.y, bb.max.z - bb.min.z);
VMmin.set(bb.min);
VMscale.set(bb.vMax.x - bb.vMin.x, bb.vMax.y - bb.vMin.y, bb.vMax.z - bb.vMin.z);
VMmin.set(bb.vMin);
VMeps.set(VMscale.x / (sx - 1) / 2, VMscale.y / (sy - 1) / 2, VMscale.z / (sz - 1) / 2);
VMeps.x = (VMeps.x < EPS_L) ? VMeps.x : EPS_L;
VMeps.y = (VMeps.y < EPS_L) ? VMeps.y : EPS_L;
Expand Down
2 changes: 1 addition & 1 deletion src/editors/ECore/Editor/ImageEditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "mxPlacemnt.hpp"
#include <ImgList.hpp>

#include "MXCtrls.hpp"
//#include "MXCtrls.hpp"

//---------------------------------------------------------------------------
// refs
Expand Down
8 changes: 4 additions & 4 deletions src/editors/ECore/Editor/Library.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef LibraryH
#define LibraryH

#include "pure.h"
#include "xrEngine/pure.h"
#include "editors/xrEProps/FolderLib.h"
//----------------------------------------------------
class CEditableObject;
Expand All @@ -15,7 +15,7 @@ DEFINE_MAP_PRED(AnsiString, CEditableObject*, EditObjMap, EditObjPairIt, astr_pr
class ECORE_API ELibrary //: public pureDeviceCreate, public pureDeviceDestroy
{
bool m_bReady;
friendclass TfrmChoseObject;
friend class TfrmChoseObject;
EditObjMap m_EditObjects;

CEditableObject* LoadEditObject(LPCSTR full_name);
Expand All @@ -25,8 +25,8 @@ class ECORE_API ELibrary //: public pureDeviceCreate, public pureDeviceDestroy
ELibrary();
virtual ~ELibrary();

void__stdcall RemoveObject(LPCSTR fname, EItemType type, bool& res);
void__stdcall RenameObject(LPCSTR fn0, LPCSTR fn1, EItemType type);
void __stdcall RemoveObject(LPCSTR fname, EItemType type, bool& res);
void __stdcall RenameObject(LPCSTR fn0, LPCSTR fn1, EItemType type);

void OnCreate();
void OnDestroy();
Expand Down
2 changes: 1 addition & 1 deletion src/editors/ECore/Editor/MinimapEditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <Forms.hpp>
#include "ExtBtn.hpp"
#include <ExtCtrls.hpp>
#include "MXCtrls.hpp"
//#include "MXCtrls.hpp"
#include "ElEdits.hpp"
#include "ElSpin.hpp"
#include "ElXPThemedControl.hpp"
Expand Down
60 changes: 30 additions & 30 deletions src/editors/ECore/Editor/PhysicsShellHolderEditorBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,48 +22,48 @@ class ECORE_API CPhysicsShellHolderEditorBase : public IPhysicsShellHolder
Fmatrix m_object_xform;

private:
virtual LPCSTR _BCL ObjectName() const { return "EditorActor"; }
virtual LPCSTR _BCL ObjectNameVisual() const { return "unknown"; }
virtual LPCSTR _BCL ObjectNameSect() const { return "unknown"; }
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()
virtual LPCSTR ObjectName() const { return "EditorActor"; }
virtual LPCSTR ObjectNameVisual() const { return "unknown"; }
virtual LPCSTR ObjectNameSect() const { return "unknown"; }
virtual bool ObjectGetDestroy() const { return false; };
virtual ICollisionHitCallback* ObjectGetCollisionHitCallback() { return 0; }
virtual u16 ObjectID() const { return u16(-1); }
virtual IGameObject* IObject() { return 0; } //--#SM+#--
virtual ICollisionForm* ObjectCollisionModel()
{
VERIFY(false);
return 0;
}
// virtual IRenderVisual* _BCL ObjectVisual () { return
// m_pVisual;}
virtual IDamageSource* _BCL ObjectCastIDamageSource() { return 0; }
virtual void _BCL ObjectProcessingDeactivate() { ; }
virtual void _BCL ObjectProcessingActivate() {}
virtual void _BCL ObjectSpatialMove() {}
virtual CPhysicsShell*& _BCL ObjectPPhysicsShell() { return m_physics_shell; }
virtual void _BCL enable_notificate() {}
virtual bool _BCL has_parent_object() { return false; }
virtual void _BCL on_physics_disable() {}
virtual IPHCapture* _BCL PHCapture() { return 0; }
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 IDamageSource* ObjectCastIDamageSource() { return 0; }
virtual void ObjectProcessingDeactivate() { ; }
virtual void ObjectProcessingActivate() {}
virtual void ObjectSpatialMove() {}
virtual CPhysicsShell*& ObjectPPhysicsShell() { return m_physics_shell; }
virtual void enable_notificate() {}
virtual bool has_parent_object() { return false; }
virtual void on_physics_disable() {}
virtual IPHCapture* PHCapture() { return 0; }
virtual bool IsInventoryItem() { return false; }
virtual bool IsActor() { return false; }
virtual bool IsStalker() { return false; }
virtual bool IsCollideWithBullets() { return false; } //--#SM+#--
virtual bool 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) {}
virtual void HideAllWeapons(bool v) {} //(SetWeaponHideState(INV_STATE_BLOCK_ALL,true))
virtual void MovementCollisionEnable(bool enable) {}
virtual CPHSoundPlayer* ObjectPhSoundPlayer() { return 0; }
virtual ICollisionDamageReceiver* ObjectPhCollisionDamageReceiver() { return 0; }
virtual void BonceDamagerCallback(float& damage_factor) {}

public:
virtual Fmatrix& _BCL ObjectXFORM() { return m_object_xform; }
virtual Fmatrix& ObjectXFORM() { return m_object_xform; }

private:
virtual Fvector& _BCL ObjectPosition() { return m_object_xform.c; }
virtual Fvector& ObjectPosition() { return m_object_xform.c; }
#ifdef DEBUG
virtual std::string _BCL dump(EDumpType type) const
virtual std::string dump(EDumpType type) const
{
VERIFY(false);
return std::string("ActorEditor!");
Expand Down
Loading

0 comments on commit d39c7f0

Please sign in to comment.