Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 16:12:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38253 commits 75 branches 59 tags 1.2 GiB
Commit graph

15389 commits

Author SHA1 Message Date
Seth Alves
28d673cb97 try again to make this thread safe 2016-01-19 16:00:02 -08:00
Seth Alves
0064ee6ab2 try again to make this thread safe 2016-01-19 15:55:56 -08:00
Zach Pomerantz
c794ae8da2 Avoid shadow attenuation outside of mapped area 2016-01-19 15:48:20 -08:00
Zach Pomerantz
27967f6064 Use 4-sample PCF for shadowMap sampling 2016-01-19 15:48:20 -08:00
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Seth Alves
a515d6debe call into correct thread to getJointNames on entity 2016-01-19 15:16:58 -08:00
Seth Alves
90847dc49c oops 2016-01-19 15:00:33 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -08:00
Zach Pomerantz
387a14b6b1 Fix shadowMap vertical keylight edge case 2016-01-19 12:01:40 -08:00
Zach Pomerantz
398f83be3f Change shadow debug buffer to reuse shadowMap tex 2016-01-19 12:01:18 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
a2bec2a5bf Merge pull request #6857 from ctrlaltdavid/20779 
Fix crash in Running Scripts when edit filter after highlighting script
 2016-01-19 11:40:47 -08:00
Stephen Birarda
858adf383e update comment for config migration 2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b use mkpath to create new data directory 2016-01-19 11:37:49 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
Stephen Birarda
74806d9d2b migrate old DS config file to new path 2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Ryan Huffman
de36f3eeb2 Update ServerPathUtils::getDataDirectory to use custom path lookup 2016-01-19 10:54:38 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Zach Pomerantz
7a5562abce Do not cauterize bones in SHADOW_RENDER_MODE 2016-01-18 20:51:28 -08:00
Zach Pomerantz
3c80002dfe Fix keylight frustum culling by calc internal state before use 2016-01-18 20:10:52 -08:00
Zach Pomerantz
ff425f40ae Fix shadow leaking scene items 2016-01-18 18:43:01 -08:00
Zach Pomerantz
1b36d56b7a Add shadowmap as a debug feature 2016-01-18 17:12:42 -08:00
Seth Alves
e365d93ed9 don't save entites with invalid parentIDs (or with IDs that indicates an avatar) to the persist file 2016-01-18 16:50:26 -08:00
samcake
df496b065c Merging with master 2016-01-18 16:40:34 -08:00
samcake
29945bba92 Merge pull request #6837 from zzmp/feat/render-shadow 
Add RenderShadowTask
 2016-01-18 15:45:51 -08:00
Seth Alves
135f25bde7 changes so that avatar-mixer wont attempt to resolve a parentID 2016-01-18 15:35:54 -08:00
Howard Stearns
6f84a67453 Merge pull request #6840 from jherico/qml_cleanup 
File dialogs and modal message boxes in QML
 2016-01-18 15:04:37 -08:00
Howard Stearns
5caf10beed Merge pull request #6848 from ZappoMan/entityServerSideSizeCheck 
Include checking the angular size of entities on the server side for LOD support
 2016-01-18 14:13:34 -08:00
samcake
93c7c182b3 Exposing the gpu RangeTimer counter for the AO effect 2016-01-18 14:10:59 -08:00
Seth Alves
823428290d Merge branch 'master' of github.com:highfidelity/hifi into various-fixes 2016-01-18 13:26:45 -08:00
Brad Hefta-Gaub
b8747709ef CR feedback, dead code cleanup 2016-01-18 12:11:23 -08:00
Brad Hefta-Gaub
d10e1cc39d CR feedback, dead code cleanup 2016-01-18 12:09:21 -08:00
Seth Alves
94bafb4a1e Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove 
namechange collisionsWillMove --> dynamic
 2016-01-18 11:51:59 -08:00
