Zach Pomerantz
3280894e29
Load texture by convention with .obj
2015-12-15 19:30:15 -08:00
Seth Alves
3db148f3dc
fix obj model meshes
2015-10-08 11:13:52 -07:00
Seth Alves
a8b135b5ca
fix material colors for OBJ models
2015-09-28 17:02:00 -07:00
Seth Alves
8f02ffb76a
git rid of if branch with same code in either branch
2015-09-28 15:32:53 -07:00
Seth Alves
27688fa55b
get obj models to be visible again. textures don't work
2015-09-23 14:46:57 -07:00
Brad Hefta-Gaub
7536fed09a
more warning fixes
2015-09-22 17:22:09 -07:00
Sam Gateau
c37cdce750
Merging back with master
2015-09-10 17:53:50 -07:00
Howard Stearns
74c92af8e0
Merge pull request #5741 from AndrewMeadows/brokenCapsules
...
fix for bad bounding capsules for avatars
2015-09-09 09:33:57 -07:00
Andrew Meadows
281e4f21fc
fix avatar bounding capsule calculations
2015-09-08 15:03:12 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Sam Gateau
4e944645fe
more cleaning for showing a cleaner pr
2015-08-28 16:58:36 -07:00
Sam Gateau
4f7b857130
Merge
2015-08-27 10:01:39 -07:00
Seth Alves
f53704051f
ifdef out debug prints in OBJ reader
2015-08-26 15:09:58 -07:00
Sam Gateau
1e9fce2a61
Drafting the materials for FBXReader
2015-08-25 22:12:51 -07:00
Anthony J. Thibault
1b3d7fabc8
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
...
* Removed validation logic from Resource class, Qt does this internally and is more
standards compliant. This should result in more accurate caching and faster resource
fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.
* NetworkGeometry now uses multiple Resource objects to download
the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
have to poll it to determine when loading is complete (except for textures *sigh*)
Some functionality was removed
* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.
* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
This can result in a pop when switching avatars, and there's no longer a default
if avatar loading fails.
2015-08-20 18:59:51 -07:00
Andrew Meadows
661a916ebd
merge rig into cleanup (removal of legacy shapes)
...
Conflicts:
interface/src/avatar/Avatar.h
tests/physics/src/ShapeColliderTests.cpp
tests/physics/src/ShapeColliderTests.h
2015-07-31 13:40:51 -07:00
Howard Stearns
ebd0e38d49
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-29 18:54:40 -07:00
Seth Alves
b7ecffa0be
treat a "g" in an obj file the same as a "o"
2015-07-29 17:55:56 -07:00
Andrew Meadows
2c66af67e9
Merge howard/rig into andrew/caesium
2015-07-29 09:04:32 -07:00
Andrew Meadows
0a5ada3c09
remove legacy shapes
2015-07-29 09:02:24 -07:00
Howard Stearns
e7516aab02
Merge branch 'master' of https://github.com/highfidelity/hifi into rig
2015-07-28 11:17:35 -07:00
Seth Alves
f4a23065b4
if obj data isn't from a url, don't dereference null url pointer
2015-07-27 19:06:14 -07:00
Andrew Meadows
6657026a12
remove cruft: legacy shapes for skeleton bones
2015-07-23 08:34:44 -07:00
Atlante45
7b5a5a339a
Use make_shared/create to make shared pointers
2015-07-01 19:46:06 -07: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
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
9acdb3fb28
Proper defaults for material properties and a fail-safe for missing uv coordinates.
2015-05-07 10:47:50 -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
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
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
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
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
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
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
