Ver Fonte

Windows compilation tweaks

Ivan Safrin há 10 anos atrás
pai
commit
3b395a20d8

+ 4 - 0
build/windows/universal/PolycodeCore/PolycodeCore.vcxproj

@@ -27,6 +27,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\core\PolyBasicFileProvider.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyBezierCurve.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyBone.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyCamera.cpp" />
@@ -34,6 +35,7 @@
     <ClCompile Include="..\..\..\..\src\core\PolyColor.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyConfig.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyCore.cpp" />
+    <ClCompile Include="..\..\..\..\src\core\PolyCoreFileProvider.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyCoreInput.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyCoreServices.cpp" />
     <ClCompile Include="..\..\..\..\src\core\PolyCubemap.cpp" />
@@ -103,6 +105,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\Polycode.h" />
+    <ClInclude Include="..\..\..\..\include\polycode\core\PolyBasicFileProvider.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyBezierCurve.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyBone.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyCamera.h" />
@@ -111,6 +114,7 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyColor.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyConfig.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyCore.h" />
+    <ClInclude Include="..\..\..\..\include\polycode\core\PolyCoreFileProvider.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyCoreInput.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyCoreServices.h" />
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyCubemap.h" />

+ 12 - 0
build/windows/universal/PolycodeCore/PolycodeCore.vcxproj.filters

@@ -232,6 +232,12 @@
     <ClCompile Include="..\..\..\..\src\core\PolyUWPCore.cpp">
       <Filter>Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\core\PolyBasicFileProvider.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\core\PolyCoreFileProvider.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\Polycode.h">
@@ -465,5 +471,11 @@
     <ClInclude Include="..\..\..\..\include\polycode\core\PolyUWPCore.h">
       <Filter>Include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\include\polycode\core\PolyBasicFileProvider.h">
+      <Filter>Include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\polycode\core\PolyCoreFileProvider.h">
+      <Filter>Include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

BIN
build/windows/universal/TemplateApp/Generated Files/App.xbf


BIN
build/windows/universal/TemplateApp/Generated Files/MainPage.xbf


+ 2 - 2
build/windows/universal/TemplateApp/PolycodeTemplateApp.cpp

@@ -7,8 +7,8 @@
 
 PolycodeTemplateApp::PolycodeTemplateApp(PolycodeView *view) {
     core = new POLYCODE_CORE(view, 1280,720,false,false, 0,0,60);
-	CoreServices::getInstance()->getResourceManager()->addArchive("default.pak");
-	CoreServices::getInstance()->getResourceManager()->addDirResource("default");
+//	CoreServices::getInstance()->getResourceManager()->addArchive("default.pak");
+	//CoreServices::getInstance()->getResourceManager()->addDirResource("default");
 
 	// Write your code here!
     

+ 1 - 1
include/polycode/core/PolyGlobals.h

@@ -77,7 +77,7 @@ typedef unsigned int PolyRendererIndexType;
 #define PLATFORM_MAC      2
 #define PLATFORM_UNIX     3
 
-#if defined(_WINDOWS) || defined(WINAPI_FAMILY_APP)
+#if defined(_WINDOWS) || defined(WINAPI_FAMILY)
 	#define PLATFORM PLATFORM_WINDOWS
 #elif defined(__APPLE__) && defined(__MACH__)
 	#define PLATFORM PLATFORM_MAC

+ 1 - 0
include/polycode/core/PolyUWPCore.h

@@ -40,5 +40,6 @@ class UWPCore : public Core {
 	void openURL(String url);
 	unsigned int getTicks();
 	String executeExternalCommand(String command, String args, String inDirectory);
+	bool systemParseFolder(const Polycode::String& pathString, bool showHidden, std::vector<OSFileEntry> &targetVector);
 
 };

BIN
lib/windows/x64/Polycore.lib


+ 6 - 5
src/core/PolyMesh.cpp

@@ -25,6 +25,7 @@ THE SOFTWARE.
 #include "polycode/core/PolyMesh.h"
 #include "polycode/core/PolyLogger.h"
 #include "polycode/core/PolyCore.h"
+#include "polycode/core/PolyCoreFileProvider.h"
 
 using std::min;
 using std::max;
@@ -120,7 +121,7 @@ void Mesh::writeVertexBlock(VertexDataArray *array, Polycode::CoreFile *outFile)
     outFile->write(array->getArrayData(), sizeof(PolyRendererVertexType), array->getDataSize());
 }
 
-void Mesh::writeIndexBlock(IndexDataArray *array, CoreFile *outFile) {
+void Mesh::writeIndexBlock(IndexDataArray *array, Polycode::CoreFile *outFile) {
     
     if(array->getDataSize() == 0) {
         return;
@@ -135,7 +136,7 @@ void Mesh::writeIndexBlock(IndexDataArray *array, CoreFile *outFile) {
     outFile->write(array->getArrayData(), sizeof(PolyRendererIndexType), array->getDataSize());
 }
 
-void Mesh::saveToFile(CoreFile *outFile, bool writeNormals, bool writeTangents, bool writeColors, bool writeBoneWeights, bool writeUVs, bool writeSecondaryUVs) {
+void Mesh::saveToFile(Polycode::CoreFile *outFile, bool writeNormals, bool writeTangents, bool writeColors, bool writeBoneWeights, bool writeUVs, bool writeSecondaryUVs) {
 
     // new mesh format
     // IMPORTANT: PolyRendererVertexType type defines mesh format internal type. Consider making floats always. Don't want to cast for now.
@@ -183,7 +184,7 @@ void Mesh::saveToFile(CoreFile *outFile, bool writeNormals, bool writeTangents,
     }
 }
 
-void Mesh::loadFromFile(CoreFile *inFile) {
+void Mesh::loadFromFile(Polycode::CoreFile *inFile) {
     clearMesh();
     
     char tag[4];
@@ -197,7 +198,7 @@ void Mesh::loadFromFile(CoreFile *inFile) {
     }
 }
 
-void Mesh::loadFromFileV2(CoreFile *inFile) {
+void Mesh::loadFromFileV2(Polycode::CoreFile *inFile) {
     
     unsigned char meshFlags;
     inFile->read(&meshFlags, sizeof(unsigned char), 1);
@@ -264,7 +265,7 @@ void Mesh::normalizeBoneWeights() {
     }
 }
 
-void Mesh::loadFromFileLegacyV1(CoreFile *inFile) {
+void Mesh::loadFromFileLegacyV1(Polycode::CoreFile *inFile) {
     
     unsigned char meshFlags;
     inFile->read(&meshFlags, sizeof(unsigned char), 1);

+ 8 - 0
src/core/PolyUWPCore.cpp

@@ -94,4 +94,12 @@ unsigned int UWPCore::getTicks() {
 
 String UWPCore::executeExternalCommand(String command, String args, String inDirectory) {
 	return "";
+}
+
+bool UWPCore::systemParseFolder(const Polycode::String& pathString, bool showHidden, std::vector<OSFileEntry> &targetVector) {
+	return false;
+}
+
+void Core::getScreenInfo(int *width, int *height, int *hz) {
+
 }