Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-27 15:47:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
11111 commits 76 branches 59 tags 1.2 GiB
Commit graph

165 commits

Author SHA1 Message Date
Andrew Meadows
9079c3ecd8 explicit casts to remove warnings 2014-03-18 10:41:14 -07:00
Andrzej Kapolka
6fb313cc43 Allow streaming uints. 2014-03-12 13:03:59 -07:00
Andrzej Kapolka
f088912ecf More GCC warning fixes. 2014-03-12 12:51:43 -07:00
Andrzej Kapolka
064f784db1 More OS X warning fixes. 2014-03-12 12:23:23 -07:00
Andrzej Kapolka
ffb9273da8 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-03-12 12:11:43 -07:00
Andrzej Kapolka
4c7737443e Fix for OS X warning. 2014-03-12 12:11:30 -07:00
Andrzej Kapolka
e249b29b45 Merge pull request #2268 from AndrewMeadows/radians 
prefer radians over degrees
 2014-03-12 12:10:29 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Andrzej Kapolka
7d1a44fbea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-11 12:52:13 -07:00
Andrzej Kapolka
66e322ec55 Added per-attribute LOD threshold multiplier; things like spanners need 
different LOD thresholds than, say, voxels.
 2014-03-11 12:21:58 -07:00
Andrzej Kapolka
ae6a59ef78 Ray intersections for models, don't load resources if there's no network 
manager installed.
 2014-03-10 17:53:20 -07:00
Andrzej Kapolka
9e5aae4a39 Remove spanner bits. 2014-03-10 17:01:27 -07:00
Andrzej Kapolka
802cc3eeed Some untested ray intersection bits. 2014-03-10 14:58:31 -07:00
Andrzej Kapolka
7fc55e5596 Better merging for normals. 2014-03-10 13:00:58 -07:00
Andrzej Kapolka
3b63424abd Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-10 12:27:07 -07:00
Andrzej Kapolka
9731159b82 Merge branch 'master' of https://github.com/highfidelity/hifi into joints 2014-03-10 10:57:48 -07:00
Andrzej Kapolka
d2f947aee1 Working on LRU cache for resources. 2014-03-10 10:49:38 -07:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00
Andrzej Kapolka
23556f0cf7 Fix for merging after streaming, added ability to "set" a spanner's attributes 
in the actual metavoxel data.
 2014-03-06 12:38:11 -08:00
Andrzej Kapolka
d1747ed8d1 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-05 17:12:37 -08:00
Andrzej Kapolka
60b0281095 Ordered visitation bits. 2014-03-05 17:12:02 -08:00
Andrzej Kapolka
c4f29005a0 Working on subdivision. 2014-03-05 14:13:20 -08:00
Andrzej Kapolka
63b4a2453b Lots of work on metavoxel LODs and spanners. 2014-03-04 21:27:13 -08:00
Philip Rosedale
e4924cdca8 Merge pull request #2202 from birarda/authentication 
remove deprecated qt5 methods in CMakeList files
 2014-03-04 18:30:22 -08:00
Stephen Birarda
231dc624ff replace deprecated qt5 macros in cmake with target_link_libraries 2014-03-04 12:41:24 -08:00
Andrzej Kapolka
6ff629dcfd Use different unused variable warning suppressor for GCC. 2014-03-04 11:23:44 -08:00
Andrzej Kapolka
13b712592f Use different unused variable warning suppressor for GCC. 2014-03-04 11:21:59 -08:00
Andrzej Kapolka
cbfc60d017 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-04 11:18:54 -08:00
Andrzej Kapolka
47fe928995 Workin on LOD support in streaming. 2014-03-04 11:18:31 -08:00
ZappoMan
1a5b0ee02e Merge pull request #2170 from birarda/cmake-quotes 
complete quoting of various cmake commands
 2014-03-04 09:00:26 -08:00
Andrzej Kapolka
dae8ed6417 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:27:16 -08:00
Andrzej Kapolka
71931d85d9 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-03-03 17:03:18 -08:00
Stephen Birarda
bb3a8677be Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes 2014-03-03 16:31:25 -08:00
Andrzej Kapolka
7ecfeeaba3 Do the actual reading of the reply on the worker thread. Otherwise, when we 
read from the cache, we're reading synchronously from a file.  Closes #2171.
 2014-03-03 15:16:13 -08:00
Stephen Birarda
628f91cd73 complete quoting of varous Cmake commands, closes #1999 2014-03-03 12:15:05 -08:00
Andrzej Kapolka
949e40a10e Revert complicated system of "soft" pointers, instead use hard references in 
write mappings and listen for object destruction.
 2014-03-03 11:44:45 -08:00
Stephen Birarda
60eb588e96 remove some unecessary null pointer checks 2014-03-03 11:36:01 -08:00
Andrzej Kapolka
55dca45feb Working on tests for shared objects. 2014-03-03 10:20:50 -08:00
Andrzej Kapolka
f910c4471b Distinguish between "hard" and "soft" references to shared objects. Sending 
bitstreams use soft references and remove their mappings when only soft
references remain.
 2014-03-02 17:40:58 -08:00
Andrzej Kapolka
c1a89517a7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-28 18:11:46 -08:00
Andrzej Kapolka
21a149348b When switching models, retain old one until new one is loaded. Closes #2146. 2014-02-28 13:57:25 -08:00
Andrzej Kapolka
73ec568b4b Further work on request limiting. 2014-02-27 19:28:45 -08:00
Andrzej Kapolka
29f7954d20 Factored out bits common to resource caches, added global limit on number of 
resources being requested at any one time.
 2014-02-27 18:13:40 -08:00
Andrzej Kapolka
4130d0f28b Added spheres as simpler spanners for testing. 2014-02-26 15:01:01 -08:00
Andrzej Kapolka
5d7eadcca3 Working on better streaming for spanners. 2014-02-25 13:48:46 -08:00
Andrzej Kapolka
718439014a Compute the mesh extents for geometry and use them to set the spanner bounds. 2014-02-24 17:28:11 -08:00
Andrzej Kapolka
ba327232d5 Fixed another Window signed/unsigned mismatch. 2014-02-23 21:07:00 -08:00
Andrzej Kapolka
5cf6c43414 Fix for Windows build error. 2014-02-23 20:29:54 -08:00
Andrzej Kapolka
b408e31d91 More work on spanners. 2014-02-20 17:18:15 -08:00