Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-20 10:20:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
49797 commits 72 branches 59 tags 1.2 GiB
Commit graph

1541 commits

Author SHA1 Message Date
SamGondelman
ac9a80131a refactoring _fadeStartTime and isTransparent, make simple renderables switch to transparent when fade finishes 2016-08-04 12:34:46 -07:00
SamGondelman
6604c27f23 polyvox fade WIP 2016-08-04 10:55:37 -07:00
SamGondelman
d521315475 fade polylines (needs testing) 2016-08-03 17:03:52 -07:00
SamGondelman
d7052f6250 try to make text entities fade 2016-08-03 16:27:51 -07:00
SamGondelman
7713c1f4bf try to fade in web entities 2016-08-03 15:56:41 -07:00
SamGondelman
27bacc9165 try to fade in procedural shapes 2016-08-03 14:33:05 -07:00
Anthony J. Thibault
713bee84c3 Merge branch 'master' into feature/hand-controller-web-entity-integration 2016-08-03 14:06:43 -07:00
SamGondelman
2eb0c7735f working on fading shape entities 2016-08-03 13:30:05 -07:00
Seth Alves
ad4fc8c656 merge from upstream, don't hold up enabling of physics if a collision hull fails to load 2016-08-03 10:42:15 -07:00
Anthony J. Thibault
75b88b0794 WebEntities now support custom hifi url handling 
WebEntities now use qml/controls/WebView.qml instead of qml/WebEntity.qml.
marketplace urls and hifi urls should work properly in web entities.
 2016-08-03 10:20:15 -07:00
SamGondelman
d63a0ef08f working on making other entities transparent 2016-08-02 18:09:42 -07:00
Stephen Birarda
5d3e125a06 make failed geomtetry request not hold physics 2016-08-02 16:32:41 -07:00
Anthony J. Thibault
6d768d8327 hand controllers send touch events instead of mouse events to web entities 
This gives a much better experience when scrolling web content.
 2016-08-02 15:23:46 -07:00
Anthony Thibault
cf7450beb7 handControllerGrab and web entity input integration 2016-07-29 17:50:45 -07:00
SamGondelman
676f4bdfcf misc fixes from particles branch 2016-07-29 15:36:32 -07:00
Anthony Thibault
8e3bc97ef9 fix for unused variable warnings 2016-07-29 08:10:10 -07:00
Anthony Thibault
ea310bcc43 Web Entities now render correctly as well 2016-07-28 14:11:19 -07:00
Ryan Downe Karpf
91714aaca6 Merge pull request #8258 from AlexanderOtavka/edit-model-ui 
Edit model dialog improvements
 2016-07-22 17:11:52 -07:00
Brad Hefta-Gaub
566e0f5dbf Merge pull request #8287 from AndrewMeadows/fix-simple-compound 
fix bug breaking simple-compound shape type
 2016-07-21 18:18:04 -07:00
Andrew Meadows
20eebb90f8 fix build -- remove some accidental changes 2016-07-20 14:08:25 -07:00
Andrew Meadows
3fdfc0db14 fix bug breaking simple-compound shape type 2016-07-20 12:55:13 -07:00
Andrew Meadows
2afd65467a fix bug where model is not yet ready for col shape 2016-07-19 18:01:22 -07:00
samcake
a44aee84ce Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-18 10:16:55 -07:00
samcake
744474982d Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-17 13:28:03 -07:00
Brad Davis
03cb6175ab Support triangle and hexagon shapes, add shape support to overlays. 2016-07-15 22:02:17 -07:00
Andrew Meadows
25fdea6bac fix for change of API after rebase 2016-07-13 15:13:35 -07:00
samcake
8acc18ae8b Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-13 11:42:07 -07:00
Andrew Meadows
72175ae09e fix warnings about implicit casts 2016-07-09 22:55:55 -07:00
Andrew Meadows
207ddcea38 wrap hull about each mesh part 2016-07-09 22:25:28 -07:00
samcake
ed67fe4051 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-08 09:04:40 -07:00
Brad Hefta-Gaub
5f71f77445 Merge pull request #8192 from AndrewMeadows/simple-hull-shapes 
experimental ModelEntityItem collision shape options (no visual debugging)
 2016-07-08 08:55:11 -07:00
