Commit Graph

146 Commits

Author SHA1 Message Date
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
01a214aa01
Merge branch 'master' of ssh://gitlab.hasufell.de:22022/hasufell/cg3 2014-05-17 14:14:00 +02:00
090f1ac2ba
Add TODO 2014-05-17 14:12:20 +02:00
2f52351cbf
Refactor
Use a separate accelertion struct for HE_vert.
Don't use so long parameter lists, introduce obj_items
data structure.
2014-05-17 14:07:34 +02:00
hasufell
f84e62141e Fix typo in make clean 2014-05-17 04:07:29 +02:00
9c35ee0159
Fix doxygen comments 2014-05-17 03:54:07 +02:00
24336aefb2
Add make check target 2014-05-17 03:53:42 +02:00
85064e2f0c
Rm obsolete casts 2014-05-17 03:44:19 +02:00
9e8b11f3bc
Update keyboard doc 2014-05-17 03:40:13 +02:00
20533eea4b
Make normals a bit smaller and better to control 2014-05-17 03:32:14 +02:00
cb54d54e2c
Set window title 2014-05-17 03:31:56 +02:00
03440fa469
Improve inline doc 2014-05-17 03:05:19 +02:00
0659288497
Fix doxygen comments 2014-05-17 02:59:43 +02:00
bf7b86845e
Save texture coordinates as well 2014-05-17 02:52:00 +02:00
a451979501
Re-refactor
Let's keep this speed-optimized, even though
we want to achieve high readability.
2014-05-17 01:22:05 +02:00
a9bd5ae144
Fix doxygen file comment 2014-05-16 20:20:42 +02:00
cd864fa1ba
Move half-edge assembler to separate .c file 2014-05-16 20:10:43 +02:00
dfd978f714
Refactor parse_obj() and move some subroutines to new functions 2014-05-16 19:57:43 +02:00
0ecd0d8e9f
Merge branch 'master' into refactor
Conflicts:
	src/half_edge.c
2014-05-16 19:15:29 +02:00
f62e280cea
Reimplement dummy-edge logic
This will also work for more complex structures such as
testscube2_mitSpitze_offen.obj.
2014-05-16 19:04:38 +02:00
29f06e91f4
Add testcube .obj for non-trivial normals 2014-05-16 19:04:22 +02:00
8ec744867c
Remove obsolete usleep call in gl_draw.c 2014-05-16 15:09:27 +02:00
852cb7cca5
Add more .obj files for testing normals 2014-05-16 15:09:14 +02:00
69dc76a59e
Finalize consistency tests 2014-05-16 15:08:51 +02:00
49dc760681
Merge branch 'master' into refactor 2014-05-16 14:53:47 +02:00
a2b604de2f
Finalize half-edge consistency tests 2014-05-16 01:11:21 +02:00
a3bac07c2b
Add fps counter (by Malte) 2014-05-16 00:32:38 +02:00
be95307ceb
Rm trailing whitespace in barcelona chair 2014-05-16 00:16:34 +02:00
15e5ab1c23
New fill_vertices() method, simplify some data types 2014-05-16 00:15:29 +02:00
491a5fbe91
Finish up the new parsing modules 2014-05-15 22:42:22 +02:00
23dbcf2c58
Improve allocation logic 2014-05-15 19:04:51 +02:00
242af84c99
Remove obsolete macro
It is already in half_edge.c and since it refers to a static
function it has no place here.
2014-05-15 18:52:52 +02:00
aaa485f072
Try to fix normals for open edges
Probably still not correct, depending on the complexity
of the object.
2014-05-15 18:52:28 +02:00
3687646974
Fix include order 2014-05-15 18:51:48 +02:00
baed4a52f8
Fix inline comment 2014-05-15 18:51:41 +02:00
307df91fcf
Use REALLOC macro for improved readability 2014-05-15 18:50:57 +02:00
a4026b63e6
Fix doxygen comment 2014-05-15 18:34:07 +02:00
80ccc24564
Update .gitignore 2014-05-15 18:33:53 +02:00
fd9d15c4ea
Add more user controls, draw faces as separate polygons
This also fixes drawing of open objects.
2014-05-15 18:33:43 +02:00
a25bc0ff4d
Fix clean target 2014-05-15 18:18:25 +02:00
8bfcd49686
Add more .obj files 2014-05-15 18:18:10 +02:00
6ceeff5a7b
First try of consistent half-edge struct test 2014-05-14 01:40:39 +02:00
1bd4bfa1b7
Fix face assignments 2014-05-13 23:28:47 +02:00
7650f83c36
Fix memory leak 2014-05-13 21:43:56 +02:00
c6e84bb7f5
Improve inline doc 2014-05-13 20:26:36 +02:00
bb1e4cb38d
Add example .obj file
This represents a cubus with one face missing, so the cubus
is open.
2014-05-13 20:23:02 +02:00