Seth Alves
3b3720781f fix a place where parent's scale wasn't properly squashed 2016-01-18 11:15:53 -08:00
Seth Alves
d6e3b85237 fix javascript access via localPosition and localRotation 2016-01-18 11:15:32 -08:00
Seth Alves
4232e400cc add getJointIndex call 2016-01-18 11:15:03 -08:00
Zach Pomerantz
6434d98365 Separate directional shaders with(out) shadowmaps 2016-01-18 11:11:28 -08:00
Brad Hefta-Gaub
88af387214 cleanup 2016-01-18 10:10:24 -08:00
samcake
bc579f2605 Clening up the gpu::Timer behavior, now need a way to show it 2016-01-18 09:53:41 -08:00
Brad Hefta-Gaub
2774df38bc check for entity size before including it for LOD 2016-01-18 09:06:57 -08:00
Brad Davis
5aa8398adb Working on keyboard focus issues 2016-01-17 20:56:07 -08:00
samcake
86e9c5ac9b Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-16 22:17:08 -08:00
samcake
39f1649cdf refining the settings for the blur pass and splitting the uniforms in 2 buffers, one per frame with transform info and one for the parameters which are rarely changing 2016-01-16 22:16:07 -08:00
Brad Davis
cf8d2c5182 Integrate file open dialog into running scripts dialog 2016-01-15 23:53:37 -08:00
Brad Davis
746c388f7a Cleanup of QML windowing and message boxes 2016-01-15 23:14:49 -08:00
samcake
483c28dc2d Adding gpu timer feature to actually the GPU cost of rendering 2016-01-15 19:00:18 -08:00
David Rowe
51cb9dd05e Fix crash in Running Scripts when edit filter after highlighting script 2016-01-16 15:50:33 +13:00
Zach Pomerantz
7f3e102b5e Rename renderLights to renderItems 2016-01-15 17:55:07 -08:00
Zach Pomerantz
7fd20bb036 Set shadow pipelines manually to avoid duplication 2016-01-15 17:55:07 -08:00
Zach Pomerantz
331d32ef78 Add render Jobs for Shape sorting 2016-01-15 17:55:07 -08:00
Zach Pomerantz
4bbf206f64 Clean up DrawTask 2016-01-15 17:55:07 -08:00
Zach Pomerantz
625eee2b9c Clean RenderShadowTask ctor 2016-01-15 17:55:07 -08:00
Zach Pomerantz
f3a5be9ec0 Decrease shadowMap res to 1024 2016-01-15 17:55:07 -08:00
Zach Pomerantz
562c909ad8 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
b2c9cf7452 Fit shadowmap to viewFrustum better 2016-01-15 17:55:07 -08:00
Zach Pomerantz
2b27e48bf9 Update shadow shaders 2016-01-15 17:55:07 -08:00
Zach Pomerantz
bc379e920b Update shadow programs 2016-01-15 17:55:07 -08:00
Zach Pomerantz
fad38c0bfb Add uniform buffer to LightStage 2016-01-15 17:55:07 -08:00
Brad Hefta-Gaub
29b9592c8c Merge pull request #6838 from ctrlaltdavid/20763 
Fix reading model's "textures" property
 2016-01-15 17:02:14 -08:00
Stephen Birarda
0b118a8e98 replace ApplicationVersion with BuildInfo 2016-01-15 15:41:34 -08:00
Stephen Birarda
275fa1c5c7 fix for override warnings with clang on OS X 2016-01-15 15:41:34 -08:00
Andrew Meadows
952f5b23f6 namechange collisionsWillMove --> dynamic 2016-01-15 15:21:25 -08:00
Andrew Meadows
8b420adbc8 namechange MotionType to PhysicsMotionType 2016-01-15 15:21:25 -08:00
Brad Davis
bb02a1eda2 Fix JS web window crash caused by race condition 2016-01-15 14:45:40 -08:00
samcake
fef5e3c8da Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 14:44:57 -08:00
Zach Pomerantz
5c1c1e3a3b Change LightStage setFrustum signature to near/farDepth 2016-01-15 12:57:31 -08:00
Zach Pomerantz
d6e5e2de81 Fix orientation of shadow frustum 2016-01-15 12:43:45 -08:00
samcake
2494623bc7 Cleaning the code for review 2016-01-15 10:55:43 -08:00
Zach Pomerantz
986af50b71 Remove unneccessary const 2016-01-15 10:50:42 -08:00
Ryan Huffman
0f2b9744d1 Merge branch 'console' of github.com:birarda/hifi into console-logging 2016-01-15 10:46:22 -08:00
Zach Pomerantz
b423bc38ba Remove magic numbers 2016-01-15 10:46:01 -08:00
Ryan Huffman
a5eb54b1b7 Move DomainServer script location to app data directory 2016-01-15 10:36:09 -08:00
Zach Pomerantz
e914f02445 Use near/far in LightStage setFrustum 2016-01-15 10:28:52 -08:00
Zach Pomerantz
710fb5df53 Fix shadowed orientation in LightStage 2016-01-15 10:18:29 -08:00
Seth Alves
fcd2284dc8 Merge pull request #6843 from AndrewMeadows/sadness 
fix bug causing grab to disappear objects
 2016-01-15 09:27:02 -08:00
