Compare commits
	
		
			2 Commits
		
	
	
		
			d6465aafe6
			...
			326212dc5d
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  kienan | 326212dc5d | |
|  kienan | 56fce78098 | 
|  | @ -60,6 +60,7 @@ target_compile_definitions(client_imgui PUBLIC -DIMGUI_IMPL_OPENGL_LOADER_GLAD) | |||
| target_include_directories(client_imgui PUBLIC ${GLFW_INCLUDE_DIRS} ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIRS} ${GLAD_INCLUDE_DIRS} ${imgui_dir} ${igo_dir}) | ||||
| target_link_libraries(client_imgui ${GLFW_LIBRARIES} ${GLUT_LIBRARY} | ||||
|   ${OPENGL_LIBRARIES} ${GLAD_LIBRARIES} ${CMAKE_DL_LIBS} imgui imgui-glfw-gl3) | ||||
| file(COPY src/shaders DESTINATION .) | ||||
| 
 | ||||
| # Server | ||||
| #target_include_directories(server "${PROJECT_SOURCE_DIR}/src/server") | ||||
|  |  | |||
|  | @ -107,7 +107,7 @@ int main(int argc, char** argv) | |||
|     // @BUG This is a temporary hack. When shader_program_registry is grown, the existing
 | ||||
|     // entries lose data.
 | ||||
|     shader_program_registry.reserve(10); | ||||
|     loadShaderProgramsFromFile("shaders/shader_programs.txt", &shader_registry, &shader_program_registry); | ||||
|     loadShaderProgramsFromFile("shaders/programs.txt", &shader_registry, &shader_program_registry); | ||||
|     messager.registerCallback(&debug_messagebus_callback); | ||||
|     int window_height, window_width; | ||||
|     glm::mat4 projection; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue