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
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
Seth Alves
2fbfa34c5c
removed uneeded logging
2015-04-06 09:14:53 -07:00
ZappoMan
7f4c577e80
end of file
2015-04-03 17:25:39 -07:00
ZappoMan
1a463a0256
more work on improved avatar UI adding model names and backward compatible support
2015-04-03 17:03:22 -07:00
Seth Alves
00449ef7c0
new member variable to remember the order in which meshes appeared in the model file
2015-04-01 17:50:35 -07:00
Seth Alves
36cd69c38a
new member variable to remember the order in which meshes appeared in the model file
2015-04-01 17:50:20 -07:00
Seth Alves
420424a5ee
make it possible to sort meshes into the same order they appear in the model file
2015-04-01 17:49:49 -07:00
Seth Alves
bacd6445f2
pull comments that get used as scaling hints into a hash table
2015-03-31 16:59:13 -07:00
Seth Alves
48144a46b1
don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.
2015-03-31 14:34:35 -07:00
Philip Rosedale
5325478940
Merge pull request #4528 from ZappoMan/avatarUI
...
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
2015-03-30 21:31:22 -07:00
ZappoMan
0366ce9bf5
removed dead code
2015-03-30 17:33:25 -07:00
ZappoMan
002fba8018
first cut at predicting FST type for set avatar
2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5
classifying FSTReader and moving ModelType into that class
2015-03-27 16:30:00 -07:00
Seth Alves
fd69a54f10
Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions
2015-03-27 15:55:20 -07:00
Seth Alves
cfa30594cc
make obj reader handle faces with more than 4 vertices
2015-03-27 14:24:36 -07:00
ZappoMan
6189926105
add type hint to FST in model packager
2015-03-27 13:23:29 -07:00
Atlante45
e16c8852fb
extra ;
2015-03-27 14:43:09 +01:00
Atlante45
daaba330d5
Turn lambda into helper function
2015-03-27 14:41:32 +01:00
Atlante45
c26b499671
Add forgotten include
2015-03-26 15:58:18 +01:00
