Skip to content

Commit

Permalink
Merge pull request #380 from carboncopies/master
Browse files Browse the repository at this point in the history 
Update System Resource Branch
  • Loading branch information
@datacrystals
datacrystals authored Sep 18, 2022
2 parents f9dfcd1 + 7ad8678 commit 256e0eb
Show file tree
Hide file tree
Showing 6,314 changed files with 2,636,495 additions and 8,243 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions CMake/BuildUtils/Lucifer.cmake
View file
Original file line number Diff line number Diff line change
@@ -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")
8 changes: 8 additions & 0 deletions CMake/BuildUtils/ThreadNamingUtils.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
##########################
# Builds Library For ERS #
##########################

ERSBuildLogger(${Green} "Configuring ThreadNamingUtils Library")
add_subdirectory(${LIB_DIR}/ThreadNamingUtils)
disable_target_warnings(ThreadNamingUtils)
ERSBuildLogger(${BoldGreen} "Finished Configuring ThreadNamingUtils Library")
2 changes: 1 addition & 1 deletion CMake/Utils/SetBinaryDir.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# ERS BUILD UTIL #
##################

ERSBuildLogger($Green} "Setting Binary Directories")
ERSBuildLogger(${Green} "Setting Binary Directories")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BIN_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BIN_DIR})
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BIN_DIR})
Expand Down
32 changes: 25 additions & 7 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
cmake_minimum_required (VERSION 3.1...3.21)
project(
"BrainGenix-ERS"
VERSION "0.1.2"
VERSION "0.3.5"
LANGUAGES CXX
)

Expand All @@ -20,14 +20,17 @@ 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)
include(${CMAKE_BUILD_UTILS_DIR}/Threads.cmake)
include(${CMAKE_BUILD_UTILS_DIR}/YAML-CPP.cmake)
Expand All @@ -41,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)
Expand All @@ -55,6 +58,10 @@ include(${CMAKE_BUILD_UTILS_DIR}/OZZ-Animation.cmake)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_LoggingSystem)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_HardwareInformation)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_InputOutputSubsystem)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ArgumentParser)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_GPURequest)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ExternalModelLoader)
add_subdirectory(${SRC_DIR}/Core/Utils/ERS_CLASS_ModelImporter)

add_subdirectory(${SRC_DIR}/Core/Manager/ERS_FramerateManager)
add_subdirectory(${SRC_DIR}/Core/Manager/ERS_SceneManager)
Expand All @@ -65,19 +72,22 @@ add_subdirectory(${SRC_DIR}/Core/Editor/)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_ThemeManager)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_FontManager)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_UserProfileManager)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_LayoutManager)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_3DCursor)
add_subdirectory(${SRC_DIR}/Core/Editor/Widgets)
add_subdirectory(${SRC_DIR}/Core/Editor/Utils/ERS_Editor_WindowManager)
add_subdirectory(${SRC_DIR}/Core/Editor/Windows)
add_subdirectory(${SRC_DIR}/Core/Editor/MenuEntries)
add_subdirectory(${SRC_DIR}/Core/Editor/Menus)

add_subdirectory(${SRC_DIR}/Core/Renderer/ERS_CLASS_RendererManager)
add_subdirectory(${SRC_DIR}/Core/Renderer/ERS_CLASS_VisualRenderer)

add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Camera)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_SceneCamera)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_HumanInputDeviceUtils)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Mesh)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Model)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Texture)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_TextureLevel)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Vertex)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Scene)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Shader)
Expand All @@ -88,6 +98,7 @@ add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_SystemUtils)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ProjectUtils)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Project)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ControllerSettings)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ModelWriterData)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ShaderProgramAssetIDs)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_RGBColor)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Viewport)
Expand All @@ -98,6 +109,8 @@ add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_Script)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_DepthMap)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_RendererSettings)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_OpenGLLogItem)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ShaderUniformData)
add_subdirectory(${SRC_DIR}/Core/Structures/ERS_STRUCT_ModelImportOptions)

add_subdirectory(${SRC_DIR}/Core/Script/ERS_CLASS_PythonInterpreterIntegration)

Expand All @@ -111,7 +124,6 @@ add_subdirectory(${SRC_DIR}/Core/Writers/ERS_SceneWriter)
add_subdirectory(${SRC_DIR}/Core/Writers/ERS_ModelWriter)
add_subdirectory(${SRC_DIR}/Core/Writers/ERS_ProjectWriter)


