v1.3.1

- Updated to newest FragmentFramework library - Added argument structure for better thread safety - Added thread breakpoints (app will shut down thread on exit) - Added VisualStudio 2013 project files
matusnovak · Aug 19, 2015 · 7be213e · 7be213e
1 parent 47024ed
commit 7be213e
Show file tree

Hide file tree

Showing 235 changed files with 11,463 additions and 13,231 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,15 +1,38 @@
 # Compiled Object files
+*.obj
 *.slo
 *.lo
-*.o
 *.obj
+*.o
 
-log.txt
+# Visual Studio
+*.pdb
+*.ilk
+*.sdf
+*.suo
+*.log
+*.tlog
+*.ipch
+*.pdb
+*.exp
+*.opensdf
+*.user
+*.filters
+*.exe.manifest
 
-objects/
+*.exe
+log.txt
 
-third-party-libs/wxWidgets
+!FragmentFramework.exp
+!FragmentFramework.pdb
+!FragmentFramework-debug.exp
+!FragmentFramework-debug.pdb
 
-# Code::Blocks files
+# Code::Blocks
 *.layout
+*.save
+*.save-failed
+*.save-fail
 *.depend
+
+objects/
diff --git a/SM2OBJ.cbp b/SM2OBJ.cbp
@@ -15,13 +15,14 @@
 				<Compiler>
 					<Add option="-g" />
 					<Add option="-std=c++11" />
-					<Add directory="third-party-libs/FragmentFramework/include" />
-					<Add directory="third-party-libs/zlib/include" />
+					<Add directory="dependencies/FragmentFramework/include" />
+					<Add directory="dependencies/zlib/include" />
 				</Compiler>
 				<Linker>
-					<Add library="FragmentFramework" />
-					<Add directory="third-party-libs/FragmentFramework/lib/mingw" />
-					<Add directory="third-party-libs/zlib/include/lib" />
+					<Add library="FragmentFramework-debug" />
+					<Add library="libz" />
+					<Add directory="dependencies/FragmentFramework/lib/mingw" />
+					<Add directory="dependencies/zlib/lib/mingw" />
 				</Linker>
 			</Target>
 			<Target title="Release">
@@ -32,14 +33,15 @@
 				<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="dependencies/FragmentFramework/include" />
+					<Add directory="dependencies/zlib/include" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
 					<Add library="FragmentFramework" />
-					<Add directory="third-party-libs/FragmentFramework/lib/mingw" />
-					<Add directory="third-party-libs/zlib/include/lib" />
+					<Add library="libz" />
+					<Add directory="dependencies/FragmentFramework/lib/mingw" />
+					<Add directory="dependencies/zlib/lib/mingw" />
 				</Linker>
 			</Target>
 		</Build>
@@ -73,7 +75,6 @@
 		<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" />
@@ -82,14 +83,11 @@
 		<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" />
+		<Unit filename="source/window.hpp" />
 		<Extensions>
 			<code_completion />
 			<envvars />

