v1.3

- Added emissive atlas export - Attachments (docked ships and turrets) can now be exported - Removed WxWidgets and replaced with original Win32 GUI - Added option to select texture size - Fixed crash when exporting BMP textures - Changed the program flow to recursive due to the attachments - Added global namespace - Removed variables in global scope - Updated FFW library
matusnovak · Jun 30, 2015 · da4e8fd · da4e8fd
1 parent d521aac
commit da4e8fd
Show file tree

Hide file tree

Showing 98 changed files with 5,025 additions and 3,221 deletions.
diff --git a/README.md b/README.md
diff --git a/SM2OBJ.cbp b/SM2OBJ.cbp
@@ -8,125 +8,92 @@
 		<Build>
 			<Target title="Debug">
 				<Option output="release/SM2OBJ" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="release/" />
 				<Option object_output="objects/debug/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
-				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-g" />
-					<Add option="-D__WXDEBUG__" />
+					<Add option="-std=c++11" />
 					<Add directory="third-party-libs/FragmentFramework/include" />
 					<Add directory="third-party-libs/zlib/include" />
-					<Add directory="C:/wxWidgets/include" />
 				</Compiler>
 				<Linker>
 					<Add library="FragmentFramework" />
-					<Add library="libwx_mswu_core-3.0.dll.a" />
-					<Add library="libwx_baseu-3.0.dll.a" />
-					<Add directory="third-party-libs/FragmentFramework/lib" />
+					<Add directory="third-party-libs/FragmentFramework/lib/mingw" />
 					<Add directory="third-party-libs/zlib/include/lib" />
-					<Add directory="C:/wxWidgets/lib" />
 				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="release/SM2OBJ" prefix_auto="1" extension_auto="1" />
 				<Option object_output="objects/release/" />
-				<Option type="1" />
+				<Option type="0" />
 				<Option compiler="gcc" />
-				<Option use_console_runner="0" />
-				<Option projectLinkerOptionsRelation="2" />
 				<Compiler>
 					<Add option="-O2" />
 					<Add option="-std=c++11" />
 					<Add directory="third-party-libs/FragmentFramework/include" />
 					<Add directory="third-party-libs/zlib/include" />
-					<Add directory="C:/wxWidgets/include" />
-					<Add directory="C:/wxWidgets/lib/wx/include/msw-unicode-3.0" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add library="FragmentFramework" />
-					<Add library="libwx_mswu_core-3.0.dll.a" />
-					<Add library="libwx_baseu-3.0.dll.a" />
-					<Add directory="third-party-libs/FragmentFramework/lib" />
+					<Add directory="third-party-libs/FragmentFramework/lib/mingw" />
 					<Add directory="third-party-libs/zlib/include/lib" />
-					<Add directory="C:/wxWidgets/lib" />
 				</Linker>
-				<Environment>
-					<Variable name="wx" value="C:\wxWidgets\interface" />
-				</Environment>
 			</Target>
 		</Build>
 		<Compiler>
-			<Add option="-pipe" />
-			<Add option="-mthreads" />
 			<Add option="-Wall" />
-			<Add option="-D__GNUWIN32__" />
-			<Add option="-D__WXMSW__" />
 		</Compiler>
-		<ResourceCompiler>
-			<Add directory="C:/wxWidgets/include" />
-		</ResourceCompiler>
 		<Linker>
-			<Add option="-mthreads" />
-			<Add library="libkernel32.a" />
-			<Add library="libuser32.a" />
-			<Add library="libgdi32.a" />
-			<Add library="libwinspool.a" />
-			<Add library="libcomdlg32.a" />
-			<Add library="libadvapi32.a" />
-			<Add library="libshell32.a" />
-			<Add library="libole32.a" />
-			<Add library="liboleaut32.a" />
-			<Add library="libuuid.a" />
-			<Add library="libcomctl32.a" />
-			<Add library="libwsock32.a" />
-			<Add library="libodbc32.a" />
+			<Add library="gdi32" />
+			<Add library="user32" />
+			<Add library="kernel32" />
+			<Add library="comctl32" />
 		</Linker>
-		<Unit filename="resource.rc">
+		<Unit filename="resources/resources.rc">
 			<Option compilerVar="WINDRES" />
 		</Unit>