Andrew Meadows
e4828b03b1 fix crash when building shape before model loaded 2016-07-07 13:32:30 -07:00
Brad Davis
c7382ea886 Optimize updateModelBounds 2016-07-07 11:11:26 -07:00
Brad Davis
5220b52cd9 Don't trigger entity scripts without scripting interface 2016-07-06 18:13:15 -07:00
Andrew Meadows
3c4f9f8016 refert debug hack 2016-07-06 15:51:17 -07:00
Andrew Meadows
15ff7bc731 final hack tweak 2016-07-06 14:35:57 -07:00
Andrew Meadows
301a9f4434 improved hack logging 2016-07-06 14:31:43 -07:00
Andrew Meadows
11ef245671 temp hack for debugging 2016-07-06 14:28:09 -07:00
Andrew Meadows
5659d57ac3 fix shape generation for SIMPLE_COMPOUND 2016-07-06 13:00:57 -07:00
Andrew Meadows
6cbc566a77 remove debug cruft 2016-07-06 11:53:26 -07:00
Andrew Meadows
33d732c446 construct geometry for new shape types 2016-07-06 10:51:15 -07:00
samcake
9281b28d43 Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-07-01 13:39:12 -07:00
Andrew Meadows
74781c0786 boxify static meshes with too many vertices 2016-06-28 16:36:10 -07:00
samcake
ec68eba3cb Merge branch 'master' of https://github.com/highfidelity/hifi into skin 2016-06-24 09:37:52 -07:00
Andrew Meadows
e88b264864 revert compound hull shape generation 2016-06-22 09:30:44 -07:00
Andrew Meadows
937bd0c1be SHAPE_TYPE_MESH --> SHAPE_TYPE_STATIC_MESH 2016-06-21 13:54:21 -07:00
samcake
0c882832bf Bringing the Scattering type to the pixels and having a different shading during the lighting pass (for global right now) 2016-06-20 17:58:35 -07:00
Andrew Meadows
f22a5613bd fix static mesh for model with per-mesh transforms 2016-06-20 17:29:20 -07:00
Andrew Meadows
5484b6fbb7 more correct extraction from triangle strips 2016-06-20 17:29:20 -07:00
Andrew Meadows
c0c77e9027 optimize/cleanup compound/mesh shape computation 2016-06-20 17:29:20 -07:00
Andrew Meadows
f444b70fdc fix collision shape for scaled models 2016-06-20 17:29:20 -07:00
Andrew Meadows
ab3548cac0 fix crash 2016-06-20 17:29:20 -07:00
Andrew Meadows
d1752211e6 make implicit casts explict 2016-06-20 17:29:20 -07:00
Andrew Meadows
a519b77ae7 add SHAPE_TYPE_MESH and build mesh shapes 2016-06-20 17:29:20 -07:00
Andrew Meadows
9fc77ccfa2 use reference to avoid big copy 2016-06-20 17:29:20 -07:00
Andrew Meadows
d64729372a ShapeInfo name changes 2016-06-20 17:29:20 -07:00
SamGondelman
8a682450a9 still trying to fix cmake errors 2016-06-10 17:01:22 -07:00
SamGondelman
53435fc730 removed extra argument 2016-06-10 14:04:33 -07:00
SamGondelman
da98ee0916 reorganized procedural shader code, added getWorldEyeWorldPos(), removed iWorldEyePosition 2016-06-10 13:42:19 -07:00
SamGondelman
24e5000aeb exposed orientation and eye position to procedural entity shaders 2016-06-08 18:26:54 -07:00
Andrew Meadows
2a3da60ed4 remove some magic numbers 2016-06-03 10:47:54 -07:00
Andrew Meadows
eff59d3fd3 build compound sub meshes shapes with less copying 2016-06-03 10:47:54 -07:00
Andrew Meadows
7858ef84b3 don't copy points onto itself 2016-06-03 10:47:54 -07:00
Andrew Meadows
654468619c swap order of if-else blocks 2016-06-03 10:47:54 -07:00
Andrew Meadows
d591561a88 remove RenderableModelEntityItem::_points 
use ShapeInfo::_points instead
 2016-06-03 10:47:54 -07:00
Brad Hefta-Gaub
c85923c69b Merge pull request #7956 from jherico/web_entity_crash 
fix crash on click on non-visible web-entity
 2016-06-03 10:29:55 -07:00