# Add Main.cpp
add_executable(${PROJECT_NAME} ${SRC_DIR}/Main.cpp ${LIB_DIR}/tracy/TracyClient.cpp ${BACKWARD_ENABLE})
target_link_libraries(${PROJECT_NAME}
Expand All @@ -122,14 +134,17 @@ target_link_libraries(${PROJECT_NAME}
glfw
TracyClient
ozz_animation
Lucifer

# Internal Libs
ERS_CLASS_GPURequest
ERS_CLASS_LoggingSystem
Renderer
ERS_CLASS_HardwareInformation
ERS_CLASS_ModelImporter


ERS_CLASS_HardwareInformation
ERS_CLASS_PythonInterpreterIntegration
ERS_CLASS_ArgumentParser

ERS_SceneManager
ERS_ModelLoader
Expand All @@ -147,6 +162,9 @@ target_link_libraries(${PROJECT_NAME}
ERS_STRUCT_ProjectUtils
ERS_STRUCT_RendererSettings

Renderer


)


Expand Down
11 changes: 0 additions & 11 deletions CMakeSettings.json
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Visual Studio 16 2019 Win64",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}/Binaries/",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "x64-Release",
"generator": "Visual Studio 16 2019 Win64",
Expand Down
11 changes: 10 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

## Windows:

Since we don't develop on Windows, builds aren't guarenteed to work. With that said, they *should* work most of the time.
Since we don't develop on Windows, builds aren't guarenteed to work. With that said, they *should* work most of the time.

**Note: Having windows set to a non english language seems to break includes for some reason.** We really wish that this wasn't an issue but it seems to be a problem for whatever reason. Apologies for the inconvenience.

- Open Visual Stuido 2019 (Has to be this version)
- Install python 3.9.5 (needed to link with the interpreter, embeddable version already included in project tree, also restart your machine after installing to avoid issues) (If just installing, make sure to restart after to make it show up in visual studio)
Expand All @@ -28,13 +29,21 @@
- Set target to BrainGenix-ERS.exe
- Hit `Build`

## Mac:

- Install one of the following:
- [Ubuntu](https://ubuntu.com/download)
- [Debian](https://www.debian.org/distrib/)
- [Fedora](https://getfedora.org/workstation/download/)
- Follow Linux build instructions

# Keybinds

## Editor Viewport

"[lmb]" - (When Hovering Gizmo) - Move Gizmo
"[left shift]" - (When Gizmo Active) - Move Camera While Moving Gizmo
"[esc]" - (When Gizmo Active) - Abort Current Movement
"[s]" - Set Gizmo To Scale
"[g]" - Set Gizmo To Translate
"[r]" - Set Gizmo To Rotate
Expand Down
1 change: 1 addition & 0 deletions Sandbox/NewImageLoaderSystem/Third-Party/NeoImageLoader/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

14 changes: 14 additions & 0 deletions ...ox/NewImageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/.gitattributes
View file
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions ...mageLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/.cvsignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.project
Binary file added ...y/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/New File Formats.pdf
View file
Binary file not shown.
84 changes: 84 additions & 0 deletions ...y/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/New File Formats.tex
View file
Original file line number Diff line number Diff line change
@@ -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}

Binary file added ...rty/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/Version Number.pdf
View file
Binary file not shown.
34 changes: 34 additions & 0 deletions ...rty/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/Design Documents/Version Number.tex
View file
Original file line number Diff line number Diff line change
@@ -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}

Binary file added ...aderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevIL Manual.doc
View file
Binary file not shown.
Binary file added ...aderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevIL Manual.pdf
View file
Binary file not shown.
Binary file added ...ImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevIL Reference Guide - French Version.doc
View file
Binary file not shown.
Binary file added ...m/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevIL Reference Guide.doc
View file
Binary file not shown.
Binary file added ...m/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevIL Reference Guide.pdf
View file
Binary file not shown.
40 changes: 40 additions & 0 deletions ...geLoaderSystem/Third-Party/NeoImageLoader/Third-Party/DevIL-1.8.0/DevIL-docs/DevilDoc.dtd
View file
Original file line number Diff line number Diff line change
@@ -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)*>

Loading

0 comments on commit 256e0eb

Please sign in to comment.