Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 14:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
30517 commits 71 branches 56 tags 1.2 GiB
Commit graph

136 commits

Author SHA1 Message Date
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
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -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
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Philip Rosedale
761f638ce3 Merge pull request #5466 from sethalves/vhacd-improvements 
vhacd tool -- make the height of the tetrahedrons in 'fatten' mode less tall.
 2015-08-03 11:18:37 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Brad Davis
aea07fe671 Merge branch 'master' into gl4_1 
Conflicts:
	libraries/gpu/src/gpu/Config.slh
	libraries/render-utils/src/deferred_light_limited.slv
	libraries/render-utils/src/simple.slf
	libraries/render-utils/src/simple_textured.slf
	tests/render-utils/src/main.cpp
	tools/scribe/src/main.cpp
 2015-07-31 15:08:37 -07:00
Seth Alves
5bae9843f5 code review 2015-07-31 09:34:50 -07:00
Seth Alves
c8f398024e replace a magic number with a constant 2015-07-30 21:16:07 -07:00
Seth Alves
0bc94158a8 make the height of the tetrahedrons in 'fatten' mode less tall. 2015-07-30 21:09:14 -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
Howard Stearns
1663d095a1 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-24 14:08:51 -07:00
Seth Alves
6ba135de09 when creating a walking surface collision hull from a flat mesh, ignore triangles with a normal that's not mostly up or down 2015-07-24 07:16:40 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -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
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Brad Davis
d8dde71c8f Make scribe generated shaders more readable 2015-07-12 18:46:08 -07:00
Atlante45
7b5a5a339a Use make_shared/create to make shared pointers 2015-07-01 19:46:06 -07:00
Brad Davis
f51c43f90d Working on GL 4.1 2015-06-23 09:47:18 -07:00
Seth Alves
b258aeaa3d merge from master 2015-06-18 10:04:14 -07:00
ZappoMan
58ee5217e3 fix some warnings 2015-06-17 14:08:02 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
David Rowe
a01830f8f8 Fix some double to float conversion warnings in Windows builds 2015-05-22 12:32:02 -07:00
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
Seth Alves
b2583298a9 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-05-03 10:45:55 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Howard Stearns
242001a589 Restore some very odd modularity used by VHACDUtil. 2015-04-29 22:17:44 -07:00
Stephen Birarda
1058a61ddd only look for OpenMP on UNIX 2015-04-15 15:21:35 -07:00
Stephen Birarda
134704412a check for OpenMP on non Win32 platforms 2015-04-15 15:13:39 -07:00
Stephen Birarda
6d53bb2809 remove extra directives from vhacd-util cmake 2015-04-15 14:48:42 -07:00
Stephen Birarda
03129f98d4 make VHACD an external project 2015-04-15 13:51:51 -07:00
Seth Alves
922452f5c3 use output filename as base-name when splitting files 2015-04-13 09:21:17 -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
62fe9870e3 more command-line arguments 2015-04-08 10:48:13 -07:00
Seth Alves
1a7bdee180 added code to split an fbx into one obj file per mesh-part 2015-04-03 19:30:05 -07:00
Seth Alves
2dc4410f7e added code to split an fbx into one obj file per mesh-part 2015-04-03 19:29:45 -07:00
Seth Alves
a01ade2d8d more command-line options 2015-04-02 09:19:47 -07:00
Seth Alves
17f110172f more command-line flags for v-hacd parameters 2015-04-02 06:57:47 -07:00
Seth Alves
06b38615d5 sort meshes into the order they appeared in the model file so that start and end arguments mean something usefil 2015-04-01 17:53:33 -07:00
Seth Alves
c035de4e73 cleanups 2015-04-01 11:38:54 -07:00
Seth Alves
4859278214 get rid of point/tri bounce structures in favor of FBXGeometry 2015-04-01 11:17:25 -07:00
Seth Alves
23903570f0 added more options to v-hacd util, messed with fatten-mesh code some more 2015-04-01 09:19:34 -07:00
Seth Alves
5cc12b8b47 allow for quads in the model which is being used as the template for generating the collision shape. added a flag to run the fatten-face code 2015-03-31 17:00:36 -07:00
Seth Alves
071b6a21de Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 13:44:39 -07:00
Seth Alves
2dd33e5334 don't include build-ext in tags 2015-03-29 05:40:16 -07:00