Merge pull request #332 from carboncopies/331-setup-new-image-loader-…

…subsystem

331 setup new image loader subsystem

CMake/BuildUtils/Lucifer.cmake

@@ -0,0 +1,8 @@
+##########################
+# Builds Library For ERS #
+##########################
+
+ERSBuildLogger(${Green} "Configuring Lucifer Library")
+add_subdirectory(${LIB_DIR}/LuciferIL/LuciferIL)
+disable_target_warnings(Lucifer)
+ERSBuildLogger(${BoldGreen} "Finished Configuring Lucifer Library")

CMakeLists.txt

@@ -20,13 +20,15 @@ set(CMAKE_FIND_UTILS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/CMake/FindUtils")
 set(PROJECT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
+
 # Include Util CMake Scripts
 include(${CMAKE_UTIL_DIR}/ColorizeMessages.cmake)
 include(${CMAKE_UTIL_DIR}/SetBinaryDir.cmake)
 include(${CMAKE_UTIL_DIR}/DisableTargetWarnings.cmake)
 
 
 # Include Package Addition Scripts
+include(${CMAKE_BUILD_UTILS_DIR}/Lucifer.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/Backward.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/ThreadNamingUtils.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/Python.cmake)
@@ -42,7 +44,7 @@ include(${CMAKE_BUILD_UTILS_DIR}/ImGuiColorTextEdit.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/GLFW.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/PCIIDS.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/FreeImage.cmake)
-include(${CMAKE_BUILD_UTILS_DIR}/STB.cmake)
+#include(${CMAKE_BUILD_UTILS_DIR}/STB.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/Assimp.cmake)
 include(${CMAKE_BUILD_UTILS_DIR}/Tracy.cmake)
 #include(${CMAKE_BUILD_UTILS_DIR}/MySQLConnector.cmake)
@@ -131,6 +133,7 @@ target_link_libraries(${PROJECT_NAME}
   glfw
   TracyClient
   ozz_animation
+  Lucifer
 
   # Internal Libs
   ERS_CLASS_GPURequest

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/CMakeLists.txt

@@ -0,0 +1 @@
+

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/.gitattributes

@@ -0,0 +1,14 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/.cvsignore

@@ -0,0 +1 @@
+.project

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/New File Formats.tex

@@ -0,0 +1,84 @@
+\documentclass[letterpaper,10pt]{article}
+\title{Adding New File Formats to DevIL}
+\author{Denton Woods}
+\date{March 2009}
+\usepackage{amsmath,graphicx,fullpage}
+\begin{document}
+\maketitle
+
+\section*{Adding the .c or .cpp File}
+Make sure that the new .c or .cpp file is added to the Subversion repository using the \emph{svn add} command.
+
+\subsubsection*{Microsoft Visual C++}
+The .c or .cpp file must be added to the Microsoft Visual C++ 9 projects \emph{src-IL/projects/msvc9/ImageLib Unicode.sln} and \emph{src-IL/projects/msvc9/ImageLib.sln}.  The file must also be added to the MSVC++ 8 projects \emph{src-IL/projects/msvc8/ImageLib Unicode.sln} and \emph{src-IL/projects/msvc8/ImageLib.sln}.
+
+\subsubsection*{Linux, Cygwin and Mac OS X}
+For the Linux/Cygwin/Mac OS X makefile system, add the filename to the libIL\_la\_SOURCES line of lib/Makefile.am.
+
+
+\section*{configure.ac}
+Add the format to configure.ac around line 320, with a description.
+
+
+\section*{DevIL_manual.texi}
+Add the file format to the appendix entitled \emph{Supported File Formats} in the TexInfo manual.
+
+
+\section*{il.h}
+Add the appropriate IL\_XXX define to il.h (around line 240).  Make sure to include a commented description in Doxygen format.
+
+
+\section*{il\_internal.h}
+Add the function declarations to il\_internal.h around line 224.
+
+
+\section*{il\_io.c}
+
+\subsubsection*{Validation}
+If \textbf{ilIsValid*} functions are created for the new format, the function calls must be implemented in \textbf{ilDetermineTypeF}, \textbf{ilDetermineTypeL}, \textbf{ilIsValid}, \textbf{ilIsValidF} and \textbf{ilIsValidL}.
+
+\subsubsection*{Loading}
+The first thing that needs to be added is checks for the extensions in \textbf{ilTypeFromExt}.
+
+Next add the appropriate function calls to \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}.  Make sure to put the IL\_XXX define in the Doxygen comment before the function!
+
+\subsubsection*{Saving}
+Add the function calls to \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}.  Make sure to put the IL\_XXX define in the Doxygen comment before the function!
+
+
+\section*{il\_states.c and il\_states.h}
+Change \_ilLoadExt and/or \_ilSaveExt to include the new format name in il\_states.c.  Also add the format to il\_states.h.
+
+\section*{Website}
+Add to the list of types the DevIL can load on the About and the Features pages.
+
+
+\section*{Summary of Changes to Make}
+\begin{itemize}
+\item Run \emph{svn ci}.
+\item Add to MSVC++ 8 projects.
+\item Add to MSVC++ 9 projects.
+\item Add to lib/Makefile.am sources line.
+\item Add to configure.ac with description.
+\item Add to DevIL_manual.texi appendix.
+\item Add IL\_XXX to il.h.
+\item Add function declarations to il\_internal.h.
+\item Add validation functions if they exist.
+\item For loading functions:
+	\begin {itemize}
+		\item \textbf{ilTypeFromExt}
+		\item \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}
+		\item Add Doxygen comments to \textbf{ilLoad}, \textbf{ilLoadF}, \textbf{ilLoadL} and \textbf{ilLoadImage}.
+	\end {itemize}
+\item For saving functions:
+	\begin {itemize}
+		\item \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}
+		\item Add Doxygen comments to \textbf{ilSave}, \textbf{ilSaveF}, \textbf{ilSaveL} and \textbf{ilSaveImage}.
+	\end {itemize}
+\item Add to il\_states.c and il\_states.h.
+\item Add to website (about and features pages).
+\end{itemize}
+
+
+\end{document}
+

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/Version Number.tex

