Commit Graph

191 Commits

Author SHA1 Message Date
3b079c94ff Allow floating object around the center object
Former-commit-id: 7e35a8b2ef76b3e4160d28f273f038a08f6ad0eb
2014-06-13 15:41:27 +02:00
82792c0d65 Merge branch 'master' of ssh://gitlab.hasufell.de:22022/hasufell/cg3
Former-commit-id: 226aa498c22206829aa9adb69382d349e3460e26
2014-06-13 14:50:51 +02:00
034a8dd0be Use vertices normals of the .obj file
Former-commit-id: a78c9ea77d8bbb6f7ec87a8937e6275001c5c804
2014-06-13 14:50:15 +02:00
malte
d697d6ba72 OBJ: added a oval curve .obj file.
Former-commit-id: 5106d877da6d12b483f228c9156291e6df2c7062
2014-06-13 14:19:56 +02:00
malte
08fca27223 OBJ: Added some .obj files for the 5th prak.
The _all files contain additional information like vt.


Former-commit-id: 829473de17a6653311dff1d2caa2547b0f6e4948
2014-06-13 14:04:53 +02:00
9bb5228ca9 Add space station
Former-commit-id: 53e8855b4e8a709b754f82e9e8552de2e43d7551
2014-06-08 16:26:28 +02:00
hasufell
2552912e96 Fix bezier allocations
Former-commit-id: 588d1e5215bfd031832922394a7ddbe536e0917d
2014-06-08 04:24:25 +02:00
a2ce97bef9 Optimize file reading function
Former-commit-id: fd7b0850c404210c9cb73d698e3750ef656f2f78
2014-06-08 03:01:51 +02:00
a9ddb5622b Convert the rest to conditional reallocs
Former-commit-id: fb7bc22c43ee7c635f17f061c2de3fc0b21cbb83
2014-06-08 02:45:22 +02:00
0ed97a7057 Add star wars .objs
Former-commit-id: 9b611f9c6b6575821733df11cfec7893c513d83b
2014-06-08 00:25:21 +02:00
c68128ea0d
Add missing include 2014-06-08 00:25:14 +02:00
18d9a8c0c2
Update .gitignore 2014-06-08 00:25:08 +02:00
c895e3970f
Fix step factor calc in draw_bez() 2014-06-08 00:24:57 +02:00
ae45cf8627
Rm obsolete check 2014-06-07 02:25:52 +02:00
2df0e3eff8
Reallocate in chunks in assemble_obj_arrays() 2014-06-07 01:59:23 +02:00
9ae8fac4e2
Reinstate L/l for growing/shrinking vector normal length 2014-06-06 22:39:57 +02:00
6ccca351e8
Fix/add doxygen comments 2014-06-06 22:23:39 +02:00
bf9eff2e13
Rm extraneous newlines 2014-06-06 22:23:22 +02:00
480da24de4
Replace glut with SDL2 2014-06-06 22:16:33 +02:00
aa59033d28
Don't allow a negative ball speed 2014-06-02 00:13:15 +02:00
919436f997
Set color of ball to green 2014-06-01 19:20:25 +02:00
b24cef011c
Rm obsolete newline 2014-06-01 19:20:18 +02:00
107db13e2e
Fix doxygen comments 2014-06-01 19:20:08 +02:00
b01e00497d
Allow to draw frame and ball, small refactor 2014-06-01 19:12:07 +02:00
f83b778323
Visualize the construction of the indermediate bezier control points 2014-06-01 18:17:11 +02:00
1ca125b276
Set parameters const where possible 2014-06-01 16:47:58 +02:00
62e02582a4
Make bezier calculation more modular 2014-06-01 16:17:51 +02:00
ea8d08204c
Move bezier stuff to it's own module 2014-06-01 15:12:37 +02:00
af52bd4085
Add missing include 2014-06-01 15:10:46 +02:00
cabc8e8c09
Draw bezier curve 2014-06-01 02:13:45 +02:00
99863ddcdd
Fix memory leak when there is no face 2014-06-01 02:12:49 +02:00
a467ebc514
Draw Points as well for the curve 2014-05-31 18:54:28 +02:00
5afe6e0bda
Improve drawing conditions 2014-05-31 18:51:41 +02:00
b87a001ac5
Improve readability 2014-05-31 18:43:35 +02:00
74f0af7a07
Add bezier objects 2014-05-31 18:43:20 +02:00
1a107b455b
Allow to draw bezier curve (only the points) 2014-05-31 18:43:05 +02:00
cbbffc247b
Add bezier curve to test cube 2014-05-31 17:38:43 +02:00
2df200fce8
Update doxygen comments 2014-05-31 17:38:18 +02:00
a1be0803a6
Fix segfault in case we don't have any bezier curves 2014-05-31 17:37:06 +02:00
81e8aa0552
Allow to read bezier curves 2014-05-31 17:32:40 +02:00
hasufell
6e31ec91fd Fix finding dummy edge pairs 2014-05-19 18:14:04 +02:00
hasufell
4c20bca7e9 Improve doxygen comments 2014-05-19 18:13:51 +02:00
f65021dfac
Add missing doxygen comment 2014-05-17 18:42:30 +02:00
c8d9d410cf
Improve doxygen settings, use subdir 2014-05-17 18:12:37 +02:00
d3fe07c34d
Fix vsync 2014-05-17 17:24:29 +02:00
b5b35992c6
Improve doxygen comments 2014-05-17 16:32:45 +02:00
31d2bc5842
Add nude body 2014-05-17 16:26:09 +02:00
63510a02e7
Convert to unix line endings 2014-05-17 16:25:34 +02:00
acadb1161c
Be more fault tolerant for drawing normals
Some open data structures are not yet supported
with vertex normals. Avoid infinite loop for those and
just draw what we got.
2014-05-17 14:55:46 +02:00
a677668418
Free obj_f_vt if we don't need it 2014-05-17 14:18:58 +02:00