Sam Gateau
b0f5990bd7
fix syntax
2015-06-19 17:13:29 +02:00
Sam Gateau
b09991d75b
Merge branch 'master' of https://github.com/highfidelity/hifi into daft
2015-06-19 09:35:40 +02:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Sam Gateau
9be87758fd
Improving the design of the Jobs and varying
2015-06-16 15:00:47 +02:00
ZappoMan
aa05d9f67c
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments
2015-06-10 08:53:33 -07:00
ZappoMan
ba0cecb356
remove attachments from Model - only supported at avatar layer
2015-06-09 12:32:37 -07:00
Sam Gateau
7de4c2eff7
first take on the materialKey
2015-06-09 12:17:10 -07:00
Seth Alves
1e2e4001b1
don't allow buildModelMesh to spam logs when it encounters flawed models
2015-05-14 10:24:02 -07:00
Seth Alves
0db5ddc5b7
port code from samcake's model branch
2015-05-13 15:43:16 -07:00
Howard Stearns
c0a71da9e3
Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting ( http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj ).
2015-05-09 13:16:34 -07:00
Howard Stearns
8db8e56af0
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 16:41:52 -07:00
Howard Stearns
aad4c06244
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-07 12:03:56 -07:00
Howard Stearns
9acdb3fb28
Proper defaults for material properties and a fail-safe for missing uv coordinates.
2015-05-07 10:47:50 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Howard Stearns
35337ef2c2
Spell out order-of-evaluation for the compiler.
2015-05-06 12:28:45 -07:00
Howard Stearns
d2dbb2c116
Missing the code!
2015-05-06 11:57:34 -07:00
Howard Stearns
4090f892b2
Merge remote-tracking branch 'upstream/master' into objReader
2015-05-05 14:58:18 -07:00
Sam Gateau
73177cd81d
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-04 14:07:59 -07:00
Sam Gateau
ade404a74d
getting rid of QSHaredPointer in favor of std::shared_ptr
2015-05-04 13:43:30 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Howard Stearns
eb05099261
(Try to) Address header file-location-discrepency between xcode and the jenkinds build environment.
2015-05-01 21:39:19 -07:00
Howard Stearns
e1d47413cc
Material library handling.
...
This is now functionally complete, but it needs testing, and the some tidying up.
2015-05-01 20:54:25 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Sam Gateau
1b558e7390
investigating the semi transparent textured bug
2015-05-01 13:37:04 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
Howard Stearns
ee93e1d300
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader
2015-05-01 09:51:15 -07:00
Seth Alves
f75b599288
don't save default values in json file
2015-04-30 11:28:27 -07:00
Howard Stearns
bf45f865a4
Codding standards, and fix an unintentionally duplicated declaration.
2015-04-30 10:07:46 -07:00
Howard Stearns
2687a7b038
Take 2 on making MSVC happy.
2015-04-30 08:25:32 -07:00
Howard Stearns
fd63cb7ed1
Attempt to clean up cross-platform isdigit reference.
2015-04-30 07:28:13 -07:00
Howard Stearns
7245ca4ff3
According to the jenkins build report, Windows/MSVC has a different definition of std C++ than ISO does.
...
Fine. Make our own cross-platform isdigit.
2015-04-29 22:57:41 -07:00
Howard Stearns
242001a589
Restore some very odd modularity used by VHACDUtil.
2015-04-29 22:17:44 -07:00
Howard Stearns
810242e182
coding standard: comparison for pointer types (replaced with object isEmpty)
2015-04-29 16:12:22 -07:00
Howard Stearns
fb825f6d10
Noisy constant for number of vertices in a triangle.
2015-04-29 15:45:38 -07:00
Howard Stearns
3c88146d17
Fix indentation.
2015-04-29 15:39:30 -07:00
Howard Stearns
1e81caab6c
Get rid of superflous this->.
...
Add comments about side-effect of getFloat().
2015-04-29 15:37:39 -07:00
Howard Stearns
1255d46140
coding standard: type formatting and variable names
2015-04-29 15:19:40 -07:00
Howard Stearns
5d729b98d6
coding standard: brace placement
2015-04-29 14:05:30 -07:00
Howard Stearns
bd5272d677
Textures for .obj reader:
...
Refactor so that uv coordinates can be associated with vertices that might otherwise be on different materials.
Defer the assignment vertex/normal/uv assignment until later so that it could potentially be moved directly to model geometry instead of fbx geometry.
Handle the actual uv coordinates.
This version does not handle explicit .mtl files, but it does handle those .obj files that follow the convention that there is a .jpg with the same name as the .obj file.
2015-04-29 13:35:21 -07:00
Seth Alves
0fb1a83e3b
quiet compiler, remove some trailing control-Ms
2015-04-25 09:20:00 -07:00
Atlante45
bda72025af
Check mesh extend before going through triangles
2015-04-23 16:40:40 +02:00
Atlante45
99b3ef0d75
Move contain function to FBXGeometry
2015-04-22 21:17:12 +02:00
Sam Gateau
f06556ba12
migrate the various list to sort the rendering from explicit names to a more generic key based map
2015-04-16 14:37:39 -07:00
ZappoMan
ae16bab7c2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2015-04-14 13:13:15 -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
Sam Gateau
f0efade06d
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-04-07 12:56:21 -07:00
Seth Alves
9014397167
try again without macro
2015-04-07 09:59:04 -07:00
Sam Gateau
dee651069c
adding support for color attribute in FBX, and displaying it correctly
2015-04-06 23:33:13 -07:00
Seth Alves
8bd77fbcc7
separate out logging for fbx and gpu libraries
2015-04-06 16:52:31 -07:00
Seth Alves
7af32bd67a
put audio and script-engine logging into their own QLoggingCategory
2015-04-06 15:57:18 -07:00
