Планы#82 Стандартизация имен директорий с кодом

proj/sxae/vs2013/sxae.vcxproj

@@ -104,7 +104,7 @@
     <ClCompile Include="..\..\..\source\sxae\TabManager.cpp" />
     <ClCompile Include="..\..\..\source\sxae\TabSkins.cpp" />
     <ClCompile Include="..\..\..\source\sxae\Tools.cpp" />
-    <ClCompile Include="..\..\..\source\sxanim\animated.cpp" />
+    <ClCompile Include="..\..\..\source\anim\animated.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\source\sxae\Camera.h" />

proj/sxae/vs2013/sxae.vcxproj.filters

@@ -48,7 +48,7 @@
     <ClCompile Include="..\..\..\source\sxae\Camera.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sxanim\animated.cpp">
+    <ClCompile Include="..\..\..\source\anim\animated.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\sxae\Tools.cpp">

proj/sxanim/vs2013/sxanim.vcxproj

@@ -93,13 +93,13 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\common\string.cpp" />
-    <ClCompile Include="..\..\..\source\sxanim\animated.cpp" />
-    <ClCompile Include="..\..\..\source\sxanim\sxanim_dll.cpp" />
+    <ClCompile Include="..\..\..\source\anim\animated.cpp" />
+    <ClCompile Include="..\..\..\source\anim\sxanim_dll.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\sxanim\animated.h" />
-    <ClInclude Include="..\..\..\source\sxanim\ModelFile.h" />
-    <ClInclude Include="..\..\..\source\sxanim\sxanim.h" />
+    <ClInclude Include="..\..\..\source\anim\animated.h" />
+    <ClInclude Include="..\..\..\source\anim\ModelFile.h" />
+    <ClInclude Include="..\..\..\source\anim\sxanim.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

proj/sxanim/vs2013/sxanim.vcxproj.filters

@@ -15,10 +15,10 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\sxanim\animated.cpp">
+    <ClCompile Include="..\..\..\source\anim\animated.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sxanim\sxanim_dll.cpp">
+    <ClCompile Include="..\..\..\source\anim\sxanim_dll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\source\common\string.cpp">
@@ -26,13 +26,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\sxanim\ModelFile.h">
+    <ClInclude Include="..\..\..\source\anim\ModelFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\sxanim\sxanim.h">
+    <ClInclude Include="..\..\..\source\anim\sxanim.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\sxanim\animated.h">
+    <ClInclude Include="..\..\..\source\anim\animated.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

proj/sxphysics/vs2013/sxphysics.vcxproj

@@ -87,12 +87,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\sxphysics\PhyWorld.cpp" />
-    <ClCompile Include="..\..\..\source\sxphysics\sxphysics_dll.cpp" />
+    <ClCompile Include="..\..\..\source\physics\PhyWorld.cpp" />
+    <ClCompile Include="..\..\..\source\physics\sxphysics_dll.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\sxphysics\PhyWorld.h" />
-    <ClInclude Include="..\..\..\source\sxphysics\sxphysics.h" />
+    <ClInclude Include="..\..\..\source\physics\PhyWorld.h" />
+    <ClInclude Include="..\..\..\source\physics\sxphysics.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

proj/sxphysics/vs2013/sxphysics.vcxproj.filters

@@ -15,18 +15,18 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\source\sxphysics\sxphysics_dll.cpp">
+    <ClCompile Include="..\..\..\source\physics\sxphysics_dll.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\source\sxphysics\PhyWorld.cpp">
+    <ClCompile Include="..\..\..\source\physics\PhyWorld.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\source\sxphysics\sxphysics.h">
+    <ClInclude Include="..\..\..\source\physics\sxphysics.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\source\sxphysics\PhyWorld.h">
+    <ClInclude Include="..\..\..\source\physics\PhyWorld.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>

source/SkyXEngine.h

@@ -231,11 +231,11 @@ QT стиль документирования (!) и QT_AUTOBRIEF - корот
 #else
 #pragma comment(lib, "sxanim.lib")
 #endif
-#include <sxanim/sxanim.h>
+#include <anim/sxanim.h>
 
 #if defined(_DEBUG)
 #pragma comment(lib, "sxphysics_d.lib")
 #else
 #pragma comment(lib, "sxphysics.lib")
 #endif
-#include <sxphysics/sxphysics.h>
+#include <physics/sxphysics.h>

source/core/sxcore.h

@@ -190,7 +190,7 @@ __inline void Core_SetOutPtr()
 		return;
 	}
 	int hOut = _open_osfhandle(sock, O_RDONLY | O_RDWR | O_WRONLY | _O_APPEND);
-	FILE * fOut = ::fdopen(hOut, "a+");
+	FILE * fOut = ::_fdopen(hOut, "a+");
 	::setvbuf(fOut, NULL, _IONBF, 0);
 
 	*stdout = *fOut;

source/sxphysics/sxphysics_dll.cpp → source/physics/sxphysics_dll.cpp

@@ -99,10 +99,12 @@ SX_LIB_API void SXPhysics_Dbg_Set(report_func rf)
 
 SX_LIB_API void SXPhysics_LoadGeom()
 {
+	SP_PRECOND(_VOID);
 	g_pWorld->LoadGeom();
 }
 
 SX_LIB_API void SXPhysics_DebugRender()
 {
+	SP_PRECOND(_VOID);
 	g_pWorld->Render();
 }

source/sxae/Editor.cpp

 #include "Editor.h"
 
+#include <Commdlg.h>
+
 #include <ShlObj.h>
 
 #if defined(_DEBUG)

source/sxae/Editor.h

@@ -10,7 +10,7 @@
 #include "TabManager.h"
 
 //#include <anim/ModelFile.h>
-#include <sxanim/animated.h>
+#include <anim/animated.h>
 
 #include "Camera.h"
 #include "EMessages.h"

source/sxae/TabActivities.h

@@ -2,7 +2,7 @@
 #define TabActivities_H
 
 #include "EditorTab.h"
-#include <sxanim/animated.h>
+#include <anim/animated.h>
 
 class TabActivities:public EditorTab
 {