Brad Davis
cc85ce9c01 fix crash on click on non-visible web-entity 2016-06-02 16:37:45 -07:00
samcake
1dca62f752 Introducing a new technique for normal packing and fixing a bug on the normal buffer format 2016-06-01 17:51:53 -07:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
Seth Alves
76f4a25694 move code that clears old scale and registration to after model is loaded 2016-05-20 11:40:46 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Brad Hefta-Gaub
67891abf17 Merge pull request #7877 from Atlante45/fix/asset-client 
Fix Asset Client crash
 2016-05-18 11:37:34 -07:00
Seth Alves
3380b2a668 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-17 19:10:33 -07:00
Chris Collins
b2ece6f4a7 Merge pull request #7882 from zzmp/fix/script-thread-dtor 
Wait and cleanly exit the scripting thread
 2016-05-16 16:52:54 -07:00
Seth Alves
a0c3224705 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-16 10:56:09 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor 2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c Mv entities script engine deleter to fn 2016-05-16 10:40:11 -07:00
Seth Alves
3876a8037c Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-16 09:51:20 -07:00
Atlante45
0878d87ac7 remove some unnecessary dependencies 2016-05-14 14:50:02 -07:00
Brad Davis
9509e32928 PR feedback 2016-05-14 08:28:51 -07:00
Zach Pomerantz
2140dc77b3 Rename wait and unload in best thread 2016-05-13 16:14:22 -07:00
Seth Alves
bfac7c6f68 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 13:33:39 -07:00
Seth Alves
ceb6aa582f don't crash when a moving model entity is deleted 2016-05-13 13:32:45 -07:00
Seth Alves
970e7ca17d don't crash when a moving model entity is deleted 2016-05-13 13:32:00 -07:00
Seth Alves
81af0d0a47 Merge branch 'update-model-meta' of github.com:sethalves/hifi into avatar-entities-3 2016-05-13 09:41:56 -07:00
Seth Alves
574709824e oops 2016-05-13 09:41:19 -07:00
Seth Alves
dabecb7cc2 merge from other branch 2016-05-13 07:11:57 -07:00
Seth Alves
79141e3869 dry up some code 2016-05-13 07:06:25 -07:00
Seth Alves
eb19c5be13 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-13 07:04:58 -07:00
Seth Alves
dd2a29aace when a ModelEntityItem moves, also update its meta-render-item 2016-05-12 18:05:28 -07:00
Seth Alves
30fb9349c4 dry up some code 2016-05-12 17:52:40 -07:00
Zach Pomerantz
806d06b552 Wait on old entity script engines in threadpool 2016-05-12 17:51:40 -07:00
Zach Pomerantz
7e82494a66 Add cap on entities scripting thread stop time 2016-05-12 17:51:37 -07:00
Zach Pomerantz
f40fe88ee7 Clean up entity script engine deletion 2016-05-12 17:51:36 -07:00
Seth Alves
c9c619916c Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-11 19:37:57 -07:00
samcake
99dcfef5a8 Merge branch 'master' of https://github.com/highfidelity/hifi into lemon 2016-05-11 10:47:38 -07:00
samcake
1ec9ef560e Fixing the srgb color format conversion for web entities 2016-05-11 10:46:54 -07:00
Seth Alves
356ccdba26 debug icon for clientOnly 2016-05-10 16:16:06 -07:00
Seth Alves
f90b9ec65d Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 12:08:45 -07:00
Brad Hefta-Gaub
350743454b Merge pull request #7839 from sethalves/entity-simulation-smart-pointers-1 
use smart pointers for entity simulations
 2016-05-10 11:35:57 -07:00
Seth Alves
4c1f815870 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-10 10:09:40 -07:00
Brad Hefta-Gaub
d7eee98acc Merge pull request #7827 from AndrewMeadows/threadsafe-viewfrustum 
resurrection of threadsafe ViewFrustum
 2016-05-10 09:06:38 -07:00
Seth Alves
b761ecf44f merge from upstream 2016-05-10 08:18:45 -07:00
Andrew Meadows
59c6a6dfea Merge pull request #7825 from sethalves/linux-qol 
Linux qol
 2016-05-09 15:34:10 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound 
Fix avatar/entity collision sound
 2016-05-09 14:24:19 -07:00
