Commit Graph

192 Commits

Author SHA1 Message Date
hasufell a677668418
Free obj_f_vt if we don't need it 2014-05-17 14:18:58 +02:00
hasufell 01a214aa01
Merge branch 'master' of ssh://gitlab.hasufell.de:22022/hasufell/cg3 2014-05-17 14:14:00 +02:00
hasufell 090f1ac2ba
Add TODO 2014-05-17 14:12:20 +02:00
hasufell 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
hasufell 9c35ee0159
Fix doxygen comments 2014-05-17 03:54:07 +02:00
hasufell 24336aefb2
Add make check target 2014-05-17 03:53:42 +02:00
hasufell 85064e2f0c
Rm obsolete casts 2014-05-17 03:44:19 +02:00
hasufell 9e8b11f3bc
Update keyboard doc 2014-05-17 03:40:13 +02:00
hasufell 20533eea4b
Make normals a bit smaller and better to control 2014-05-17 03:32:14 +02:00
hasufell cb54d54e2c
Set window title 2014-05-17 03:31:56 +02:00
hasufell 03440fa469
Improve inline doc 2014-05-17 03:05:19 +02:00
hasufell 0659288497
Fix doxygen comments 2014-05-17 02:59:43 +02:00
hasufell bf7b86845e
Save texture coordinates as well 2014-05-17 02:52:00 +02:00
hasufell 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
hasufell a9bd5ae144
Fix doxygen file comment 2014-05-16 20:20:42 +02:00
hasufell cd864fa1ba
Move half-edge assembler to separate .c file 2014-05-16 20:10:43 +02:00
hasufell dfd978f714
Refactor parse_obj() and move some subroutines to new functions 2014-05-16 19:57:43 +02:00
hasufell 0ecd0d8e9f
Merge branch 'master' into refactor
Conflicts:
	src/half_edge.c
2014-05-16 19:15:29 +02:00
hasufell 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
hasufell 29f06e91f4
Add testcube .obj for non-trivial normals 2014-05-16 19:04:22 +02:00
hasufell 8ec744867c
Remove obsolete usleep call in gl_draw.c 2014-05-16 15:09:27 +02:00
hasufell 852cb7cca5
Add more .obj files for testing normals 2014-05-16 15:09:14 +02:00
hasufell 69dc76a59e
Finalize consistency tests 2014-05-16 15:08:51 +02:00
hasufell 49dc760681
Merge branch 'master' into refactor 2014-05-16 14:53:47 +02:00
hasufell a2b604de2f
Finalize half-edge consistency tests 2014-05-16 01:11:21 +02:00
hasufell a3bac07c2b
Add fps counter (by Malte) 2014-05-16 00:32:38 +02:00
hasufell be95307ceb
Rm trailing whitespace in barcelona chair 2014-05-16 00:16:34 +02:00
hasufell 15e5ab1c23
New fill_vertices() method, simplify some data types 2014-05-16 00:15:29 +02:00
hasufell 491a5fbe91
Finish up the new parsing modules 2014-05-15 22:42:22 +02:00
hasufell 23dbcf2c58
Improve allocation logic 2014-05-15 19:04:51 +02:00
hasufell 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
hasufell 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
hasufell 3687646974
Fix include order 2014-05-15 18:51:48 +02:00
hasufell baed4a52f8
Fix inline comment 2014-05-15 18:51:41 +02:00
hasufell 307df91fcf
Use REALLOC macro for improved readability 2014-05-15 18:50:57 +02:00
hasufell a4026b63e6
Fix doxygen comment 2014-05-15 18:34:07 +02:00
hasufell 80ccc24564
Update .gitignore 2014-05-15 18:33:53 +02:00
hasufell 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
hasufell a25bc0ff4d
Fix clean target 2014-05-15 18:18:25 +02:00
hasufell 8bfcd49686
Add more .obj files 2014-05-15 18:18:10 +02:00
hasufell 6ceeff5a7b
First try of consistent half-edge struct test 2014-05-14 01:40:39 +02:00
hasufell 1bd4bfa1b7
Fix face assignments 2014-05-13 23:28:47 +02:00
hasufell 7650f83c36
Fix memory leak 2014-05-13 21:43:56 +02:00
hasufell c6e84bb7f5
Improve inline doc 2014-05-13 20:26:36 +02:00
hasufell 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
hasufell 07a2827c2f
Improve inline comments 2014-05-13 20:16:33 +02:00
hasufell 33408e5e46
Add is_null_vector() function 2014-05-13 20:09:32 +02:00
hasufell e4bad92195
Implement acceleration structure 2014-05-13 20:09:16 +02:00
hasufell b3b5c84d1c
Cosmetics 2014-05-13 14:05:10 +02:00