diff --git a/SM2OBJ.sln b/SM2OBJ.sln
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Express 2013 for Windows Desktop
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SM2OBJ", "SM2OBJ.vcxproj", "{DC37F45B-306F-41D5-930D-82C708856CF1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DC37F45B-306F-41D5-930D-82C708856CF1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DC37F45B-306F-41D5-930D-82C708856CF1}.Debug|Win32.Build.0 = Debug|Win32
+		{DC37F45B-306F-41D5-930D-82C708856CF1}.Release|Win32.ActiveCfg = Release|Win32
+		{DC37F45B-306F-41D5-930D-82C708856CF1}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/SM2OBJ.vcxproj b/SM2OBJ.vcxproj
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DC37F45B-306F-41D5-930D-82C708856CF1}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>MySM2OBJ</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>release\</OutDir>
+    <IntDir>objects\release\msvc</IntDir>
+    <TargetName>SM2OBJ-debug</TargetName>
+    <EmbedManifest>false</EmbedManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>release\</OutDir>
+    <IntDir>objects\debug\msvc</IntDir>
+    <TargetName>SM2OBJ</TargetName>
+    <EmbedManifest>false</EmbedManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>dependencies\zlib\include;dependencies\FragmentFramework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>FragmentFramework-debug.lib;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>dependencies\zlib\lib\msvc;dependencies\FragmentFramework\lib\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>dependencies\zlib\include;dependencies\FragmentFramework\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>FragmentFramework.lib;libz.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>dependencies\zlib\lib\msvc;dependencies\FragmentFramework\lib\msvc;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <EntryPointSymbol>main</EntryPointSymbol>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="source\defaults.cpp" />
+    <ClCompile Include="source\exporter\blockConfig.cpp" />
+    <ClCompile Include="source\exporter\blockConstructor.cpp" />
+    <ClCompile Include="source\exporter\blockExtractor.cpp" />
+    <ClCompile Include="source\exporter\blockVerticeData.cpp" />
+    <ClCompile Include="source\exporter\chunkHeader.cpp" />
+    <ClCompile Include="source\exporter\chunkLoader.cpp" />
+    <ClCompile Include="source\exporter\chunkTempLoader.cpp" />
+    <ClCompile Include="source\exporter\config.cpp" />
+    <ClCompile Include="source\exporter\exportBlueprint.cpp" />
+    <ClCompile Include="source\exporter\loadMeta.cpp" />
+    <ClCompile Include="source\exporter\materialExport.cpp" />
+    <ClCompile Include="source\exporter\polygonFiltering.cpp" />
+    <ClCompile Include="source\exporter\textureExport.cpp" />
+    <ClCompile Include="source\main.cpp" />
+    <ClCompile Include="source\window.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="source\defaults.h" />
+    <ClInclude Include="source\exporter\blockConfig.h" />
+    <ClInclude Include="source\exporter\blockConstructor.h" />
+    <ClInclude Include="source\exporter\blockExtractor.h" />
+    <ClInclude Include="source\exporter\blockVerticeData.h" />
+    <ClInclude Include="source\exporter\chunkHeader.h" />
+    <ClInclude Include="source\exporter\chunkLoader.h" />
+    <ClInclude Include="source\exporter\chunkTempLoader.h" />
+    <ClInclude Include="source\exporter\config.h" />
+    <ClInclude Include="source\exporter\exportBlueprint.h" />
+    <ClInclude Include="source\exporter\loadMeta.h" />
+    <ClInclude Include="source\exporter\materialExport.h" />
+    <ClInclude Include="source\exporter\polygonFiltering.h" />
+    <ClInclude Include="source\exporter\textureExport.h" />
+    <ClInclude Include="source\window.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resources\resources.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="resources\application.manifest" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/dependencies/FragmentFramework/include/config.h b/dependencies/FragmentFramework/include/config.h
@@ -0,0 +1,24 @@
+#ifndef FFW_CONFIG
+#define FFW_CONFIG
+
+#if __cplusplus < 201103L
+//  #error This library needs at least a C++11 compliant compiler
+#endif
+
+#define UNICODE 1
+
+#ifdef FFW_EXPORTS
+#define FFW_API __declspec(dllexport)
+#else
+#define FFW_API __declspec(dllimport)
+#endif
+
+#ifdef _MSC_VER
+#define _USING_MSVC
+#pragma warning( disable: 4251 )
+#endif
+#ifdef __MINGW32__
+#define _USING_MINGW
+#endif
+
+#endif
diff --git a/dependencies/FragmentFramework/include/ffw.h b/dependencies/FragmentFramework/include/ffw.h
@@ -0,0 +1,55 @@
+/*
+*   This file is part of FragmentFramework framework.
+*   Copyright (C) 2013-2015 by Matus Novak [email protected]
+*   Licensed under the MIT License
+*/
+
+#ifndef FRAGMENT_FRAMEWORK
+#define FRAGMENT_FRAMEWORK
+
+#include "config.h"
+#include "gl/monitors.hpp"
+#include "gl/extensions.hpp"
+#include "graphics/basicDraw.hpp"
+#include "graphics/bufferObjectPool.hpp"
+#include "graphics/bufferObject.hpp"
+#include "graphics/framebuffer.hpp"
+#include "graphics/shader.hpp"
+#include "graphics/texture2D.hpp"
+#include "graphics/texture2DArray.hpp"
+#include "graphics/font.hpp"
+#include "math/math.h"
+#include "network/networkUtils.hpp"
+#include "network/udpListener.hpp"
+#include "network/udpSender.hpp"
+#include "network/tcpServer.hpp"
+#include "network/tcpClient.hpp"
+#include "serial/serialManager.hpp"
+#include "systemUserInterface/uiWindow.hpp"
+#include "systemUserInterface/uiButton.hpp"
+#include "systemUtils/directory.hpp"
+#include "systemUtils/win32SysUtils.hpp"
+#include "utilities/fileUtilities.hpp"
+#include "fileLoaders/bmpFile.hpp"
+#include "fileLoaders/jsonFile.hpp"
+#include "fileLoaders/objFile.hpp"
+#include "fileLoaders/pbmFile.hpp"
+#include "fileLoaders/pngFile.hpp"
+#include "fileLoaders/jpgFile.hpp"
+#include "fileLoaders/txtFile.hpp"
+#include "fileLoaders/tgaFile.hpp"
+#include "fileLoaders/tiffFile.hpp"
+#include "fileLoaders/wavFile.hpp"
+#include "fileLoaders/xmlFile.hpp"
+#include "fileLoaders/oggFile.hpp"
+#include "utilities/file.hpp"
+#include "utilities/logger.hpp"
+#include "utilities/thread.hpp"
+#include "utilities/usleep.hpp"
+#include "utilities/mutex.hpp"
+#include "utilities/timer.hpp"
+#include "utilities/serialization.hpp"
+#include "render/renderContext.hpp"
+#include "render/appRenderWindow.hpp"
+
+#endif