Seth Alves
0ab0409979 revert accidental change 2016-05-07 17:48:37 -07:00
Seth Alves
91ff851bf8 fix call to queueEditEntityMessage 2016-05-07 16:59:54 -07:00
Seth Alves
0e6d9a1eec avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them. 2016-05-07 14:48:31 -07:00
Seth Alves
a0771f8ee5 use smart pointers for entity simulations 2016-05-07 09:14:33 -07:00
Seth Alves
073d845bb5 show with debug icons when someone else is the simulation owner 2016-05-05 18:33:01 -07:00
Andrew Meadows
bcf2cc8074 use references not pointers for ViewFrustums 
also unravelling some spaghetti:
(1) split Octree stuff out of ViewFrustum
(2) moved ViewFrustum from octree to shared lib
(3) removed some cruft
 2016-05-05 18:28:27 -07:00
Seth Alves
cb523a3a71 disable webSurface differently 2016-05-05 16:01:05 -07:00
Seth Alves
b5a3baf322 Merge branch 'master' of github.com:highfidelity/hifi into linux-qol 2016-05-05 15:55:37 -07:00
Atlante45
07adef9465 Fix entities collision sounds 2016-05-05 14:55:28 -07:00
Brad Hefta-Gaub
49d02b802a Merge pull request #7719 from zzmp/feat/resource-prefetch 
Add prefetching to exposed caches
 2016-05-02 18:04:26 -07:00
Seth Alves
ef85cc7803 hook up zone flyingAllowed flag to character controller 2016-05-01 14:47:12 -07:00
Zach Pomerantz
13945aa4d9 Annotate all virtual fns with override 2016-04-30 13:48:59 -07:00
Zach Pomerantz
bc8a171fde Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch 2016-04-27 11:55:24 -07:00
Andrew Meadows
b5ad989811 more optimized uses of EntityItem::getDimensions() 2016-04-27 11:04:22 -07:00
Brad Hefta-Gaub
b597f7001b fix auto resize 2016-04-26 15:13:11 -07:00
Seth Alves
c9df446879 web-entities don't yet work right on Linux 2016-04-24 08:15:10 -07:00
Seth Alves
e2025b0d1f lock entity-tree before accessing entities 2016-04-21 15:27:15 -07:00
Zach Pomerantz
c096b0dfa1 Add TextureType to NetworkTexture for reflection 2016-04-20 20:18:22 -07:00
Howard Stearns
9ff9682b2a Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange 
Reset entities script engine on domain change
 2016-04-19 11:14:28 -07:00
samcake
cadb53b703 Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more 2016-04-18 18:24:27 -07:00
Brad Hefta-Gaub
55010cebb7 remove unhelpful comment 2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub
374ba10524 more CR feedback 2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub
0d20f2468e CR feedback 2016-04-18 12:13:21 -07:00
Brad Hefta-Gaub
c26115cf2e one small tweak 2016-04-18 11:40:17 -07:00
Brad Hefta-Gaub
f6c75d0530 cleanup 2016-04-18 10:41:54 -07:00
Brad Hefta-Gaub
d1f6b371c9 cleanup 2016-04-18 10:27:12 -07:00
Brad Hefta-Gaub
a4f562672a cleanup 2016-04-18 10:08:33 -07:00
Brad Hefta-Gaub
9db0fe0d11 switch to using QSharedPointer for _entitiesScriptEngine 2016-04-18 09:46:04 -07:00
Brad Hefta-Gaub
87078b1ea2 first cut at resetting entities script engine on domain change 2016-04-16 11:09:23 -07:00
Brad Hefta-Gaub
91334d6a39 Merge pull request #7664 from ZappoMan/reduceJointProperties 
only export joint values if they've been explicitly set by scripts
 2016-04-14 15:30:04 -07:00
Brad Hefta-Gaub
b48503a82d only export joint values if they've been explicitly set by scripts 2016-04-13 19:52:50 -07:00
Zach Pomerantz
7a15339631 Use AnimationCache for models 2016-04-13 15:44:47 -07:00
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00
Brad Davis
8e1e11a6f8 Merge pull request #7615 from zzmp/fix/amd-particles 
Add explicit layout to textured particle shader
 2016-04-08 13:19:41 -07:00
Brad Hefta-Gaub
7ba08dd137 Merge pull request #7613 from hyperlogic/tony/model-entity-render-fix 
Reading animation properties without an entityTree lock is considered harmful
 2016-04-08 10:37:17 -07:00