samcake
3f4f10c38c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-15 09:21:13 -08:00
Andrew Meadows
b9352d3eaa prevent nan inside spring action 2016-01-15 08:44:52 -08:00
samcake
ae18bb8ef7 FIxed the stereo rendering 2016-01-14 19:23:29 -08:00
Zach Pomerantz
e2158e48a1 Declare Corners explicitly 2016-01-14 18:03:58 -08:00
Brad Hefta-Gaub
a70adc8a57 Merge pull request #6823 from jherico/tool_window 
Tool window in QML
 2016-01-14 16:56:27 -08:00
samcake
577666da6e Merging upstream master 2016-01-14 15:10:54 -08:00
Zach Pomerantz
ec496f1907 Return copy of Light from LightStage 2016-01-14 14:06:32 -08:00
Zach Pomerantz
c704a8d8c5 Add RenderShadowTask 2016-01-14 13:53:11 -08:00
Zach Pomerantz
7744b89ba5 Prepare shadowMap pipeline to debug in color 2016-01-14 12:56:28 -08:00
Ryan Huffman
a43b9ba2c3 Add ServerPathUtils 2016-01-14 12:55:32 -08:00
Zach Pomerantz
b9b407fea0 Remove static shadowMap 2016-01-14 12:49:43 -08:00
Zach Pomerantz
0776ae7e72 Add LightStage for rendering lights 2016-01-14 12:49:42 -08:00
Zach Pomerantz
82f7ea515d Clean up task construction 2016-01-14 12:49:42 -08:00
Andrew Meadows
72928fdbd6 fix problem where grab stops on slow movement 2016-01-14 10:42:27 -08:00
Ryan Huffman
196161fe93 Merge pull request #66 from birarda/console-dev 
some initial packaging work and console fixes
 2016-01-14 10:17:24 -08:00
Howard Stearns
5c1eef6a65 Merge pull request #6830 from AndrewMeadows/fix-arrows 
Fix for arrows that stop moving too early
 2016-01-14 09:36:26 -08:00
Zach Pomerantz
ed5c53f23c Add getCorners to ViewFrustum 2016-01-14 01:29:49 -08:00
Brad Hefta-Gaub
8f8afabbfe Merge pull request #6811 from Atlante45/master 
Fix skybox not always rendering correctly
 2016-01-13 21:00:48 -08:00
Brad Hefta-Gaub
ec344f7f86 Merge pull request #6822 from jherico/local_script_stop 
Fix inability to stop local scripts
 2016-01-13 20:26:36 -08:00