@@ -0,0 +1,34 @@
+\documentclass[letterpaper,10pt]{article}
+\title{Changing DevIL Version Number}
+\author{Denton Woods}
+\date{March 2009}
+\usepackage{amsmath,graphicx,fullpage}
+\begin{document}
+\maketitle
+
+\section*{Microsoft Visual C++ Resource Files}
+\subsection*{Unicode Resource Files}
+\emph{src-IL/msvc9/IL Unicode.rc}, \emph{src-IL/msvc8/IL Unicode.rc}, \emph{src-ILU/msvc9/ILU Unicode.rc}, \emph{src-ILU/msvc8/ILU Unicode.rc}, \emph{src-ILUT/msvc9/ILUT Unicode.rc} and \emph{src-ILUT/msvc8/ILUT Unicode.rc} must all be updated with the new version number.  Look for the lines starting with \emph{FILEVERSION}, \emph{PRODUCTVERSION}, \emph{VALUE $\backslash$``FileVersion$\backslash$''}, \emph{VALUE $\backslash$``ProductVersion$\backslash$''} and \emph{IDC\_OPENIL}.
+
+\subsection*{Ansi Resource Files}
+\emph{src-IL/msvc9/IL.rc}, \emph{src-IL/msvc8/IL.rc}, \emph{src-ILU/msvc9/ILU.rc}, \emph{src-ILU/msvc8/ILU.rc}, \emph{src-ILUT/msvc9/ILUT.rc} and \emph{src-ILUT/msvc8/ILUT.rc} all have the same format as the Unicode resource files.
+
+
+\section*{configure.ac}
+Change the version number on line 12.
+
+
+\section*{IL.h, ILU.h, ILUT.h}
+At about line 164 in IL.h, change IL\_VERSION\_ and IL\_VERSION to reflect the new version number.  The equivalent lines are at line 40 in ilu.h and line 32 in ilut.h.
+
+
+\section*{README}
+Change the first line of README to the new version number.
+
+
+\section*{il\_states.c, ilu\_states.c and ilut\_states.c}
+At the top of each of these files, change the \_il(u(t))Vendor and \_il(u(t))Version lines to the new version number.
+
+
+\end{document}
+

Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevilDoc.dtd

@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!ELEMENT a EMPTY>
+<!ATTLIST a
+    from CDATA #IMPLIED
+    description CDATA #IMPLIED
+    name CDATA #IMPLIED
+  >
+
+<!ELEMENT link (a)*>
+<!ATTLIST link
+    verbose CDATA #IMPLIED
+    name CDATA #IMPLIED
+  >
+
+<!ELEMENT description (#PCDATA)>
+
+<!ELEMENT param EMPTY>
+<!ATTLIST param
+    description CDATA #IMPLIED
+    type CDATA #IMPLIED
+    name CDATA #IMPLIED
+  >
+
+<!ELEMENT return (#PCDATA)>
+
+<!ELEMENT name (#PCDATA)>
+
+<!ELEMENT entity (link|description|param|return|name)*>
+<!ATTLIST entity
+    type CDATA #IMPLIED
+  >
+
+<!ELEMENT set (entity)*>
+<!ATTLIST set
+    name CDATA #IMPLIED
+  >
+
+<!ELEMENT doc (set)*>
+