Zach Pomerantz
4e3ab73941 layout std140 in particle shader 2016-04-07 17:27:51 -07:00
Anthony J. Thibault
8f530ceaf9 Reading animation properties without an entityTree lock is considered harmful 
In RenderableModelEntityItem::update() make a copy of the _animationProperties, which is under the entityTree lock.
In RenderableModelEntityItem::render() read from the copy of _animationProperties when not under the entityTree lock.
 2016-04-07 13:42:40 -07:00
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
Anthony J. Thibault
6a7a572b53 Model: Toggling Physics > Draw Collision Hulls works again 
Collision renderItems were never getting removed when shouldShowCollisionHull became false.
 2016-04-05 11:06:24 -07:00
Zach Pomerantz
0e9b783ca3 Release skybox texs when not rendering 2016-04-01 14:46:50 -07:00
Zach Pomerantz
e4cba14333 Avoid recreating model items when adding to scene 2016-03-31 10:46:51 -07:00
Zach Pomerantz
377a20e983 Use default texs for empty json 2016-03-31 10:46:51 -07:00
Zach Pomerantz
984bacdae3 Rearrange model entity render to reduce flicker 2016-03-31 10:46:51 -07:00
Zach Pomerantz
3de5f73a1f Fixup model on tex load 2016-03-31 10:46:51 -07:00
Brad Hefta-Gaub
03f9a2b46f more optimization in find best zone 2016-03-31 09:36:51 -07:00
Brad Hefta-Gaub
28978c8adb optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently 2016-03-30 17:49:30 -07:00
Zach Pomerantz
01db2be6b8 Avoid JSON parsing texs every render cycle 2016-03-30 14:48:57 -07:00
Zach Pomerantz
e4f12c81e0 Get remap textures through getter 2016-03-30 14:11:36 -07:00
Brad Hefta-Gaub
32308c7810 Merge pull request #7501 from zzmp/fix/parse-tex 
Respond to error from free in texture parsing
 2016-03-30 08:53:15 -07:00
Brad Hefta-Gaub
8a47c5a35f Merge pull request #7504 from zzmp/log/building-web-surface 
Log OffscreenQml lifetime
 2016-03-29 18:11:16 -07:00
Zach Pomerantz
ad9027f9d6 Log OffscreenQml lifetime 2016-03-29 15:26:22 -07:00
Zach Pomerantz
6c7b6cd62e Return parsed tex directly as variant 2016-03-29 14:16:22 -07:00
Zach Pomerantz
848e7703ee Test textures emptiness correctly 2016-03-29 10:50:27 -07:00
Zach Pomerantz
29dedd5524 Update model URL on render thread 2016-03-29 10:42:40 -07:00
Zach Pomerantz
2de94e672b Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-28 14:08:30 -07:00
Philip Rosedale
dfb09f134a Merge pull request #7476 from ZappoMan/bugFixes 
fix a couple of model bugs
 2016-03-25 15:58:52 -07:00
Seth Alves
f3ba16ab3e fix locking around polyvox state flags 2016-03-25 14:06:57 -07:00
Seth Alves
d97ab1e2fc Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-25 13:53:01 -07:00
Brad Hefta-Gaub
4ebb114a8e also fix joint simulation from 3rd party editors 2016-03-25 11:43:32 -07:00
Brad Hefta-Gaub
759fac228c fix the doppelganger 2016-03-25 11:29:14 -07:00
Brad Hefta-Gaub
6c6131c7b3 fix the doppelganger 2016-03-25 11:22:54 -07:00
Brad Hefta-Gaub
984d6ae48f fix model resizing bug 2016-03-25 10:46:14 -07:00
Zach Pomerantz
5d306a74d5 Merge branch 'master' of github.com:highfidelity/hifi into feat/geocaching 2016-03-25 10:09:37 -07:00
Seth Alves
ae6d6f4bb3 added comments, minor cleanups 2016-03-24 21:37:46 -07:00
Zach Pomerantz
413c3b88cf Accept textures as list or json 2016-03-24 19:40:02 -07:00
Seth Alves
1b88284bf7 more threading cleanups 2016-03-24 19:14:25 -07:00
Seth Alves
f8fe7b5868 add back getMesh call 2016-03-24 17:22:34 -07:00
Seth Alves
6abed67c05 cleanups 2016-03-24 15:46:30 -07:00
Seth Alves
7c910fcf5e further reworking of polyvox threading 2016-03-24 15:28:19 -07:00
Zach Pomerantz
3e9e083df5 Update users of NetworkGeometry 2016-03-24 11:35:41 -07:00
Seth Alves
bd178640f1 Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking 2016-03-24 09:51:31 -07:00
Seth Alves
462da3aaf3 don't call getMesh from render 2016-03-23 22:46:43 -07:00
Seth Alves
2d7f32a554 redo polyvox locking 2016-03-23 22:03:27 -07:00
Brad Hefta-Gaub
3fa3b40f43 fix non-animated motor proteins 2016-03-23 15:56:31 -07:00
Brad Hefta-Gaub
492e71345a Revert "Revert "Fix ModelBlender crash"" 
This reverts commit f274cdcc7f.
 2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f Revert "Fix ModelBlender crash" 2016-03-21 10:47:31 -07:00
