Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
8056c32
Added the end introduction code
joksim Mar 1, 2019
3187fcc
Added 2.1 Basic triangle
joksim Mar 7, 2019
7f2d593
Cleanup of 2.1
joksim Mar 7, 2019
108f55e
Reformatting
joksim Mar 8, 2019
7d59dd8
Reformatting
joksim Mar 8, 2019
84106e7
Drawing quad using 2 triangles. Using EBO for drawing.
joksim Mar 14, 2019
7cbf8ec
Drawing a triangle using std::vector
joksim Mar 14, 2019
46625af
Added Pac-man with 8 angles using vector
joksim Mar 14, 2019
f43152f
Correction
joksim Mar 14, 2019
e8bfeea
Changed cmath related functions to glm functions
joksim Mar 15, 2019
1a8607b
Added glm constants in code
joksim Mar 15, 2019
66f6eb0
Fixed CMakeLists.txt to add the resources project and symlink the cor…
joksim Mar 23, 2019
f1ab01c
Added the uniform GLSL exampl
joksim Mar 23, 2019
ff18e1b
Added the uniform GLSL exampl
joksim Mar 23, 2019
1552375
Simple fragmet example
joksim Mar 24, 2019
2ea6550
Added the Shader class example
joksim Mar 24, 2019
d224a2f
Cleanup
joksim Mar 29, 2019
ffc1dab
CMake fixes
joksim Apr 1, 2019
f54d321
CleanUp and additional constructor of Shader class
joksim Apr 3, 2019
5835a2f
Mixing textures in fragment shader
joksim Apr 3, 2019
a465806
Added Transformations
joksim Apr 25, 2019
3424be6
Added Transformations 2
joksim Apr 25, 2019
3068c48
Coordinate systems
joksim Apr 25, 2019
e3258dc
coordinate-systems-2
joksim May 2, 2019
9d37a6e
coordinate-systems-3
joksim May 2, 2019
72d2273
coordinate-systems-4
joksim May 2, 2019
c8db050
camera-1
joksim May 2, 2019
bc2fbec
camera-2
joksim May 2, 2019
69759e4
camera-3
joksim May 2, 2019
33bda07
Da
FilipKostov Feb 5, 2022
6e8a00c
Added grass
FilipKostov Feb 5, 2022
011f33f
Added model PTG
FilipKostov Feb 5, 2022
07679e9
4
FilipKostov Feb 5, 2022
dfe776d
VANETO CE GO PULJA
FilipKostov Feb 5, 2022
56904ca
Red tekstura ne se loadira pravilno
FilipKostov Feb 5, 2022
2eca56f
Red tekstura ne se loadira pravilno2
FilipKostov Feb 5, 2022
45d0f91
Red Teksturata Uspesno se renderira!
FilipKostov Feb 5, 2022
63fc3f6
Posle dolgo vreme promena
FilipKostov Feb 14, 2022
2f95746
resiv problemot
FilipKostov Feb 14, 2022
4083efa
Proekt: Reds Game
FilipKostov Feb 16, 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
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/OpenGLPrj-1.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 36 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ project(OpenGLPrj)
option(GLFW_BUILD_DOCS OFF)
option(GLFW_BUILD_EXAMPLES OFF)
option(GLFW_BUILD_TESTS OFF)

add_subdirectory(vendor/glfw)

if(MSVC)
Expand All @@ -15,6 +16,9 @@ else()
endif()
endif()

set(SHADERS_RELATIVE_SRC_PATH "res/shaders")
set(TEXTURES_RELATIVE_SRC_PATH "res/textures")

include_directories(include/
vendor/glad/include/
vendor/glfw/include/
Expand All @@ -24,13 +28,19 @@ include_directories(include/
file(GLOB VENDORS_SOURCES vendor/glad/src/glad.c)
file(GLOB PROJECT_HEADERS include/*.hpp)
file(GLOB PROJECT_SOURCES src/*.cpp)
file(GLOB PROJECT_SHADERS shaders/*.comp
shaders/*.frag
shaders/*.geom
shaders/*.vert
shaders/*.vs
shaders/*.fs
file(GLOB PROJECT_SHADERS ${SHADERS_RELATIVE_SRC_PATH}/*.comp
${SHADERS_RELATIVE_SRC_PATH}/*.frag
${SHADERS_RELATIVE_SRC_PATH}/*.geom
${SHADERS_RELATIVE_SRC_PATH}/*.vert
${SHADERS_RELATIVE_SRC_PATH}/*.vs
${SHADERS_RELATIVE_SRC_PATH}/*.fs
${SHADERS_RELATIVE_SRC_PATH}/*.glsl
)

file(GLOB PROJECT_TEXTURES ${TEXTURES_RELATIVE_SRC_PATH}/*.png
${TEXTURES_RELATIVE_SRC_PATH}/*.jpg
)

file(GLOB PROJECT_CONFIGS CMakeLists.txt
Readme.md
.gitattributes
Expand All @@ -39,17 +49,34 @@ file(GLOB PROJECT_CONFIGS CMakeLists.txt

source_group("include" FILES ${PROJECT_HEADERS})
source_group("shaders" FILES ${PROJECT_SHADERS})
source_group("textures" FILES ${PROJECT_TEXTURES})
source_group("src" FILES ${PROJECT_SOURCES})
source_group("vendors" FILES ${VENDORS_SOURCES})

add_definitions(-DGLFW_INCLUDE_NONE
-DPROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\")

add_executable(${PROJECT_NAME} ${PROJECT_SOURCES} ${PROJECT_HEADERS}
${PROJECT_SHADERS} ${PROJECT_CONFIGS}
${PROJECT_SHADERS} ${PROJECT_TEXTURES} ${PROJECT_CONFIGS}
${VENDORS_SOURCES})
target_link_libraries(${PROJECT_NAME}
glfw
${GLFW_LIBRARIES} ${GLAD_LIBRARIES}
)
set_target_properties(${PROJECT_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_NAME})


#set (source "${CMAKE_SOURCE_DIR}/res")
#set (destination "${CMAKE_CURRENT_BINARY_DIR}/res")

add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/res
$<TARGET_FILE_DIR:${PROJECT_NAME}>/../res)


set_target_properties(${PROJECT_NAME}
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/lib"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/bin"
)
Loading