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

286 commits

Author SHA1 Message Date
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
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
Atlante45
716e9bfe4f Hint order for FST files 2015-03-26 15:40:48 +01:00
Seth Alves
a2bc34ced9 fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review 2015-03-16 10:03:55 -07:00
Seth Alves
b15fd2ef94 compatibility and other fixes for obj reader 2015-03-15 08:08:39 -07:00
Seth Alves
ab8784f1b4 add comment about character capsule being hard-coded 2015-03-09 13:51:08 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
804d4a0963 coding standard 2015-03-07 20:31:37 -08:00
Seth Alves
05e0fe3536 object display correctly now? 2015-03-07 11:28:30 -08:00
Seth Alves
f807384dfe build a joint and caclulate extents. obj models now show up, though not correctly. 2015-03-07 07:55:04 -08:00
Seth Alves
591edc0527 _mesh instance variable doesn't appear to be in use. 2015-03-07 07:51:47 -08:00
Seth Alves
6e79fc8b68 Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide 2015-03-06 18:46:13 -08:00