Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
87337 commits 29 branches 0 tags 1.1 GiB
Commit graph

1831 commits

Author SHA1 Message Date
Ryan Huffman
b73d307210 Move std::placeholders::_1 to where they are used 2015-09-01 12:24:38 -07:00
Ryan Huffman
fb8e822fa8 Fix lines longer than 120 columns 2015-09-01 12:14:58 -07:00
Ryan Huffman
019d234ffd Replace std::bind for methods that use std::unique_ptr with a lambda 2015-09-01 11:58:33 -07:00
Stephen Birarda
80cf7b6c76 resolve conflicts on merge with upstream/master 2015-08-27 14:50:04 -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
Atlante45
179ee73e26 Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol 2015-08-26 16:50:33 +02:00
Brad Davis
d311e4f2ea Fixing problems reported by static analysis tool 2015-08-25 19:18:55 -07:00
Stephen Birarda
67816c033a output megabits per second not per interval 2015-08-25 15:43:21 -07:00
Stephen Birarda
9ff7bfd0b5 some header cleanup in UDTTest output 2015-08-25 11:21:04 -07:00
Stephen Birarda
92116dd6e7 added stats for receive rate in Mbits 2015-08-25 11:04:24 -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
Stephen Birarda
1756e60647 complete test for ordered packets in udt-test target 2015-08-20 14:22:05 -07:00
Stephen Birarda
039e6121bc add randomization of data for ordered test 2015-08-20 12:44:10 -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
Ryan Huffman
74547777df Add basic test to send packetList in udt-test 2015-08-18 23:12:09 -07:00
Stephen Birarda
fd43c48eac resolve conflicts on merge with birarda/protocol 2015-08-18 11:48:36 -07:00
Stephen Birarda
972cf8cb02 remove the container-profile tool 2015-08-18 11:32:00 -07:00
Stephen Birarda
c6467f7fbc rename the container-test to container-profile 2015-08-18 11:31:11 -07:00
Stephen Birarda
bf919f105a add a simple container-test, speed HifiSockAddr hashing 2015-08-18 11:29:07 -07:00
Stephen Birarda
5c2348cf0d remove header for commented stats 2015-08-18 09:49:39 -07:00
Stephen Birarda
ffa2070a46 remove commented stats in UDTTest 2015-08-18 09:44:56 -07:00
Stephen Birarda
2ec4d8ff3c rename return of HifiSockAddr objects for connections 2015-08-17 16:39:12 -07:00
Stephen Birarda
5124fc1ea0 add LogHandler to UDTTest 2015-08-04 16:31:40 -07:00
Stephen Birarda
7b8ca2c0f2 fix suppression of link saturation messages 2015-08-04 16:29:53 -07:00
Stephen Birarda
52b1b647a2 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-08-04 10:51:23 -07:00
Bradley Austin Davis
3c76c0d4b6 Merge remote-tracking branch 'upstream/master' into core 2015-08-04 10:23:54 -07:00
Stephen Birarda
49dba76986 resolve conflicts on merge with clement 2015-08-03 19:14:52 -07:00
Atlante45
924a4d3c21 Change connection stats 2015-08-03 19:12:58 -07:00
Stephen Birarda
a10746a448 set the max window size, correct a typo 2015-08-03 19:12:39 -07:00
Atlante45
40520c204f Stats improvement 2015-08-03 17:39:09 -07:00
Stephen Birarda
b5ec02bd01 go back to previous PacketTimeWindow code 2015-08-03 15:36:08 -07:00
Atlante45
8704f05812 Added UDTTest server stats 2015-08-03 14:40:18 -07:00
Stephen Birarda
20f33b3b64 fix sendqueue sleep timing to use microseconds 2015-08-03 14:34:12 -07:00
Stephen Birarda
51b47a1212 change stats sampling to 100ms 2015-08-03 13:27:00 -07:00
Stephen Birarda
62d4467f41 use a vector for events in ConnectionStats 2015-08-03 12:09:25 -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
Stephen Birarda
4230d02184 rename col for light ACKs 2015-08-03 11:06:48 -07:00
Stephen Birarda
826c8d5150 more stats in UDTTest for sender 2015-07-31 19:52:20 -07:00
Stephen Birarda
7f8c993bd7 make send rate actually send rate, don't sync as sender 2015-07-31 19:42:27 -07:00
Stephen Birarda
74a2d985eb tell the send queue about ACKs on light ACK 2015-07-31 19:17:02 -07:00
Stephen Birarda
41c6220731 resolve conflicts on merge with upstream/master 2015-07-31 17:27:23 -07:00
Stephen Birarda
df1e97c591 cleanup RTT stats, add assert for CT 2015-07-31 17:19:14 -07:00
Sam Gateau
ca4dbdb996 Merging with upstream and compiling on windows 2015-07-31 16:14:53 -07:00
Stephen Birarda
d420bca88e fix for ACK2 sending, output prettier stats 2015-07-31 16:14:33 -07:00
Stephen Birarda
ce21204151 add output of connection stats in UDTTest 2015-07-31 15:09:30 -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
Stephen Birarda
a38e7b0431 cleanup SendQueue start and UDTTest bind 2015-07-30 17:59:27 -07:00
Stephen Birarda
8e786cb953 repairs while testing with UDTTest 2015-07-30 17:40:51 -07:00
Stephen Birarda
805c5a6aff reset initial to 500, remove debug 2015-07-30 17:22:25 -07:00
Stephen Birarda
0f1d1a16a7 actually call sendReliablePacket for write of reliable 2015-07-30 17:12:44 -07:00
Stephen Birarda
d340515ab3 complete the initial version of UDTTest 2015-07-30 17:09:25 -07:00
Stephen Birarda
80ef80ec2e add all initial command line options for UDTTest 2015-07-30 16:07:14 -07:00
Stephen Birarda
532ac69091 initial version of UDTTest tool 2015-07-30 15:36:54 -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
Seth Alves
43c3c621a8 I can't set VHACD_ROOT_DIR and run cmake with this line. 2015-03-28 17:14:39 -07:00
Seth Alves
7c4ada9953 multiply points from fbs meshes by their transformation matrices 2015-03-26 06:37:05 -07:00
Seth Alves
c68f5dd1fa added various controls for the convex hull generator 2015-03-25 15:13:40 -07:00
Brad Davis
54f2774d2e Organize projects into folders for IDEs that support it 2015-03-19 15:45:11 -07:00
Seth Alves
d074cec135 fix obj writer in vhacd util 2015-03-15 08:14:25 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
Sam Gateau
d9c071a2a9 trying to put the atmospheric effect in a shader header and use it on the directional lighting pass 2015-03-10 00:47:27 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Seth Alves
3642e93b3f keep triangles facing outward 2015-03-07 11:28:09 -08:00
Seth Alves
d642b52de3 swap y and z coords because normal obj format has 3rd value as up 2015-03-07 07:54:19 -08:00
Seth Alves
adfacf1e98 adjust debugging prints 2015-03-07 07:53:45 -08:00
Seth Alves
858d15d0ba obj reader sort-of works 2015-03-06 13:15:53 -08:00
Seth Alves
0d093b4921 rename binary from vhacd to vhacd-util. vhacd-util outpus obj files 2015-03-05 15:38:55 -08:00
Seth Alves
af4957ff14 start to write out obj from vhacd 2015-03-05 06:38:42 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Virendra Singh
d4367924ad Clean up coding standard violations 2015-02-27 00:59:59 +05:30
Virendra Singh
95839dd64e untabify the source files 2015-02-27 00:27:18 +05:30
Virendra Singh
36c3131524 Rectifying bad merge in BUILD.md and BUILD_WIN.md 2015-02-27 00:14:46 +05:30
Virendra Singh
b3fdb19cad Merge branch 'master' of https://github.com/highfidelity/hifi into 20305 
Conflicts:
	BUILD.md
	BUILD_WIN.md
 2015-02-26 22:16:35 +05:30
