Permalink
Browse files

Added the SOIL library to the project, and used it to load a texture …

…to verify that it works. Haven't actually applied the texture yet
  • Loading branch information...
1 parent 193574f commit b7e6ef1c2700c337c6852fa847324f42af2d2023 Eric Kern committed Apr 18, 2012
Showing with 17,726 additions and 2 deletions.
  1. +2 −1 CMakeLists.txt
  2. +1 −0 Simple OpenGL Image Library/CMakeLists.txt
  3. BIN Simple OpenGL Image Library/Thumbs.db
  4. BIN Simple OpenGL Image Library/field_128_cube.dds
  5. BIN Simple OpenGL Image Library/img_cheryl.jpg
  6. BIN Simple OpenGL Image Library/img_test.bmp
  7. BIN Simple OpenGL Image Library/img_test.dds
  8. BIN Simple OpenGL Image Library/img_test.png
  9. BIN Simple OpenGL Image Library/img_test.png-screenshot.bmp
  10. BIN Simple OpenGL Image Library/img_test.tga
  11. BIN Simple OpenGL Image Library/img_test_indexed.tga
  12. BIN Simple OpenGL Image Library/lib/libSOIL.a
  13. +132 −0 Simple OpenGL Image Library/projects/VC6/SOIL.dsp
  14. +29 −0 Simple OpenGL Image Library/projects/VC6/SOIL.dsw
  15. +21 −0 Simple OpenGL Image Library/projects/VC7.1/SOIL.sln
  16. +147 −0 Simple OpenGL Image Library/projects/VC7.1/SOIL.vcproj
  17. +20 −0 Simple OpenGL Image Library/projects/VC8/SOIL.sln
  18. +209 −0 Simple OpenGL Image Library/projects/VC8/SOIL.vcproj
  19. +26 −0 Simple OpenGL Image Library/projects/VC9/SOIL.sln
  20. +337 −0 Simple OpenGL Image Library/projects/VC9/SOIL.vcproj
  21. +89 −0 Simple OpenGL Image Library/projects/codeblocks/SOIL.cbp
  22. +50 −0 Simple OpenGL Image Library/projects/makefile/alternate Makefile.txt
  23. +57 −0 Simple OpenGL Image Library/projects/makefile/makefile
  24. +320 −0 Simple OpenGL Image Library/soil.html
  25. +8 −0 Simple OpenGL Image Library/src/CMakeLists.txt
  26. +2,024 −0 Simple OpenGL Image Library/src/SOIL.c
  27. +433 −0 Simple OpenGL Image Library/src/SOIL.h
  28. +632 −0 Simple OpenGL Image Library/src/image_DXT.c
  29. +123 −0 Simple OpenGL Image Library/src/image_DXT.h
  30. +435 −0 Simple OpenGL Image Library/src/image_helper.c
  31. +115 −0 Simple OpenGL Image Library/src/image_helper.h
  32. +3,632 −0 Simple OpenGL Image Library/src/original/stb_image-1.09.c
  33. +3,821 −0 Simple OpenGL Image Library/src/original/stb_image-1.16.c
  34. +3,682 −0 Simple OpenGL Image Library/src/stb_image_aug.c
  35. +354 −0 Simple OpenGL Image Library/src/stb_image_aug.h
  36. +21 −0 Simple OpenGL Image Library/src/stbi_DDS_aug.h
  37. +511 −0 Simple OpenGL Image Library/src/stbi_DDS_aug_c.h
  38. +379 −0 Simple OpenGL Image Library/src/test_SOIL.cpp
  39. +66 −0 Simple OpenGL Image Library/support/FreeBasic/SOIL.bi
  40. BIN Simple OpenGL Image Library/test_rect.png
  41. +2 −1 src/CMakeLists.txt
  42. +8 −0 src/sierpinski_carpet.cpp
  43. +7 −0 src/sierpinski_carpet.h
  44. BIN src/texture.bmp
  45. +33 −0 src/texture_mapping.h
View
@@ -4,8 +4,9 @@ project(sierpinski_zoom)
find_package(GLUT)
find_package(OpenGL)
-include_directories(src ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS})
+include_directories(src ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} Simple\ OpenGL\ Image\ Library/src)
set(CMAKE_CXX_COMPILER "clang++")
set(CMAKE_CXX_FLAGS "-g -Wall")
add_subdirectory(src)
+add_subdirectory(Simple\ OpenGL\ Image\ Library)
@@ -0,0 +1 @@
+add_subdirectory(src)
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,132 @@
+# Microsoft Developer Studio Project File - Name="SOIL" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=SOIL - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "SOIL.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "SOIL.mak" CFG="SOIL - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SOIL - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "SOIL - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "SOIL - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF "$(CFG)" == "SOIL - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF
+
+# Begin Target
+
+# Name "SOIL - Win32 Release"
+# Name "SOIL - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\..\src\image_DXT.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image_helper.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\SOIL.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stb_image_aug.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\..\src\image_DXT.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image_helper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\SOIL.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stb_image_aug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stbi_DDS_aug.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\stbi_DDS_aug_c.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "SOIL"=".\SOIL.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "SOIL.vcproj", "{35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug = Debug
+ Release = Release
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}.Debug.ActiveCfg = Debug|Win32
+ {35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}.Debug.Build.0 = Debug|Win32
+ {35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}.Release.ActiveCfg = Release|Win32
+ {35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}.Release.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="SOIL"
+ ProjectGUID="{35D9B7E3-EE73-4C06-9B98-FCB7F7644C99}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/SOIL.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="4"
+ CharacterSet="2">
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLibrarianTool"
+ OutputFile="$(OutDir)/SOIL.lib"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath="..\..\src\image_DXT.c">
+ </File>
+ <File
+ RelativePath="..\..\src\image_helper.c">
+ </File>
+ <File
+ RelativePath="..\..\src\SOIL.c">
+ </File>
+ <File
+ RelativePath="..\..\src\stb_image_aug.c">
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+ <File
+ RelativePath="..\..\src\image_DXT.h">
+ </File>
+ <File
+ RelativePath="..\..\src\image_helper.h">
+ </File>
+ <File
+ RelativePath="..\..\src\SOIL.h">
+ </File>
+ <File
+ RelativePath="..\..\src\stb_image_aug.h">
+ </File>
+ <File
+ RelativePath="..\..\src\stbi_DDS_aug.h">
+ </File>
+ <File
+ RelativePath="..\..\src\stbi_DDS_aug_c.h">
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ </Filter>
+ <File
+ RelativePath=".\ReadMe.txt">
+ </File>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "SOIL.vcproj", "{C32FB2B4-500C-43CD-A099-EECCE079D3F1}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C32FB2B4-500C-43CD-A099-EECCE079D3F1}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C32FB2B4-500C-43CD-A099-EECCE079D3F1}.Debug|Win32.Build.0 = Debug|Win32
+ {C32FB2B4-500C-43CD-A099-EECCE079D3F1}.Release|Win32.ActiveCfg = Release|Win32
+ {C32FB2B4-500C-43CD-A099-EECCE079D3F1}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Oops, something went wrong. Retry.

0 comments on commit b7e6ef1

Please sign in to comment.