 Luca Conte
|
355043d3c9
|
fix chalkboard
|
2024-06-24 16:00:00 +02:00 |
Caenneth
|
ea227e75e9
|
rotated chalkboard 180 degrees
|
2024-06-24 17:46:39 +02:00 |
|
Luca Conte
|
c7744cce2e
|
Merge branch 'multiple-lights'
|
2024-06-24 15:30:36 +02:00 |
|
Luca Conte
|
b428efe1a3
|
smooth camera travel
|
2024-06-24 15:30:14 +02:00 |
|
Luca Conte
|
f71b33bb47
|
add shininess and extra camera perspective
|
2024-06-24 15:17:36 +02:00 |
Caenneth
|
223bdf5f9d
|
Merge pull request #2 from Caenneth/animation
Animation + chalkboard fix
|
2024-06-24 15:14:49 +02:00 |
|
Caenneth
|
bcc82553cc
|
changed uv-mapping for chalkboard
|
2024-06-24 15:13:16 +02:00 |
|
Caenneth
|
db3870b45f
|
fixed max values
|
2024-06-24 17:00:51 +02:00 |
|
Caenneth
|
e5203bbc63
|
animation for chalkboard
|
2024-06-24 16:51:03 +02:00 |
|
Luca Conte
|
5426a084b0
|
increase far plane distance
|
2024-06-24 15:09:49 +02:00 |
|
Luca Conte
|
cb98871db0
|
add cube model
|
2024-06-24 15:08:07 +02:00 |
|
Luca Conte
|
2124eb1d68
|
multiple textures and normal maps
|
2024-06-24 15:06:02 +02:00 |
|
Luca Conte
|
abffb2fe7c
|
multiple lights
|
2024-06-24 14:39:20 +02:00 |
|
Caenneth
|
4c65103fd6
|
animation test
|
2024-06-24 13:27:59 +02:00 |
|
Caenneth
|
aaa50e6a28
|
updated pos of chalkboard
|
2024-06-24 15:24:20 +02:00 |
|
Luca Conte
|
1ec82871ad
|
Merge branch 'main' of github.com:Caenneth/cg1_purple
|
2024-06-24 13:08:55 +02:00 |
|
Luca Conte
|
5d680e50c0
|
update readme
|
2024-06-24 13:08:46 +02:00 |
|
Caenneth
|
310f9f2b39
|
animation
|
2024-06-24 13:03:24 +02:00 |
JonasJan2
|
324db7b293
|
Added assert.h include
|
2024-06-24 12:58:48 +02:00 |
|
JonasJan2
|
53ae95e466
|
Assertions
|
2024-06-24 12:56:34 +02:00 |
|
Caenneth
|
6833e4dc14
|
removed unused obj - renamed objects and textures
|
2024-06-24 12:28:04 +02:00 |
|
Caenneth
|
3e594b04de
|
updated chair model
|
2024-06-24 12:24:43 +02:00 |
|
Caenneth
|
b18db7f4c4
|
updated chair models
|
2024-06-24 12:14:04 +02:00 |
|
Caenneth
|
b9c53edb22
|
updated walls
|
2024-06-24 09:43:35 +02:00 |
|
JonasJan2
|
6fefc24a5b
|
attachShader loop now uses numShaders instead of hard coded 2
|
2024-06-24 08:45:58 +02:00 |
|
Caenneth
|
e7edadcf3d
|
updated walls - seperated walls from floor - added floor
|
2024-06-24 07:21:57 +02:00 |
|
Caenneth
|
10fc0319b9
|
updated walls
|
2024-06-24 07:09:50 +02:00 |
|
Caenneth
|
011ae3f132
|
changed chair models in last row to have no table
|
2024-06-24 09:03:55 +02:00 |
|
Caenneth
|
f9ebe2acc0
|
added new chair models for last row
|
2024-06-24 07:00:16 +02:00 |
|
Caenneth
|
62b6a6d0a4
|
added floor texture - updated walls - removed unused objects - removed unused textures
|
2024-06-23 23:19:49 +02:00 |
|
Caenneth
|
9b2d9a81ae
|
updated position of chalkboard and walls
|
2024-06-24 00:21:03 +02:00 |
|
Caenneth
|
e6a461d01c
|
updated walls
|
2024-06-23 21:44:19 +02:00 |
|
Caenneth
|
7624a9cd0d
|
updated walls
|
2024-06-23 21:36:48 +02:00 |
|
Caenneth
|
b663792b7b
|
updated walls
|
2024-06-23 21:30:54 +02:00 |
|
Caenneth
|
8696018eab
|
updated walls
|
2024-06-23 21:15:46 +02:00 |
|
Caenneth
|
7684f8580a
|
added new walls
|
2024-06-23 21:05:01 +02:00 |
|
Caenneth
|
8156f47bec
|
updated walls
|
2024-06-23 20:53:42 +02:00 |
|
Caenneth
|
d6f4c60c18
|
added walls to scenegraph
|
2024-06-23 22:52:50 +02:00 |
|
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 |
|
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 |