-		<Unit filename="source/blockConfig.cpp" />
-		<Unit filename="source/blockConfig.h" />
-		<Unit filename="source/blockConstructor.cpp" />
-		<Unit filename="source/blockConstructor.h" />
-		<Unit filename="source/blockExtractor.cpp" />
-		<Unit filename="source/blockExtractor.h" />
-		<Unit filename="source/blockVerticeData.cpp" />
-		<Unit filename="source/blockVerticeData.h" />
-		<Unit filename="source/chunkHeader.cpp" />
-		<Unit filename="source/chunkHeader.h" />
-		<Unit filename="source/chunkLoader.cpp" />
-		<Unit filename="source/chunkLoader.h" />
-		<Unit filename="source/chunkTempLoader.cpp" />
-		<Unit filename="source/chunkTempLoader.h" />
-		<Unit filename="source/config.cpp" />
-		<Unit filename="source/config.h" />
-		<Unit filename="source/mainExporter.cpp" />
-		<Unit filename="source/mainExporter.h" />
-		<Unit filename="source/materialExport.cpp" />
-		<Unit filename="source/materialExport.h" />
-		<Unit filename="source/polygonFiltering.cpp" />
-		<Unit filename="source/polygonFiltering.h" />
-		<Unit filename="source/textureExport.cpp" />
-		<Unit filename="source/textureExport.h" />
-		<Unit filename="widgets/SM2OBJApp.cpp" />
-		<Unit filename="widgets/SM2OBJApp.h" />
-		<Unit filename="widgets/SM2OBJMain.cpp" />
-		<Unit filename="widgets/SM2OBJMain.h" />
-		<Unit filename="wxsmith/SM2OBJframe.wxs" />
+		<Unit filename="source/defaults.cpp" />
+		<Unit filename="source/defaults.h" />
+		<Unit filename="source/exporter/blockConfig.cpp" />
+		<Unit filename="source/exporter/blockConfig.h" />
+		<Unit filename="source/exporter/blockConstructor.cpp" />
+		<Unit filename="source/exporter/blockConstructor.h" />
+		<Unit filename="source/exporter/blockExtractor.cpp" />
+		<Unit filename="source/exporter/blockExtractor.h" />
+		<Unit filename="source/exporter/blockVerticeData.cpp" />
+		<Unit filename="source/exporter/blockVerticeData.h" />
+		<Unit filename="source/exporter/chunkHeader.cpp" />
+		<Unit filename="source/exporter/chunkHeader.h" />
+		<Unit filename="source/exporter/chunkLoader.cpp" />
+		<Unit filename="source/exporter/chunkLoader.h" />
+		<Unit filename="source/exporter/chunkTempLoader.cpp" />
+		<Unit filename="source/exporter/chunkTempLoader.h" />
+		<Unit filename="source/exporter/config.cpp" />
+		<Unit filename="source/exporter/config.h" />
+		<Unit filename="source/exporter/constants.h" />
+		<Unit filename="source/exporter/exportBlueprint.cpp" />
+		<Unit filename="source/exporter/exportBlueprint.h" />
+		<Unit filename="source/exporter/loadMeta.cpp" />
+		<Unit filename="source/exporter/loadMeta.h" />
+		<Unit filename="source/exporter/materialExport.cpp" />
+		<Unit filename="source/exporter/materialExport.h" />
+		<Unit filename="source/exporter/polygonFiltering.cpp" />
+		<Unit filename="source/exporter/polygonFiltering.h" />
+		<Unit filename="source/exporter/structures.h" />
+		<Unit filename="source/exporter/textureExport.cpp" />
+		<Unit filename="source/exporter/textureExport.h" />
+		<Unit filename="source/main.cpp" />
+		<Unit filename="source/widgets.cpp" />
+		<Unit filename="source/widgets.h" />
+		<Unit filename="source/window.cpp" />
+		<Unit filename="source/window.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
 			<debugger />
-			<lib_finder disable_auto="1" />
-			<wxsmith version="1">
-				<gui name="wxWidgets" src="widgets/SM2OBJApp.cpp" main="SM2OBJFrame" init_handlers="necessary" language="CPP" />
-				<resources>
-					<wxFrame wxs="wxsmith/SM2OBJframe.wxs" src="widgets/SM2OBJMain.cpp" hdr="widgets/SM2OBJMain.h" fwddecl="0" i18n="1" name="SM2OBJFrame" language="CPP" />
-				</resources>
-			</wxsmith>
 		</Extensions>
 	</Project>
 </CodeBlocks_project_file>
diff --git a/release/user-input.json b/release/user-input.json
@@ -0,0 +1,19 @@
+{
+    "export-attachments": true,
+    "exportMaterials": true,
+    "input-blueprint-folder": "C:\\Program Files (x86)\\StarMade\\blueprints\\Isanth Type-Zero Mb",
+    "input-data-folder": "C:\\Program Files (x86)\\data",
+    "num-of-threads": "8",
+    "output-file-folder": "C:\\output",
+    "output-texture-folder": "C:\\output\\textures",
+    "specular-highlight": false,
+    "texture-export-type": 0,
+    "texture-normals": 1,
+    "texture-output-format": 0,
+    "texture-tile-size": 2,
+    "use-alpha-textures": true,
+    "use-diffuse-textures": true,
+    "use-emissive-textures": true,
+    "use-normal-textures": true,
+    "uv-maps-options": 1
+}
diff --git a/resource.rc b/resource.rc
diff --git a/resources/application.manifest b/resources/application.manifest
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="Win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0"
+                        processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/resources/icon.ico b/resources/icon.ico
diff --git a/resources/resources.rc b/resources/resources.rc
@@ -0,0 +1,2 @@
+1 24 "resources/application.manifest"
+11 ICON "resources/icon.ico"
diff --git a/source/blockConfig.h b/source/blockConfig.h
diff --git a/source/blockConstructor.h b/source/blockConstructor.h
diff --git a/source/blockExtractor.h b/source/blockExtractor.h
diff --git a/source/blockVerticeData.h b/source/blockVerticeData.h
diff --git a/source/chunkHeader.h b/source/chunkHeader.h
diff --git a/source/chunkLoader.h b/source/chunkLoader.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		1 24 "resources/application.manifest"
		11 ICON "resources/icon.ico"