josh/LearnOpenGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Migrate to latest J3ML Release and latest ReWindow Release

Browse Source
This commit is contained in:
josh
2024-04-09 16:41:32 -04:00
parent 8100d5b333
commit 29dd5d12f5
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -82,11 +82,7 @@ file(GLOB_RECURSE SOURCES "src/LearnOpenGL/*.c" "src/LearnOpenGL/*.cpp")
# TODO: Wrangle target_include_directories # TODO: Wrangle target_include_directories
include_directories(${PROJECT_SOURCE_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/include)
add_library(LearnOpenGL SHARED ${SOURCES} add_library(LearnOpenGL SHARED ${SOURCES})
src/LearnOpenGL/IndexBuffer.cpp
include/LearnOpenGL/ComputeShader.h
include/LearnOpenGL/Grid.h
src/LearnOpenGL/Grid.cpp)
target_include_directories(LearnOpenGL PUBLIC ${J3ML_SOURCE_DIR}/include) target_include_directories(LearnOpenGL PUBLIC ${J3ML_SOURCE_DIR}/include)
target_include_directories(LearnOpenGL PUBLIC ${glad_SOURCE_DIR}/include) target_include_directories(LearnOpenGL PUBLIC ${glad_SOURCE_DIR}/include)

13
include/LearnOpenGL/Shader.h
View File

@@ -27,12 +27,25 @@ namespace LearnOpenGL {
class Shader class Shader
{ {
public:
bool loaded;
public: public:
unsigned int ID{}; unsigned int ID{};
Shader(); Shader();
Shader(std::filesystem::path vertexProgramPath, std::filesystem::path fragmentProgramPath); Shader(std::filesystem::path vertexProgramPath, std::filesystem::path fragmentProgramPath);
Shader(std::string vertexProgramSrc, std::string fragmentProgramSrc); Shader(std::string vertexProgramSrc, std::string fragmentProgramSrc);
~Shader()
{
if (loaded)
unload();
}
void unload()
{
// TODO: Recycle OpenGL shader handle
loaded = false;
}
void use(); void use();
void reload(); void reload();

2
src/demos/SkeletalAnim/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}")
# One Class Header, Implemented for multiple platforms # One Class Header, Implemented for multiple platforms
CPMAddPackage( CPMAddPackage(
NAME ReWindow NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.22.zip URL https://git.redacted.cc/Redacted/ReWindow/archive/vA0.2.23.zip
) )
add_executable(SkeletalAnimDemo main.cpp) add_executable(SkeletalAnimDemo main.cpp)