Commit graph

119 commits

Author SHA1 Message Date
Brad Hefta-Gaub
b95e4e1e93 Merge pull request #5323 from MarcelEdward/20605
Removed the  line where the directory is stripped off the RelativeFile
2015-07-30 07:30:01 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
Marcel Verhagen
8f0893ba21 Added fileOnUrl to check if a texture exist at the location. It return the correct filename of where the texture lives.
Added the url of the fix file to extractFBXGeometry and readFBX and updated the calls to readFBX to include the url of the fix file.

So it now does not break existing content.

Found a second place in the FBXReader.cpp where the RelativeFileName stripped out the dir location.
2015-07-22 22:34:45 +02:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Brad Davis
d8dde71c8f Make scribe generated shaders more readable 2015-07-12 18:46:08 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
Howard Stearns
4090f892b2 Merge remote-tracking branch 'upstream/master' into objReader 2015-05-05 14:58:18 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Howard Stearns
242001a589 Restore some very odd modularity used by VHACDUtil. 2015-04-29 22:17:44 -07:00
Stephen Birarda
1058a61ddd only look for OpenMP on UNIX 2015-04-15 15:21:35 -07:00
Stephen Birarda
134704412a check for OpenMP on non Win32 platforms 2015-04-15 15:13:39 -07:00
Stephen Birarda
6d53bb2809 remove extra directives from vhacd-util cmake 2015-04-15 14:48:42 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Seth Alves
922452f5c3 use output filename as base-name when splitting files 2015-04-13 09:21:17 -07:00
Seth Alves
efa5c473d2 add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields 2015-04-09 14:29:17 -07:00
Seth Alves
62fe9870e3 more command-line arguments 2015-04-08 10:48:13 -07:00
Seth Alves
1a7bdee180 added code to split an fbx into one obj file per mesh-part 2015-04-03 19:30:05 -07:00
Seth Alves
2dc4410f7e added code to split an fbx into one obj file per mesh-part 2015-04-03 19:29:45 -07:00
Seth Alves
a01ade2d8d more command-line options 2015-04-02 09:19:47 -07:00
Seth Alves
17f110172f more command-line flags for v-hacd parameters 2015-04-02 06:57:47 -07:00
Seth Alves
06b38615d5 sort meshes into the order they appeared in the model file so that start and end arguments mean something usefil 2015-04-01 17:53:33 -07:00
Seth Alves
c035de4e73 cleanups 2015-04-01 11:38:54 -07:00
Seth Alves
4859278214 get rid of point/tri bounce structures in favor of FBXGeometry 2015-04-01 11:17:25 -07:00
Seth Alves
23903570f0 added more options to v-hacd util, messed with fatten-mesh code some more 2015-04-01 09:19:34 -07:00
Seth Alves
5cc12b8b47 allow for quads in the model which is being used as the template for generating the collision shape. added a flag to run the fatten-face code 2015-03-31 17:00:36 -07:00
Seth Alves
071b6a21de Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 13:44:39 -07:00
Seth Alves
2dd33e5334 don't include build-ext in tags 2015-03-29 05:40:16 -07:00
Seth Alves
43c3c621a8 I can't set VHACD_ROOT_DIR and run cmake with this line. 2015-03-28 17:14:39 -07:00
Seth Alves
7c4ada9953 multiply points from fbs meshes by their transformation matrices 2015-03-26 06:37:05 -07:00
Seth Alves
c68f5dd1fa added various controls for the convex hull generator 2015-03-25 15:13:40 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Seth Alves
d074cec135 fix obj writer in vhacd util 2015-03-15 08:14:25 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Seth Alves
3642e93b3f keep triangles facing outward 2015-03-07 11:28:09 -08:00
Seth Alves
d642b52de3 swap y and z coords because normal obj format has 3rd value as up 2015-03-07 07:54:19 -08:00
Seth Alves
adfacf1e98 adjust debugging prints 2015-03-07 07:53:45 -08:00
Seth Alves
858d15d0ba obj reader sort-of works 2015-03-06 13:15:53 -08:00
Seth Alves
0d093b4921 rename binary from vhacd to vhacd-util. vhacd-util outpus obj files 2015-03-05 15:38:55 -08:00
Seth Alves
af4957ff14 start to write out obj from vhacd 2015-03-05 06:38:42 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
95839dd64e untabify the source files 2015-02-27 00:27:18 +05:30