Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-17 14:17:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 74 branches 59 tags 1.2 GiB
Commit graph

401 commits

Author SHA1 Message Date
samcake
edaa8f998a Migrating to the new mesh for rendering and having problems with multi part mesh 2015-10-02 18:12:16 -07:00
samcake
edb485cb0f working on getting the Model payload to use model::Mesh 2015-10-02 12:24:41 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
samcake
b8ea83099a Debuggging 2015-10-01 21:13:22 -07:00
samcake
4478ca79ca Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-10-01 19:55:14 -07:00
Seth Alves
44e4f4dc63 merge from upstraem 2015-10-01 14:55:56 -07:00
Anthony J. Thibault
8bfd38ce7c FBXReader: When the animation has no animation curve use the joint's default position. 2015-10-01 14:15:02 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
samcake
840f92bd06 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c merging 2015-09-29 10:53:56 -07:00
samcake
103e1c76b3 Member initialization respecting the standard 2015-09-29 09:26:29 -07:00
samcake
1e9c19d535 Clean the Material FBX code and how we use the factor components for diffuse and specular 2015-09-28 17:46:48 -07:00
samcake
2a487a79a3 Getting something done today 2015-09-28 17:24:31 -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
samcake
95ea874d43 Minor fixes to the way the specular color is interpreted 2015-09-28 12:43:15 -07:00
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Seth Alves
27688fa55b get obj models to be visible again. textures don't work 2015-09-23 14:46:57 -07:00
samcake
d7d332acd4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 
t :wq
 2015-09-23 09:51:31 -07:00
samcake
518f5fe17c Starting to clean the mesh part of the RenderItem.... 2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
samcake
dfe17e5708 Fix issues from review 2015-09-21 16:12:17 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
a41c20a1b7 Fixing buggy hash map look up and cleaning of name 2015-09-20 14:17:55 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -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
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Andrew Meadows
16dfc39f5f fix collision shape of avatars 2015-09-03 18:22:35 -07:00
Anthony J. Thibault
de31b92fd5 Merge branch 'master' into ajt/new-anim-system 2015-09-02 17:53:56 -07:00
Anthony J. Thibault
99586f259c Renamed bindTransformIsValid to bindTransformFoundInCluster 2015-09-02 13:44:34 -07:00
Andrew Meadows
4a7a384c65 avoid bad joints when computing bounding capsule 2015-09-01 14:12:14 -07:00
Sam Gateau
4e944645fe more cleaning for showing a cleaner pr 2015-08-28 16:58:36 -07:00
Sam Gateau
b845fcaff9 Cleanup 2015-08-28 16:38:07 -07:00
Sam Gateau
e2fce12713 Splitting the FBXREader.cpp file into sub files 2015-08-28 09:51:03 -07:00
Sam Gateau
4f7b857130 Merge 2015-08-27 10:01:39 -07:00
Sam Gateau
f6953f8e02 REfining th eTextureMap design but still with the issue of the lightmapped model 2015-08-27 09:52:07 -07:00
Anthony J. Thibault
a04f356857 Merge branch 'master' into ajt/new-anim-system 2015-08-27 09:32:53 -07:00
Brad Davis
8cd13cad00 Merge pull request #5661 from sethalves/linux-memory-debugger 
call setup_memory_debugger from common macros rather than from everywhere
 2015-08-26 15:43:08 -07:00
Seth Alves
f53704051f ifdef out debug prints in OBJ reader 2015-08-26 15:09:58 -07:00
Seth Alves
695ffa29c7 call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00
Anthony J. Thibault
46c1e008bc Merge branch 'master' into ajt/new-anim-system 2015-08-26 10:37:39 -07:00
Sam Gateau
1e9fce2a61 Drafting the materials for FBXReader 2015-08-25 22:12:51 -07:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Anthony J. Thibault
5a73aef1f8 AnimSkeleton more accurate bind pose generation. 2015-08-24 16:19:16 -07:00
Anthony J. Thibault
fa5256eefd Merge branch 'master' into ajt/new-anim-system 2015-08-24 14:32:28 -07:00
Brad Davis
c3991dbb8c Merge pull request #5622 from hyperlogic/ajt/network-geometry-refactor 
ResourceCache, NetworkGeometry and Model refactoring and optimizations.
 2015-08-20 23:57:16 -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
Seth Alves
c25082d86f use -fsanitize=address in all code rather than just the top-level links 2015-08-20 10:14:16 -07:00
Seth Alves
1c8030472a back out the more controversial changes 2015-08-17 12:40:56 -07:00
Seth Alves
d6322903a2 quiet compiler 2015-08-11 10:12:46 -07:00
Sam Gateau
561a058dc8 cleaning th ecode 2015-08-06 18:53:21 -07:00
Sam Gateau
f0f141a2b4 SImple fix to the case of multiple material in a mesh with different opacity 2015-08-06 18:51:44 -07:00
Anthony J. Thibault
da3d35cdfc Added scaleOffset to FBXJoint::postTransform as it was missing. 
Also added some documentation/comments to the FBXJoint struct.
 2015-08-04 18:14:50 -07:00
Andrew Meadows
b00d47d62e merge master into cleanup of legacy shapes 2015-08-03 11:19:29 -07:00
Andrew Meadows
acfc907704 Merge pull request #5438 from howard-stearns/rig 
Rig: Bottleneck animation management through a Rig class
 2015-08-03 11:14:21 -07:00
ZappoMan
05a4a6aa9b implement on-the-fly conversion of FBXMeshParts that are quads, into their triangle equivalents 2015-08-01 13:07:56 -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
06aa107762 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-30 09:57:02 -07:00
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
Marcel Verhagen
fa6d6a5123 Added the & references to the const variables 2015-07-30 15:08:02 +02: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
c7f367bfd7 removing unnecessary #include <Shape.h> 2015-07-27 15:30:37 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Marcel Verhagen
d25e09af74 removed the last 2 filename lines, they should not be there. 2015-07-26 00:48:31 +02:00
Andrew Meadows
6657026a12 remove cruft: legacy shapes for skeleton bones 2015-07-23 08:34:44 -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
David Rowe
55683e0cd5 Size looking-at-me eye spheres per avatar model dimensions 2015-07-21 18:24:47 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Howard Stearns
3cd1e318b2 Fix https://app.asana.com/0/32622044445063/39927009585710 2015-07-14 13:15:24 -07:00
Marcel Verhagen
fac497dadc Removed the file where the directory is stripped off the RelativeFilename, and replace \ with /. 
However this introduces a new problem with the current fbx files who do not have their textures in the original dir but moved it to the dir where the fbx file lives.

Suppose there should be some logic when the texture is not found to look if the texture lives in the dir above the RelativeFilename.
In any case it is not obvious when there is a texture missing on a model, it simply renders black.
 2015-07-14 15:31:56 +02:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
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
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