update cmakeList
							parent
							
								
									a4590dc8fb
								
							
						
					
					
						commit
						3ae611763e
					
				| 
						 | 
					@ -4,33 +4,33 @@ function(buildHomework HOMEWORK_NAME)
 | 
				
			||||||
	message(STATUS "Generating project file for homework in ${HOMEWORK_FOLDER}")
 | 
						message(STATUS "Generating project file for homework in ${HOMEWORK_FOLDER}")
 | 
				
			||||||
	# Main
 | 
						# Main
 | 
				
			||||||
	file(GLOB SOURCE *.cpp ${BASE_HEADERS} ${HOMEWORK_FOLDER}/*.cpp)
 | 
						file(GLOB SOURCE *.cpp ${BASE_HEADERS} ${HOMEWORK_FOLDER}/*.cpp)
 | 
				
			||||||
	SET(MAIN_CPP ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.cpp "homework1/homework1.h")
 | 
						SET(MAIN_CPP ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.cpp )
 | 
				
			||||||
	if(EXISTS ${HOMEWORK_FOLDER}/main.cpp)
 | 
						if(EXISTS ${HOMEWORK_FOLDER}/main.cpp)
 | 
				
			||||||
		SET(MAIN_CPP ${HOMEWORK_FOLDER}/main.cpp "homework1/homework1.h")
 | 
							SET(MAIN_CPP ${HOMEWORK_FOLDER}/main.cpp )
 | 
				
			||||||
	ENDIF()
 | 
						ENDIF()
 | 
				
			||||||
	if(EXISTS ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.h)
 | 
						if(EXISTS ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.h)
 | 
				
			||||||
		SET(MAIN_HEADER ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.h "homework1/homework1.h")
 | 
							SET(MAIN_HEADER ${HOMEWORK_FOLDER}/${HOMEWORK_NAME}.h )
 | 
				
			||||||
	ENDIF()
 | 
						ENDIF()
 | 
				
			||||||
	# imgui homework requires additional source files
 | 
						# imgui homework requires additional source files
 | 
				
			||||||
	IF(${HOMEWORK_NAME} STREQUAL "imgui")
 | 
						IF(${HOMEWORK_NAME} STREQUAL "imgui")
 | 
				
			||||||
		file(GLOB ADD_SOURCE "../external/imgui/*.cpp")
 | 
							file(GLOB ADD_SOURCE "../external/imgui/*.cpp")
 | 
				
			||||||
		SET(SOURCE ${SOURCE} ${ADD_SOURCE} "homework1/homework1.h")
 | 
							SET(SOURCE ${SOURCE} ${ADD_SOURCE} )
 | 
				
			||||||
	ENDIF()
 | 
						ENDIF()
 | 
				
			||||||
	# wayland requires additional source files
 | 
						# wayland requires additional source files
 | 
				
			||||||
	IF(USE_WAYLAND_WSI)
 | 
						IF(USE_WAYLAND_WSI)
 | 
				
			||||||
		SET(SOURCE ${SOURCE} ${CMAKE_BINARY_DIR}/xdg-shell-client-protocol.h ${CMAKE_BINARY_DIR}/xdg-shell-protocol.c "homework1/homework1.h")
 | 
							SET(SOURCE ${SOURCE} ${CMAKE_BINARY_DIR}/xdg-shell-client-protocol.h ${CMAKE_BINARY_DIR}/xdg-shell-protocol.c )
 | 
				
			||||||
	ENDIF()
 | 
						ENDIF()
 | 
				
			||||||
	# Add shaders
 | 
						# Add shaders
 | 
				
			||||||
	set(SHADER_DIR_GLSL "../data/homework/shaders/glsl/${HOMEWORK_NAME}")
 | 
						set(SHADER_DIR_GLSL "../data/buster_drone/shaders/glsl")
 | 
				
			||||||
	file(GLOB SHADERS_GLSL "${SHADER_DIR_GLSL}/*.vert" "${SHADER_DIR_GLSL}/*.frag" "${SHADER_DIR_GLSL}/*.comp" "${SHADER_DIR_GLSL}/*.geom" "${SHADER_DIR_GLSL}/*.tesc" "${SHADER_DIR_GLSL}/*.tese" "${SHADER_DIR_GLSL}/*.mesh" "${SHADER_DIR_GLSL}/*.task" "${SHADER_DIR_GLSL}/*.rgen" "${SHADER_DIR_GLSL}/*.rchit" "${SHADER_DIR_GLSL}/*.rmiss" "${SHADER_DIR_GLSL}/*.rcall")
 | 
						file(GLOB SHADERS_GLSL "${SHADER_DIR_GLSL}/*.vert" "${SHADER_DIR_GLSL}/*.frag" "${SHADER_DIR_GLSL}/*.comp" "${SHADER_DIR_GLSL}/*.geom" "${SHADER_DIR_GLSL}/*.tesc" "${SHADER_DIR_GLSL}/*.tese" "${SHADER_DIR_GLSL}/*.mesh" "${SHADER_DIR_GLSL}/*.task" "${SHADER_DIR_GLSL}/*.rgen" "${SHADER_DIR_GLSL}/*.rchit" "${SHADER_DIR_GLSL}/*.rmiss" "${SHADER_DIR_GLSL}/*.rcall")
 | 
				
			||||||
	set(SHADER_DIR_HLSL "../data/homework/shaders/hlsl/${HOMEWORK_NAME}")
 | 
						set(SHADER_DIR_HLSL "../data/buster_drone/shaders/hlsl")
 | 
				
			||||||
	file(GLOB SHADERS_HLSL "${SHADER_DIR_HLSL}/*.vert" "${SHADER_DIR_HLSL}/*.frag" "${SHADER_DIR_HLSL}/*.comp" "${SHADER_DIR_HLSL}/*.geom" "${SHADER_DIR_HLSL}/*.tesc" "${SHADER_DIR_HLSL}/*.tese" "${SHADER_DIR_HLSL}/*.mesh" "${SHADER_DIR_HLSL}/*.task" "${SHADER_DIR_HLSL}/*.rgen" "${SHADER_DIR_HLSL}/*.rchit" "${SHADER_DIR_HLSL}/*.rmiss" "${SHADER_DIR_HLSL}/*.rcall")
 | 
						file(GLOB SHADERS_HLSL "${SHADER_DIR_HLSL}/*.vert" "${SHADER_DIR_HLSL}/*.frag" "${SHADER_DIR_HLSL}/*.comp" "${SHADER_DIR_HLSL}/*.geom" "${SHADER_DIR_HLSL}/*.tesc" "${SHADER_DIR_HLSL}/*.tese" "${SHADER_DIR_HLSL}/*.mesh" "${SHADER_DIR_HLSL}/*.task" "${SHADER_DIR_HLSL}/*.rgen" "${SHADER_DIR_HLSL}/*.rchit" "${SHADER_DIR_HLSL}/*.rmiss" "${SHADER_DIR_HLSL}/*.rcall")
 | 
				
			||||||
	source_group("Shaders\\GLSL" FILES ${SHADERS_GLSL})
 | 
						source_group("Shaders\\GLSL" FILES ${SHADERS_GLSL})
 | 
				
			||||||
	source_group("Shaders\\HLSL" FILES ${SHADERS_HLSL})
 | 
						source_group("Shaders\\HLSL" FILES ${SHADERS_HLSL})
 | 
				
			||||||
	# Add optional readme / tutorial
 | 
						# Add optional readme / tutorial
 | 
				
			||||||
	file(GLOB README_FILES "${HOMEWORK_FOLDER}/*.md")
 | 
						file(GLOB README_FILES "${HOMEWORK_FOLDER}/*.md")
 | 
				
			||||||
	if(WIN32)
 | 
						if(WIN32)
 | 
				
			||||||
		add_executable(${HOMEWORK_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES} "homework1/homework1.h")
 | 
							add_executable(${HOMEWORK_NAME} WIN32 ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES})
 | 
				
			||||||
		target_link_libraries(${HOMEWORK_NAME} base ${Vulkan_LIBRARY} ${WINLIBS})
 | 
							target_link_libraries(${HOMEWORK_NAME} base ${Vulkan_LIBRARY} ${WINLIBS})
 | 
				
			||||||
	else(WIN32)
 | 
						else(WIN32)
 | 
				
			||||||
		add_executable(${HOMEWORK_NAME} ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES})
 | 
							add_executable(${HOMEWORK_NAME} ${MAIN_CPP} ${SOURCE} ${MAIN_HEADER} ${SHADERS_GLSL} ${SHADERS_HLSL} ${README_FILES})
 | 
				
			||||||
| 
						 | 
					@ -78,8 +78,8 @@ function(buildHomeworks)
 | 
				
			||||||
endfunction(buildHomeworks)
 | 
					endfunction(buildHomeworks)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(HOMEWORKS
 | 
					set(HOMEWORKS
 | 
				
			||||||
	homework0
 | 
						
 | 
				
			||||||
	homework1
 | 
						render
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
buildHomeworks()
 | 
					buildHomeworks()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| 
						 | 
					@ -16,7 +16,7 @@
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * If you are looking for a complete glTF implementation, check out https://github.com/SaschaWillems/Vulkan-glTF-PBR/
 | 
					 * If you are looking for a complete glTF implementation, check out https://github.com/SaschaWillems/Vulkan-glTF-PBR/
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#include "homework1.h"
 | 
					#include "render.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
		glTF loading functions
 | 
							glTF loading functions
 | 
				
			||||||
		Loading…
	
		Reference in New Issue