added right dll (x86 for SDL2 & glew32)

renamed Posterfiles
added libVersions

diff --git a/CGUE2015_Weave.sln b/CGUE2015_Weave.sln
index 7475201df787aa5759d82c0f8a7fa045378c1d59..e9d1777eeb8de9dfe6f721f7b9e8cff658aab9a4 100644 (file)
--- a/CGUE2015_Weave.sln
+++ b/CGUE2015_Weave.sln
@@ -5,6 +5,16 @@ VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weave", "Weave\Weave.vcxproj", "{A2F0B06D-880C-4B90-9D4B-8B174418E1BE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shader", "shader", "{75179EFC-6C76-4220-A1FE-3CE24BA3EAAE}"
+       ProjectSection(SolutionItems) = preProject
+               shader\basic_FS.hlsl = shader\basic_FS.hlsl
+               shader\basic_VS.hlsl = shader\basic_VS.hlsl
+               shader\basicTexture_FS.hlsl = shader\basicTexture_FS.hlsl
+               shader\basicTexture_VS.hlsl = shader\basicTexture_VS.hlsl
+               shader\lightingTexture_FS.hlsl = shader\lightingTexture_FS.hlsl
+               shader\perspective_VS.hlsl = shader\perspective_VS.hlsl
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Win32 = Debug|Win32

diff --git a/Weave/Weave.vcxproj b/Weave/Weave.vcxproj
index ea1e2f1b4c31b991fbc8711cefc9731ba9c3de2b..065812305e53c07cd7aa5dd1d7b24a06d03b3ba3 100644 (file)
--- a/Weave/Weave.vcxproj
+++ b/Weave/Weave.vcxproj
@@ -61,6 +61,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);$(SolutionDir)lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>OpenGL32.lib;SDL2.lib;SDL2main.lib;freetype.lib;zdll.lib;glew32.lib;FreeImage.lib;assimp.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='bin|Win32'">
@@ -81,9 +82,20 @@
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(SolutionDir)lib\$(PlatformTarget);$(SolutionDir)lib</AdditionalLibraryDirectories>
       <AdditionalDependencies>OpenGL32.lib;SDL2.lib;SDL2main.lib;freetype.lib;zdll.lib;glew32.lib;FreeImage.lib;assimp.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Fps.cpp" />
+    <ClCompile Include="Graphix\Graphix.cpp" />
+    <ClCompile Include="main.cpp" />
+    <ClCompile Include="Message.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Average.h" />
+    <ClInclude Include="Fps.h" />
+    <ClInclude Include="Graphix\Graphix.h" />
+    <ClInclude Include="Message.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/Weave/Weave.vcxproj.filters b/Weave/Weave.vcxproj.filters
index 6a1782f7d75e3eee655efe5b8a48a12726b2d9e1..026f3d35c1ef4df3416df24e4d89b4b12808ea9d 100644 (file)
--- a/Weave/Weave.vcxproj.filters
+++ b/Weave/Weave.vcxproj.filters
@@ -14,4 +14,32 @@
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Fps.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Graphix\Graphix.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Message.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Fps.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Average.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Graphix\Graphix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Message.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/bin/SDL2.dll b/bin/SDL2.dll
index a65b22ce9d2857e1369997d3772b3a496d4795a8..18d707f481f4d1b2a70ddc8ff5d712b011a8a5c0 100644 (file)
Binary files a/bin/SDL2.dll and b/bin/SDL2.dll differ

diff --git a/bin/glew32.dll b/bin/glew32.dll
index a6cc6fd17ff2caff244f40537a9ef061e209ce99..bce2a63e749fe3189b39ec71318010d62604a49c 100644 (file)
Binary files a/bin/glew32.dll and b/bin/glew32.dll differ

diff --git a/doc/poster/Ground.jpg b/doc/poster/Ground.jpg
deleted file mode 100644 (file)
index e52eab5..0000000
Binary files a/doc/poster/Ground.jpg and /dev/null differ

diff --git a/doc/poster/Ground_orig.jpg b/doc/poster/Ground_orig.jpg
new file mode 100644 (file)
index 0000000..e52eab5
Binary files /dev/null and b/doc/poster/Ground_orig.jpg differ

diff --git a/doc/poster/Skyline.jpg b/doc/poster/Skyline.jpg
deleted file mode 100644 (file)
index 1f1aa70..0000000
Binary files a/doc/poster/Skyline.jpg and /dev/null differ

diff --git a/doc/poster/Skyline_orig.jpg b/doc/poster/Skyline_orig.jpg
new file mode 100644 (file)
index 0000000..1f1aa70
Binary files /dev/null and b/doc/poster/Skyline_orig.jpg differ

diff --git a/lib_version.txt b/lib_version.txt
new file mode 100644 (file)
index 0000000..57ff45b
--- /dev/null
+++ b/lib_version.txt
@@ -0,0 +1,7 @@
+freetype 2.3.5.1
+FreeImage 3160
+zlib 128
+glm 0.9.6.3
+glew 1.12.0
+assimp 3.1.1
+sdl2 2.0.3
\ No newline at end of file