Virendra Singh
434c0b569f Make vhacd tool optional 2015-02-26 06:28:28 +05:30
Stephen Birarda
33b0fd24a6 don't call copy dll step for scribe 2015-02-25 11:02:05 -08:00
Stephen Birarda
fd8240669b fix for windeployqt for executables 2015-02-25 10:39:44 -08:00
Kodey
a0a1564720 Merge branch '20305' of https://github.com/virneo/hifi into 20305 2015-02-25 08:45:29 +05:30
Kodey
a5aeb3b980 cmake changes for building on linux 2015-02-25 08:45:00 +05:30
Virendra Singh
9a153a6506 Time measurement 
Used c++11 chrono class to measure elapsed time.
 2015-02-25 08:36:58 +05:30
Virendra Singh
c15c549881 Code formatting 2015-02-25 07:47:00 +05:30
Virendra Singh
ce04b1accb vhacd tool 
this tool is as per joblist #20305. Its provides an executable to test
VHACD computation on simple fbx models.
 2015-02-21 15:40:39 +05:30
Virendra Singh
ddd137ed60 cmake changes for vhacd 
cmake changes to create a new project vhacd as a seperate executable in
tools directory
 2015-02-21 15:39:16 +05:30
Stephen Birarda
b2e587dbbd remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00
Stephen Birarda
7d25013659 add DLL copying for all project targets 2015-02-17 17:44:58 -08:00
Stephen Birarda
9c13bec476 remove glm include where no longer required 2015-02-13 10:38:01 -08:00
Seth Alves
bee895ba0a capture network bandwidth stats from NodeList rather than various places 2015-01-31 20:02:04 -08:00
Seth Alves
105b2c5fd7 shell script to regenerate emacs TAGS file for project 2015-01-31 10:54:01 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Sam Gateau
ccc77ce7a6 fixing command for scribe 2014-12-30 14:30:18 -08:00
Sam Gateau
7ea9f92492 polishing the scribe -c++ case 2014-12-23 18:25:35 -08:00
dev
42157161e0 fix the c++ header generation for mac though the brand new raw string format of c++11 2014-12-23 18:19:25 -08:00
Sam Gateau
c5eb04336f first version of SCribe used for shaders in render-utils 2014-12-23 16:27:02 -08:00
Sam Gateau
249e6d02f8 Fixing typo and syntax 2014-12-23 14:49:06 -08:00
Sam Gateau
4004831377 Fixing typo and syntax 2014-12-23 14:46:58 -08:00
Sam Gateau
522ca55ed8 Fixing typo and syntax 2014-12-23 14:41:49 -08:00
Sam Gateau
0578a54ea0 Fixing typo and syntax 2014-12-23 14:41:05 -08:00
Sam Gateau
4bdc0d718d Fixing typo and syntax 2014-12-23 14:29:26 -08:00
Sam Gateau
59387be856 Fixing typo and syntax 2014-12-23 14:20:12 -08:00
Sam Gateau
e16da55b1b cleaning scribe main and checking naming 2014-12-22 16:02:58 -08:00
Sam Gateau
6b88eaceb5 FIx typos 2014-12-22 15:44:46 -08:00
Sam Gateau
4ee005affa adding scribe tool 2014-12-22 11:51:54 -08:00
Stephen Birarda
114e3bb2ff rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Stephen Birarda
2fda95ae8f repair build of various tools 2014-08-08 13:17:54 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
0449660f66 don't bubble up hifi libraries since they are static 2014-08-08 13:17:54 -07:00
Stephen Birarda
e4d01d269c use shared dependency linking macro in hifi projects 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
87cf262b9e get to successful cmake after library link macro changes 2014-08-08 13:17:53 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
Andrzej Kapolka
9e61b5e45f Fix Windows link error (hopefully). 2014-06-30 11:16:35 -07:00
Andrzej Kapolka
4b2d122f3d Working on factoring out the common metavoxel endpoint/client code. 2014-06-26 16:12:11 -07:00
Andrzej Kapolka
eea45e98d7 Fix to include GLM. 2014-06-18 12:22:45 -07:00
Andrzej Kapolka
7931173671 Working on tools to convert bitstreams to/from json. 2014-06-17 12:33:31 -07:00
Andrzej Kapolka
37c977af02 Tests working for reading JSON. 2014-06-16 19:12:21 -07:00
Andrzej Kapolka
77b6a209ab More progress on json reading. 2014-06-16 14:51:22 -07:00
Andrzej Kapolka
3ec127afde Spoke a little too soon. 2014-06-15 16:46:43 -07:00
Stephen Birarda
619e9d7cd3 more header repairs caught via find 2014-04-09 09:52:00 -07:00
Stephen Birarda
d9fdd87aa3 add apache header to mtc main 2014-04-08 17:50:11 -07:00
Andrzej Kapolka
94a7ded212 Slip in a fix for Windows build warnings on mtc-generated code. 2014-04-08 15:36:21 -07:00
Andrzej Kapolka
1b980eebf2 More work on delta streaming. 2014-03-21 14:49:40 -07:00
Andrzej Kapolka
9c2f6ab2e5 Working on delta streaming for collections. 2014-03-20 18:28:43 -07:00
Andrzej Kapolka
24b2da1c0d Working on delta streaming. 2014-03-18 13:14:21 -07:00
Andrzej Kapolka
6d14ad6ab5 Missed a spot. 2014-03-17 15:13:14 -07:00
Andrzej Kapolka
d8b83fd308 More work on version-resilient type streaming. 2014-03-17 15:12:43 -07:00
Andrzej Kapolka
61660f890e Working on metadata for metatypes. 2014-03-17 11:39:16 -07:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Andrzej Kapolka
f9b0ff0608 Various bits of streaming work: send delete messages for main channel on 
reliable channel, test messages on main channel.
 2014-02-12 12:33:40 -08:00
Andrzej Kapolka
524ceb4ed2 Working on tests for datagram sequencing, added autogenerated ==/!= operators 
to mtc.
 2014-02-09 16:26:53 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Stephen Birarda
0fdbfe8ea8 move gen_stars to the tools folder 2013-05-22 12:39:27 -07:00
ZappoMan
9b5ee05141 added some sample files 2013-05-21 12:04:48 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
ZappoMan
407fa95195 more delete voxel debugging, call reaverage colors on root node 2013-04-03 11:14:00 -07:00
ZappoMan
8988796285 more voxel delete debugging, use memcmp() instead of == 2013-04-03 09:38:11 -07:00
ZappoMan
17427a9c4d adding some new tools 2013-04-02 14:43:33 -07:00