David Rowe
a59cbd1aca Merge branch 'master' into 20763 2016-01-14 17:25:44 +13:00
samcake
0285d48de3 Exposing many more controls of the AO in order to adjust the effect 2016-01-13 18:57:47 -08:00
Zach Pomerantz
1436b4f6b1 Guard against unspecified deferredDebugMode 2016-01-13 18:17:40 -08:00
Zach Pomerantz
5c9c34377e Move GL context sync to render Engine (from Task) 2016-01-13 17:53:15 -08:00
Zach Pomerantz
70cc7d87e4 Expose global light through DeferredLighting singleton 2016-01-13 17:52:02 -08:00
Zach Pomerantz
e471dcc90e Fix GLBackend::do_setDepthRangeTransform by swapping hither/yon 2016-01-13 17:50:34 -08:00
Zach Pomerantz
2938829167 Add shadow items to stats 2016-01-13 17:49:37 -08:00
Zach Pomerantz
ee69d8f817 Fix bitsetters for ShapeKey::Builder 2016-01-13 17:44:01 -08:00
U-GAPOS\andrew
0126684a96 collisionMask shouldn't override ignoreForCollisions 2016-01-13 16:58:34 -08:00
Brad Davis
b6272b7824 Migrate tool window to overlay/QML 2016-01-13 15:40:37 -08:00
Atlante45
ef5af45acd Replce GPUObjectWrapper by public const member 2016-01-13 15:01:54 -08:00
Atlante45
504939f193 Use a unique_ptr to track gpu objects 2016-01-13 14:07:48 -08:00
Atlante45
8da027c56f Encapsulate GPUObject in a safer way 2016-01-13 13:51:53 -08:00
Atlante45
741c22c0ac Move SimpleProgramKey to cpp 2016-01-13 11:47:43 -08:00
Atlante45
1789878be1 Remove dead code 2016-01-13 11:47:43 -08:00
Atlante45
c30569cd55 Naming coding standard 2016-01-13 11:47:43 -08:00
Atlante45
205c14eb43 Remove unused headers 2016-01-13 11:47:43 -08:00
Atlante45
11dc3cd261 Move primitive rendering out of DeferredLightingEffect 2016-01-13 11:47:43 -08:00
Atlante45
12f9091dc1 Fix doInBatch lambdas 2016-01-13 11:47:43 -08:00
Brad Davis
e8adcd9f1f Fix inability to stop local scripts 2016-01-12 21:11:47 -08:00
David Rowe
061657b703 Merge branch 'master' into 20763 2016-01-13 17:54:45 +13:00
Atlante45
e8d7411eea Indentation/Coding Standard 2016-01-12 20:49:38 -08:00
Atlante45
47586e97a6 Stay closer to the old code (Use early exit) 2016-01-12 20:49:25 -08:00
Atlante45
911375b7a1 Don't change apply zone logic 2016-01-12 20:49:25 -08:00
Atlante45
5e41421f9d Fix for skybox not always loading 2016-01-12 20:49:25 -08:00
Atlante45
0008b1a055 Code cleanup 2016-01-12 20:49:25 -08:00
Atlante45
3f90312375 Fix for XCode auto indent 2016-01-12 20:49:25 -08:00
samcake
89d2d102f6 exposing the ditheringEnable field 2016-01-12 18:51:30 -08:00
samcake
0d8e247626 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:56:51 -08:00
samcake
6779874da8 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 16:06:34 -08:00
Andrew Meadows
6a5a74700f activate sprung objects when action strong enough 2016-01-12 15:11:27 -08:00
Andrew Meadows
2288d96868 fix CharacterController ray cast for floor 2016-01-12 15:11:27 -08:00
Andrew Meadows
c52c543ab8 use strings for JS collisionGroup API 2016-01-12 15:11:27 -08:00
Andrew Meadows
222398e5cc no packet version check for collision mask 2016-01-12 15:10:18 -08:00
Andrew Meadows
6c49d81475 collision mask bit reinterpretation 
also cache sessionID in static methods inside PhysicsEngine
 2016-01-12 15:08:52 -08:00
Andrew Meadows
502921e877 more consistency for collision group values 2016-01-12 15:08:52 -08:00
Andrew Meadows
c9b125612c fix bugs 2016-01-12 15:08:52 -08:00
Andrew Meadows
e1ba4ff0a8 add CollisionMask entity property 2016-01-12 15:08:52 -08:00
Brad Hefta-Gaub
cd167e43fb Merge pull request #6812 from jherico/running_scripts 
Running scripts in QML
 2016-01-12 13:40:47 -08:00
Brad Davis
f352332924 Fix logging warning 2016-01-12 13:09:16 -08:00
Brad Hefta-Gaub
90f4ca7b71 Merge pull request #6817 from jherico/script_crash 
Fix crash on shutdown due to lifetime of scripts
 2016-01-12 13:05:35 -08:00
Howard Stearns
d1a72e8d63 Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation 
Move hand animation control into grab script
 2016-01-12 13:02:59 -08:00
Brad Davis
21534cbde0 Layout for running scripts 2016-01-12 12:40:42 -08:00
Brad Davis
55af5eaf06 Fix crash on shutdown due to lifetime of scripts 2016-01-12 12:40:02 -08:00
samcake
31bea5034c Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-12 10:02:15 -08:00
Zach Pomerantz
016a14d3d5 Init the shapePlumber 2016-01-11 20:19:54 -08:00
Zach Pomerantz
c9e1d8f5f4 Set up pipelinelib correctly (use filters insig bits) 2016-01-11 20:17:52 -08:00
samcake
f5854641f9 Trying to improve the ao 2016-01-11 18:33:39 -08:00
Zach Pomerantz
db91b12203 Refine addPipeline signature to be more explicit 2016-01-11 17:31:19 -08:00