Skip to content

Commit d39c7f0

Browse files
Xottab-DUTYXottab-DUTY
committed
ECore: removed some files, edited others
1 parent fd363b4 commit d39c7f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+128
-3645
lines changed

‎src/editors/ActorEditor/UI_ActorTools.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class EngineModel : public CPhysicsShellHolderEditorBase
5252

5353
struct BPPlayItem
5454
{
55-
AnsiString name;
55+
xr_string name;
5656
u16 slot;
5757
};
5858

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

9595
private:
96-
// virtual Fmatrix& _BCL ObjectXFORM() { return m_pobject_matrix; }
97-
// virtual Fvector& _BCL ObjectPosition() { return m_pobject_matrix.c; }
98-
// virtual IRenderVisual* _BCL ObjectVisual() { return m_pVisual; }
99-
virtual IKinematics* _BCL ObjectKinematics()
96+
// virtual Fmatrix& ObjectXFORM() { return m_pobject_matrix; }
97+
// virtual Fvector& ObjectPosition() { return m_pobject_matrix.c; }
98+
// virtual IRenderVisual* ObjectVisual() { return m_pVisual; }
99+
virtual IKinematics* ObjectKinematics()
100100
{
101101
if (!m_pVisual)
102102
return 0;

‎src/editors/ECore/ECore.vcxproj‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,10 @@
6363
<ClInclude Include="Editor\D3DUtils.h" />
6464
<ClInclude Include="Editor\D3DX_Wrapper.h" />
6565
<ClInclude Include="Editor\device.h" />
66-
<ClInclude Include="Editor\DrawUtils.h" />
6766
<ClInclude Include="Editor\du_box.h" />
6867
<ClInclude Include="Editor\du_cone.h" />
6968
<ClInclude Include="Editor\du_cylinder.h" />
7069
<ClInclude Include="Editor\du_sphere.h" />
71-
<ClInclude Include="Editor\du_sphere_part.h" />
7270
<ClInclude Include="Editor\EDetailModel.h" />
7371
<ClInclude Include="Editor\EditMesh.h" />
7472
<ClInclude Include="Editor\EditObject.h" />
@@ -102,15 +100,8 @@
102100
<ClInclude Include="Editor\UI_MainCommand.h" />
103101
<ClInclude Include="Editor\UI_ToolsCustom.h" />
104102
<ClInclude Include="Engine\ai_sounds.h" />
105-
<ClInclude Include="Engine\cl_collector.h" />
106-
<ClInclude Include="Engine\cl_intersect.h" />
107-
<ClInclude Include="Engine\GameMtlLib.h" />
108103
<ClInclude Include="Engine\guid_generator.h" />
109104
<ClInclude Include="Engine\Image.h" />
110-
<ClInclude Include="Engine\NVMeshMender.h" />
111-
<ClInclude Include="Engine\nv_algebra.h" />
112-
<ClInclude Include="Engine\nv_math.h" />
113-
<ClInclude Include="Engine\nv_mathdecl.h" />
114105
<ClInclude Include="Engine\Texture.h" />
115106
<ClInclude Include="stdafx.h" />
116107
</ItemGroup>
@@ -125,7 +116,6 @@
125116
<ClCompile Include="Editor\du_cone.cpp" />
126117
<ClCompile Include="Editor\du_cylinder.cpp" />
127118
<ClCompile Include="Editor\du_sphere.cpp" />
128-
<ClCompile Include="Editor\du_sphere_part.cpp" />
129119
<ClCompile Include="Editor\EDetailModel.cpp" />
130120
<ClCompile Include="Editor\EditMesh.cpp" />
131121
<ClCompile Include="Editor\EditMeshIO.cpp" />
@@ -169,16 +159,9 @@
169159
<ClCompile Include="Editor\UI_MainCommand.cpp" />
170160
<ClCompile Include="Editor\UI_MainMail.cpp" />
171161
<ClCompile Include="Editor\UI_ToolsCustom.cpp" />
172-
<ClCompile Include="Editor\xrLoadSurface.cpp" />
173162
<ClCompile Include="Engine\ai_sounds.cpp" />
174-
<ClCompile Include="Engine\bone.cpp" />
175-
<ClCompile Include="Engine\cl_collector.cpp" />
176-
<ClCompile Include="Engine\GameMtlLib.cpp" />
177-
<ClCompile Include="Engine\GameMtlLib_Engine.cpp" />
178163
<ClCompile Include="Engine\guid_generator.cpp" />
179164
<ClCompile Include="Engine\Image.cpp" />
180-
<ClCompile Include="Engine\NVMeshMender.cpp" />
181-
<ClCompile Include="Engine\nv_algebra.cpp" />
182165
<ClCompile Include="stdafx.cpp">
183166
<PrecompiledHeader>Create</PrecompiledHeader>
184167
</ClCompile>

‎src/editors/ECore/ECore.vcxproj.filters‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
<ClInclude Include="Editor\device.h">
2626
<Filter>editor</Filter>
2727
</ClInclude>
28-
<ClInclude Include="Editor\DrawUtils.h">
29-
<Filter>editor</Filter>
30-
</ClInclude>
3128
<ClInclude Include="Editor\du_box.h">
3229
<Filter>editor</Filter>
3330
</ClInclude>
@@ -40,9 +37,6 @@
4037
<ClInclude Include="Editor\du_sphere.h">
4138
<Filter>editor</Filter>
4239
</ClInclude>
43-
<ClInclude Include="Editor\du_sphere_part.h">
44-
<Filter>editor</Filter>
45-
</ClInclude>
4640
<ClInclude Include="Editor\EDetailModel.h">
4741
<Filter>editor</Filter>
4842
</ClInclude>
@@ -142,33 +136,12 @@
142136
<ClInclude Include="Engine\ai_sounds.h">
143137
<Filter>engine</Filter>
144138
</ClInclude>
145-
<ClInclude Include="Engine\cl_collector.h">
146-
<Filter>engine</Filter>
147-
</ClInclude>
148-
<ClInclude Include="Engine\cl_intersect.h">
149-
<Filter>engine</Filter>
150-
</ClInclude>
151-
<ClInclude Include="Engine\GameMtlLib.h">
152-
<Filter>engine</Filter>
153-
</ClInclude>
154139
<ClInclude Include="Engine\guid_generator.h">
155140
<Filter>engine</Filter>
156141
</ClInclude>
157142
<ClInclude Include="Engine\Image.h">
158143
<Filter>engine</Filter>
159144
</ClInclude>
160-
<ClInclude Include="Engine\nv_algebra.h">
161-
<Filter>engine</Filter>
162-
</ClInclude>
163-
<ClInclude Include="Engine\nv_math.h">
164-
<Filter>engine</Filter>
165-
</ClInclude>
166-
<ClInclude Include="Engine\nv_mathdecl.h">
167-
<Filter>engine</Filter>
168-
</ClInclude>
169-
<ClInclude Include="Engine\NVMeshMender.h">
170-
<Filter>engine</Filter>
171-
</ClInclude>
172145
<ClInclude Include="Engine\Texture.h">
173146
<Filter>engine</Filter>
174147
</ClInclude>
@@ -205,9 +178,6 @@
205178
<ClCompile Include="Editor\du_sphere.cpp">
206179
<Filter>editor</Filter>
207180
</ClCompile>
208-
<ClCompile Include="Editor\du_sphere_part.cpp">
209-
<Filter>editor</Filter>
210-
</ClCompile>
211181
<ClCompile Include="Editor\EDetailModel.cpp">
212182
<Filter>editor</Filter>
213183
</ClCompile>
@@ -337,36 +307,15 @@
337307
<ClCompile Include="Editor\UI_ToolsCustom.cpp">
338308
<Filter>editor</Filter>
339309
</ClCompile>
340-
<ClCompile Include="Editor\xrLoadSurface.cpp">
341-
<Filter>editor</Filter>
342-
</ClCompile>
343310
<ClCompile Include="Engine\ai_sounds.cpp">
344311
<Filter>engine</Filter>
345312
</ClCompile>
346-
<ClCompile Include="Engine\bone.cpp">
347-
<Filter>engine</Filter>
348-
</ClCompile>
349-
<ClCompile Include="Engine\cl_collector.cpp">
350-
<Filter>engine</Filter>
351-
</ClCompile>
352-
<ClCompile Include="Engine\GameMtlLib.cpp">
353-
<Filter>engine</Filter>
354-
</ClCompile>
355-
<ClCompile Include="Engine\GameMtlLib_Engine.cpp">
356-
<Filter>engine</Filter>
357-
</ClCompile>
358313
<ClCompile Include="Engine\guid_generator.cpp">
359314
<Filter>engine</Filter>
360315
</ClCompile>
361316
<ClCompile Include="Engine\Image.cpp">
362317
<Filter>engine</Filter>
363318
</ClCompile>
364-
<ClCompile Include="Engine\nv_algebra.cpp">
365-
<Filter>engine</Filter>
366-
</ClCompile>
367-
<ClCompile Include="Engine\NVMeshMender.cpp">
368-
<Filter>engine</Filter>
369-
</ClCompile>
370319
<ClCompile Include="stdafx.cpp" />
371320
</ItemGroup>
372321
</Project>

‎src/editors/ECore/Editor/ColorPicker.cpp‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include "ColorPicker.h"
66

7+
/*
78
class CTCD
89
{
910
public:
@@ -19,13 +20,15 @@ class CTCD
1920
~CTCD() { xr_delete(cdColor); }
2021
};
2122
22-
static CTCD TCD;
23+
static CTCD TCD;*/
2324

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

26-
bool SelectColor(u32* currentcolor, bool bDefaultPicker)
28+
[[deprecated]] bool SelectColor(u32* currentcolor, bool bDefaultPicker)
2729
{
28-
VERIFY(currentcolor);
30+
return false;
31+
/*VERIFY(currentcolor);
2932
if (bDefaultPicker)
3033
{
3134
TCD.cdColor->Color = TColor(rgb2bgr(*currentcolor));
@@ -45,12 +48,13 @@ bool SelectColor(u32* currentcolor, bool bDefaultPicker)
4548
return true;
4649
}
4750
return false;
48-
}
51+
}*/
4952
}
5053

51-
bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
54+
[[deprecated]] bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
5255
{
53-
VERIFY(currentcolor);
56+
return false;
57+
/*VERIFY(currentcolor);
5458
if (bDefaultPicker)
5559
{
5660
TCD.cdColor->Color = TColor(*currentcolor);
@@ -70,5 +74,5 @@ bool SelectColorWin(u32* currentcolor, bool bDefaultPicker)
7074
return true;
7175
}
7276
return false;
73-
}
77+
}*/
7478
}

‎src/editors/ECore/Editor/DrawUtils.h‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎src/editors/ECore/Editor/EThumbnail.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "Layers/xrRender/ETextureParams.h"
55
#include "xrServerEntities/PropertiesListHelper.h"
66

7-
#include "MXCtrls.hpp"
7+
//#include "MXCtrls.hpp"
88
//------------------------------------------------------------------------------
99
// Custom class
1010
//------------------------------------------------------------------------------

‎src/editors/ECore/Editor/EThumbnailObject.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ void EObjectThumbnail::Save(int age, LPCSTR path)
115115

116116
void EObjectThumbnail::FillProp(PropItemVec& items)
117117
{
118-
PHelper().CreateCaption(items, "Face Count", AnsiString(face_count).c_str());
119-
PHelper().CreateCaption(items, "Vertex Count", AnsiString(vertex_count).c_str());
118+
PHelper().CreateCaption(items, "Face Count", xr_string(face_count).c_str());
119+
PHelper().CreateCaption(items, "Vertex Count", xr_string(vertex_count).c_str());
120120
}
121121

122122
//------------------------------------------------------------------------------
123123

124124
void EObjectThumbnail::FillInfo(PropItemVec& items)
125125
{
126-
PHelper().CreateCaption(items, "Face Count", AnsiString(face_count).c_str());
127-
PHelper().CreateCaption(items, "Vertex Count", AnsiString(vertex_count).c_str());
126+
PHelper().CreateCaption(items, "Face Count", xr_string(face_count).c_str());
127+
PHelper().CreateCaption(items, "Vertex Count", xr_string(vertex_count).c_str());
128128
}
129129

130130
//------------------------------------------------------------------------------

‎src/editors/ECore/Editor/GeometryCollector.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ VCPacked::VCPacked(const Fbox& bb, float _eps, u32 _sx, u32 _sy, u32 _sz, int ap
1919
VM.resize(sx * sy * sz);
2020

2121
// Params
22-
VMscale.set(bb.max.x - bb.min.x, bb.max.y - bb.min.y, bb.max.z - bb.min.z);
23-
VMmin.set(bb.min);
22+
VMscale.set(bb.vMax.x - bb.vMin.x, bb.vMax.y - bb.vMin.y, bb.vMax.z - bb.vMin.z);
23+
VMmin.set(bb.vMin);
2424
VMeps.set(VMscale.x / (sx - 1) / 2, VMscale.y / (sy - 1) / 2, VMscale.z / (sz - 1) / 2);
2525
VMeps.x = (VMeps.x < EPS_L) ? VMeps.x : EPS_L;
2626
VMeps.y = (VMeps.y < EPS_L) ? VMeps.y : EPS_L;

‎src/editors/ECore/Editor/ImageEditor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "mxPlacemnt.hpp"
1414
#include <ImgList.hpp>
1515

16-
#include "MXCtrls.hpp"
16+
//#include "MXCtrls.hpp"
1717

1818
//---------------------------------------------------------------------------
1919
// refs

‎src/editors/ECore/Editor/Library.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#ifndef LibraryH
66
#define LibraryH
77

8-
#include "pure.h"
8+
#include "xrEngine/pure.h"
99
#include "editors/xrEProps/FolderLib.h"
1010
//----------------------------------------------------
1111
class CEditableObject;
@@ -15,7 +15,7 @@ DEFINE_MAP_PRED(AnsiString, CEditableObject*, EditObjMap, EditObjPairIt, astr_pr
1515
class ECORE_API ELibrary //: public pureDeviceCreate, public pureDeviceDestroy
1616
{
1717
bool m_bReady;
18-
friendclass TfrmChoseObject;
18+
friend class TfrmChoseObject;
1919
EditObjMap m_EditObjects;
2020

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

28-
void__stdcall RemoveObject(LPCSTR fname, EItemType type, bool& res);
29-
void__stdcall RenameObject(LPCSTR fn0, LPCSTR fn1, EItemType type);
28+
void __stdcall RemoveObject(LPCSTR fname, EItemType type, bool& res);
29+
void __stdcall RenameObject(LPCSTR fn0, LPCSTR fn1, EItemType type);
3030

3131
void OnCreate();
3232
void OnDestroy();

0 commit comments

Comments
 (0)