Skip to content

Tut28 - 29 preliminary code #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
blurrypiano wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Tut28 - 29 preliminary code #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
25e488f
work in progress tut28 and tut29
blurrypiano Jun 24, 2022
c700304
game object manager and game obj buffer
blurrypiano Jun 29, 2022
4bcdb16
add textures to simple render system
blurrypiano Jun 29, 2022
7c65555
fix mingw compiler issues
blurrypiano Jun 29, 2022
c49e3a5
bug fix, delete gameObj move assignment
blurrypiano Jun 30, 2022
0efb6bc
code from mbp
blurrypiano Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(NAME LveEngine)

message(STATUS "using ${CMAKE_GENERATOR}")
if (CMAKE_GENERATOR STREQUAL "MinGW Makefiles")
if (NOT MINGW_PATH)
if (NOT MINGW_PATH)
message(FATAL_ERROR "MINGW_PATH not set in .env.cmake")
endif()
set(USE_MINGW "True")
Expand Down Expand Up @@ -62,6 +62,12 @@ if (NOT TINYOBJ_PATH)
set(TINYOBJ_PATH external/tinyobjloader)
endif()

# If STB_PATH not specified in .env.cmake, try fetching from git repo
if (NOT STB_PATH)
message(STATUS "STB_PATH not specified in .env.cmake, using external/stbimage")
set(STB_PATH external/stbimage)
endif()

file(GLOB_RECURSE SOURCES ${PROJECT_SOURCE_DIR}/src/*.cpp)

add_executable(${PROJECT_NAME} ${SOURCES})
Expand All @@ -86,6 +92,7 @@ if (WIN32)
${PROJECT_SOURCE_DIR}/src
${Vulkan_INCLUDE_DIRS}
${TINYOBJ_PATH}
${STB_PATH}
${GLFW_INCLUDE_DIRS}
${GLM_PATH}
)
Expand All @@ -101,6 +108,7 @@ elseif (UNIX)
target_include_directories(${PROJECT_NAME} PUBLIC
${PROJECT_SOURCE_DIR}/src
${TINYOBJ_PATH}
${STB_PATH}
)
target_link_libraries(${PROJECT_NAME} glfw ${Vulkan_LIBRARIES})
endif()
Expand All @@ -111,13 +119,13 @@ endif()
# Find all vertex and fragment sources within shaders directory
# taken from VBlancos vulkan tutorial
# https://github.com/vblanco20-1/vulkan-guide/blob/all-chapters/CMakeLists.txt
find_program(GLSL_VALIDATOR glslangValidator HINTS
${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE}
/usr/bin
/usr/local/bin
find_program(GLSL_VALIDATOR glslangValidator HINTS
${Vulkan_GLSLANG_VALIDATOR_EXECUTABLE}
/usr/bin
/usr/local/bin
${VULKAN_SDK_PATH}/Bin
${VULKAN_SDK_PATH}/Bin32
$ENV{VULKAN_SDK}/Bin/
$ENV{VULKAN_SDK}/Bin/
$ENV{VULKAN_SDK}/Bin32/
)

Expand Down
5 changes: 4 additions & 1 deletion envWindowsExample.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ set(VULKAN_SDK_PATH X:/VulkanSDK/1.2.182.0)
# set(MINGW_PATH "C:/Program Files/mingw-w64/x86_64-8.1.0-posix-seh-rt_v6-rev0/mingw64")

# Optional set TINYOBJ_PATH to target specific version, otherwise defaults to external/tinyobjloader
# set(TINYOBJ_PATH X:/dev/Libraries/tinyobjloader)
# set(TINYOBJ_PATH X:/dev/Libraries/tinyobjloader)

# Optional set STB_PATH to target specific version, otherwise defaults to external/stbimage
# set(STB_PATH X:/dev/Libraries/stbimage)
Loading