Andrew Meadows
d7d428d1b2 Merge pull request #7387 from ZappoMan/fixBlenderCrash 
Fix ModelBlender crash
 2016-03-21 09:14:11 -07:00
Seth Alves
f8b8877369 coding standard 2016-03-20 17:37:06 -07:00
Seth Alves
d4ed9993b2 don't spam log when a zone is invisible 2016-03-20 15:06:17 -07:00
Brad Hefta-Gaub
7483b8546b remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it 2016-03-17 17:05:35 -07:00
Chris Collins
307a0cf05a Merge pull request #7349 from zzmp/fix/guard-skybox-tex 
Guard against failure to load skybox tex
 2016-03-16 15:06:52 -07:00
Brad Hefta-Gaub
d840e68f05 Merge pull request #7365 from howard-stearns/reregister-and-scale-after-model-change 
Reregister and scale after model change
 2016-03-16 08:04:42 -07:00
Brad Hefta-Gaub
870677a223 Merge pull request #7339 from samcake/red 
Less jittering at far distance
 2016-03-15 15:39:33 -07:00
samcake
f3daa9e1c5 Fixing the lighting issue in stereo 2016-03-15 14:35:43 -07:00
howard-stearns
ddc658af5f After a modelURL change to an existing model, allow the model to be 
snapped and scaled to the existing entity registration and dimensions.
 2016-03-15 12:20:51 -07:00
Howard Stearns
010aaa55c0 const ref 2016-03-14 22:13:26 -07:00
Howard Stearns
d7e3699bc8 Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-14 17:45:52 -07:00
Seth Alves
908481d5d4 merge from upstream 2016-03-14 11:15:16 -07:00
Zach Pomerantz
b6322164cf Guard against failure to load skybox tex 2016-03-14 11:15:06 -07:00
Seth Alves
dbd548a8c7 fix a crash 2016-03-13 11:01:11 -07:00
howard-stearns
8799bf2d55 Alternative implementation, which only selects visible bestZone. 2016-03-11 16:36:13 -08:00
Seth Alves
01659cf93b try, try again 2016-03-11 16:21:20 -08:00
Seth Alves
2ad15f7568 try harder to get queryAABoxes to be correct 2016-03-11 14:38:31 -08:00
Seth Alves
f611d8f747 if needed, set querryAACube when dimensions are updated 2016-03-11 12:41:18 -08:00
howard-stearns
e538edba0a Merge branch 'master' of https://github.com/highfidelity/hifi into zone-visibility 2016-03-11 10:22:01 -08:00
howard-stearns
9cdd0ac6d0 Respect zone visibility property. 2016-03-11 10:19:44 -08:00
Zach Pomerantz
40378920b1 Merge branch 'master' of github.com:highfidelity/hifi into fix/skybox-tex 2016-03-10 21:44:31 -08:00
Stephen Birarda
a9dd88d834 Merge pull request #7320 from zzmp/feat/shader-includes 
Compile shaders into separate dir for inclusion
 2016-03-10 21:07:49 -08:00
Zach Pomerantz
11867aa71d Compile shaders to their own folders 2016-03-10 20:10:54 -08:00
Zach Pomerantz
d7d351fc63 Guard against unloaded env cubemaps 2016-03-10 12:50:52 -08:00
Zach Pomerantz
d615e2e83b Avoid redundant zone updates 2016-03-10 12:27:45 -08:00
Zach Pomerantz
1640314076 Use one procedural for skybox (avoid copies) 2016-03-10 10:12:22 -08:00
Zach Pomerantz
74e1d32221 Reuse procedural on skybox 2016-03-09 19:40:27 -08:00
Zach Pomerantz
40fbe2d1e5 Reuse procedurals on entities 2016-03-09 17:34:03 -08:00
Andrew Meadows
592d29fc7c Merge pull request #7251 from sethalves/fix-hulls-for-non-default-registration 
fix collisions with non-default registration
 2016-03-07 15:46:13 -08:00
