Caenneth
|
533ed0ea98
|
updated readme, added wall segments
|
2024-06-23 20:09:49 +02:00 |
JonasJan2
|
a44757cbd6
|
Added function to compile multiple shaders and prospective code for multiple programs (WIP)
|
2024-06-22 17:16:51 +02:00 |
|
JonasJan2
|
7142ed2d6a
|
Added new shader struct
|
2024-06-22 11:24:14 +02:00 |
|
Caenneth
|
f83c533f6f
|
added 4 camera positions - can switch between them with 1,2,3,4 keyboard input
|
2024-06-22 10:19:56 +02:00 |
Luca Wresch
|
dfa16befec
|
test functions
|
2024-06-21 19:26:06 +02:00 |
|
JonasJan2
|
20fcc2af63
|
Capsulation of shader compilation (linking and runtime adjustments WIP)
|
2024-06-21 12:57:47 +02:00 |
|
Caenneth
|
3b5f9816f4
|
fixed 2 chairs
|
2024-06-20 16:55:05 +02:00 |
|
Caenneth
|
b6a03fe864
|
added include for assert.h
|
2024-06-20 18:48:12 +02:00 |
|
Caenneth
|
0541ffcc4f
|
updated laptop model
|
2024-06-20 16:42:32 +02:00 |
Caenneth
|
74a5e24c9a
|
Merge pull request #1 from Caenneth/read-scene-graph-from-file
Read scene graph from file
|
2024-06-20 12:39:15 +02:00 |
|
Finn Wolters
|
abce20d093
|
updated readme
|
2024-06-20 12:38:25 +02:00 |
|
Caenneth
|
95519dfcb1
|
changed pos of laptop and table
|
2024-06-20 11:56:53 +02:00 |
|
Caenneth
|
c3990f341f
|
added laptop and table obj + textures - added objects to scene
|
2024-06-20 09:45:24 +02:00 |
|
Caenneth
|
53789972e3
|
changed object and folder names, added scene-graph.scg
|
2024-06-20 10:02:43 +02:00 |
|
Caenneth
|
b0be18b0df
|
removed old objects, added object and texture for chalkboard and other chair model
|
2024-06-20 07:25:58 +02:00 |
|
Caenneth
|
f38f58a3a8
|
added scene-graph with chair objects
|
2024-06-19 21:58:00 +02:00 |
 Luca Conte
|
7db5240ced
|
enable texture flipping
|
2024-06-19 18:59:09 +02:00 |
|
Luca Conte
|
de1670a755
|
Merge remote-tracking branch 'origin/read-scene-graph-from-file' into read-scene-graph-from-file
|
2024-06-19 18:15:28 +02:00 |
|
Caenneth
|
61ea5752bc
|
moved stuhl_texture to texture folder
|
2024-06-19 19:48:18 +02:00 |
|
Luca Conte
|
976f5eeafc
|
rotate those boxes
|
2024-06-19 18:15:10 +02:00 |
|
Luca Conte
|
5926b21cd4
|
change scene graph syntax
|
2024-06-19 17:34:39 +02:00 |
|
Luca Conte
|
70c611d0d6
|
read scene graph from file
|
2024-06-19 17:19:20 +02:00 |
|
JonasJan2
|
94a01bec41
|
Added comments on math stuff
|
2024-06-19 12:50:11 +02:00 |
|
Luca Conte
|
3c0b9f42c1
|
Merge remote-tracking branch 'origin/main'
|
2024-06-19 11:43:09 +02:00 |
|
Finn Wolters
|
d97a35030d
|
added new chair object with texture as png
|
2024-06-19 11:00:43 +02:00 |
|
Luca Conte
|
14626a5bd5
|
scene graph logic
|
2024-06-19 10:51:37 +02:00 |
|
Luca Conte
|
2632068106
|
noch mehr besser markdown
|
2024-06-18 13:52:04 +02:00 |
|
Luca Conte
|
81498bcbf7
|
make markdown pwetty
|
2024-06-18 13:51:24 +02:00 |
|
JonasJan2
|
734219a412
|
yeet2
|
2024-06-18 13:43:12 +02:00 |
|
JonasJan2
|
6121598e62
|
yeet
|
2024-06-18 13:04:49 +02:00 |
|
Luca Conte
|
3db8817187
|
Merge branch 'multiple-objects'
|
2024-06-10 11:13:34 +02:00 |
|
Caenneth
|
8837681f72
|
added window object
|
2024-06-09 15:01:44 +02:00 |
|
Caenneth
|
ea9f7766c5
|
added chalkboard, and chair objects
|
2024-06-09 15:00:22 +02:00 |
|
JonasJan2
|
cdc86eebad
|
Added comments :D
|
2024-06-07 16:03:46 +02:00 |
|
JonasJan2
|
42f8714eb6
|
Fixed limit of drawable objects (oops), load functions now access the same object count
|
2024-06-07 15:58:46 +02:00 |
|
JonasJan2
|
40af75ad94
|
Added a few comments and a function to load a single object multiple times.
|
2024-06-07 15:31:56 +02:00 |
|
JonasJan2
|
32afa76813
|
shit is rotating now
|
2024-06-06 22:55:52 +02:00 |
|
Luca Wresch
|
e77be76490
|
include library for uint
|
2024-06-06 16:13:55 +02:00 |
|
JonasJan2
|
3436a8b38a
|
VAO and VBO are now stored in the corresponding ObjectData object, to allow for individual manipulation of objects in scene
|
2024-06-06 12:05:08 +02:00 |
|
JonasJan2
|
73be72585c
|
WIP objecthandler stuff
|
2024-06-05 14:45:48 +02:00 |
|
JonasJan2
|
4aca5eead4
|
added test blocks
|
2024-05-27 18:21:09 +02:00 |
|
JonasJan2
|
cde188de1e
|
new struct for object data and refactoring of reading object files
|
2024-05-27 15:51:29 +02:00 |
|
Luca Conte
|
5d9ccd1ef1
|
fix object drawing and stuff 👍
|
2024-05-27 10:29:26 +02:00 |
|
JonasJan2
|
2e460aef60
|
new branch for mult obj testing
|
2024-05-27 10:05:38 +02:00 |
|
JonasJan2
|
588eb327c9
|
Added very basic chair object and wood/fabric texture
|
2024-05-24 18:55:48 +02:00 |
|
JonasJan2
|
296d35b69b
|
Added ability to slide the camera on the x-axis
|
2024-05-24 15:24:52 +02:00 |
|
Caenneth
|
420b982694
|
updated readme with todo list
|
2024-05-24 13:37:26 +02:00 |
|
Luca Conte
|
b4f4a2e3de
|
remove obj from gitignore, add object files
|
2024-05-24 11:16:22 +02:00 |
|
Luca Conte
|
8cc4d26cb0
|
actually add libraries and stuff now
|
2024-05-24 11:10:23 +02:00 |
|
Luca Conte
|
b4f1564f9f
|
add libraries, textures and obj files
|
2024-05-24 11:05:24 +02:00 |