Seth Alves
40c953e0b9 fix model hulls 2016-03-07 11:40:18 -08:00
Seth Alves
8b8604f9b0 move offset handling for models back to how it was before this PR 2016-03-07 11:32:25 -08:00
Seth Alves
c95d1f68f6 remove debug print 2016-03-06 14:38:03 -08:00
Seth Alves
5c585acd9a offset is included in shape key for models 2016-03-06 14:29:30 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
Seth Alves
8bc2c76a8b change shape-key when registration point changes so shape cache doesn't incorrectly reuse the old shape 2016-03-05 08:01:30 -08:00
Seth Alves
5bb50c7ea0 track api change in packDeferredFragment 2016-03-04 17:01:54 -08:00
Seth Alves
9346171695 if entity registration isn't default, adjust physics shapes to match 2016-03-04 16:47:30 -08:00
samcake
16ac69315f Imroving the roughness/specular highlight nd fixing a bug with the CUbemap texture 2016-03-01 16:38:02 -08:00
Zach Pomerantz
5c64115b26 Use keyLight in DLE instead of _skyboxTexture 2016-03-01 14:44:34 -08:00
samcake
630c61e61d Reflection is working correctly with the PBR property, ship t 2016-02-29 18:54:43 -08:00
samcake
99ba011996 Post merge with Zach work for environment map 2016-02-26 16:04:50 -08:00
Andrew Meadows
c4798870d5 Merge pull request #7200 from hyperlogic/tony/box-render-crash-fix 
Crash fix for RenderableBoxEntityItem::render
 2016-02-26 10:25:50 -08:00
samcake
3ee6f9d6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 23:48:53 -08:00
Brad Hefta-Gaub
82cbf19bca Merge pull request #7078 from zzmp/fix/light-intensity 
Reimplement light attenuation for spot and point lights
 2016-02-25 16:08:28 -08:00
samcake
610189ded3 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-25 14:14:04 -08:00
samcake
96fb9c4466 cleaning up macos warnings, separating Metallic maps from the default, gamma corrected gray textures 2016-02-25 14:13:35 -08:00
Anthony J. Thibault
626b170207 Crash fix for RenderableBoxEntityItem::render 2016-02-25 14:10:23 -08:00
Zach Pomerantz
c20bd6cbbc Update Scene on ZoneEntity update 
ZoneEntity is unique in that it is not updated
every frame that it is rendered, but only
when the avatar moves.

This introduces custom code so that the
RenderableZoneEntity initiates an update
in the EntityTreeRenderer on update,
to improve usability of zone editing.
 2016-02-25 10:06:19 -08:00
Zach Pomerantz
9000c3479b Avoid double-update of zone 2016-02-25 10:06:19 -08:00
Zach Pomerantz
32ce7c6eab Rename light surfaceRadius->falloffRadius 2016-02-25 10:02:33 -08:00
Brad Hefta-Gaub
91f6b7e80d Merge pull request #7186 from zzmp/feat/scene-ambient-tex 
Wire up zone ambientURL
 2016-02-25 09:05:25 -08:00
samcake
ae6e625894 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-24 17:30:40 -08:00
Zach Pomerantz
c2ed5e5474 Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-24 16:24:09 -08:00
Zach Pomerantz
95d98e3ed7 Wire up zone ambientURL 2016-02-24 16:07:04 -08:00
Nex Pro
864f00ee61 Fixed inverted particle rendering. 2016-02-24 01:02:17 +00:00
samcake
1c53f9bc87 Fix the cleanup of the render::Item::ID in the EntityITem Rendereable wich were often not invalidated after beeing removed from the scene. THis caused a bug with particule system when beeing added /removed / updated quickly 2016-02-23 10:40:50 -08:00
Zach Pomerantz
77ad4039bc Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity 2016-02-22 15:11:12 -08:00
Zach Pomerantz
8ac84b3fc2 Render point/spot lights with surface radii 2016-02-22 15:07:08 -08:00
samcake
377ee5a486 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-02-22 09:23:14 -08:00
Brad Hefta-Gaub
2c7c6be6a6 fix build buster 2016-02-21 10:40:11 -08:00
Brad Hefta-Gaub
a12446dab5 Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
 2016-02-21 10:10:24 -08:00