Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 22:27:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87479 commits 69 branches 56 tags 1.2 GiB
Commit graph

3084 commits

Author SHA1 Message Date
Kalila
409cc5835c
Merge pull request #1050 from HifiExperiments/imageAspectFix 
Image Entities: fix keepAspectRatio, implement naturalDimensions
 2021-03-27 15:24:43 -04:00
HifiExperiments
7ff796af3e web textures work on image entities, create supports negative materialMappingScale 2021-03-22 20:52:39 -07:00
HifiExperiments
6b82c7fe90
Update RenderableImageEntityItem.cpp 2021-03-22 18:37:29 -07:00
HifiExperiments
35e836d34d image caching must maintain original image information and pass it around 2021-03-19 22:32:29 -07:00
HifiExperiments
3fdb398829 fixing up material entity logic, refresh reference material on material change 2021-03-17 19:10:29 -07:00
HifiExperiments
9514ade844 add reference materials and support reference texture changes 2021-03-15 21:21:32 -07:00
HifiExperiments
828e653849 able to reference entity ids as textures 2021-03-13 22:34:48 -08:00
HifiExperiments
9a247172f3 non-parented material use the right cull mode 2021-03-09 21:09:48 -08:00
HifiExperiments
68c20ce73d text backgrounds have texcoord if not simple 2021-03-03 17:47:03 -08:00
HifiExperiments
ccda630a3a fixing _glColor4f 2021-03-02 21:44:06 -08:00
HifiExperiments
c47351c4f2 merge with master 2021-02-25 19:39:09 -08:00
HifiExperiments
826eb709ce more work on materials 2021-02-25 19:03:42 -08:00
HifiExperiments
186f505b15 images support materials 2021-02-24 20:56:14 -08:00
HifiExperiments
25e4f59d55 gizmos have materials, working on images 2021-02-23 20:54:57 -08:00
HifiExperiments
30cf1555e4 fix keepAspectRatio, give text entities naturalDimensions 2021-02-20 22:47:33 -08:00
Julian Groß
937e0a55db Merge remote-tracking branch 'refs/remotes/HifiExperiments/fixBillboard' 2021-02-20 12:12:59 +01:00
HifiExperiments
852edec9e7 entities with billboardMode != none use local rotation so parent rotation doesn't affect them 2021-02-18 22:15:12 -08:00
HifiExperiments
f46f1b2219 Merge branch 'master' into alignment 2021-02-11 18:07:23 -08:00
HifiExperiments
b296fff197 add text alignment property 2021-02-10 21:45:53 -08:00
HifiExperiments
0645866549
Merge branch 'master' into billboard 2021-02-09 23:28:58 -08:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
f1d6a4e3d4
Merge branch 'master' into feature/web-entity-user-agent 2021-02-09 22:47:46 -08:00
HifiExperiments
ace6bf6c5b dirty physics on useOriginalPivot change, other small fix for compound shapes 2021-02-03 17:35:17 -08:00
HifiExperiments
bb898aac33 non-exact collisions should work on models with pivots and useOriginalPivot=true 2021-01-21 21:05:00 -08:00
Kalila L
82313eccbf Add userAgent property for web entities. 2021-01-21 01:51:37 -05:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08:00
HifiExperiments
1f71a23082 optimize picking 2021-01-17 13:09:09 -08:00
HifiExperiments
2a27fc4de2 billboarding for model entities 2021-01-13 22:31:21 -08:00
HifiExperiments
bef0c79b67 billboard mode working on most entity types 2021-01-10 16:03:04 -08:00
HifiExperiments
6e0bad814e working on billboard mode for all entity types 2021-01-03 20:33:08 -08:00
HifiExperiments
5dc45e895c more fixes and create checkbox defaults to checked 2021-01-02 19:18:54 -08:00
HifiExperiments
a072010b02 Merge remote-tracking branch 'upstream/master' into pivot 2021-01-02 17:13:24 -08:00
HifiExperiments
20e0c24163 cleanup + create 2021-01-02 00:04:24 -08:00
HifiExperiments
002271a4cc finishing touches 2021-01-01 21:52:16 -08:00
HifiExperiments
0f9f95f716 possible fix for physics 2020-12-28 23:46:37 -08:00
HifiExperiments
f33c7de67a Merge remote-tracking branch 'upstream/master' into pivot 2020-12-18 17:33:24 -08:00
HifiExperiments
7069e48073 working on pivot 2020-12-16 21:01:56 -08:00
HifiExperiments
9a5b956968
Apply suggestions from code review 
Co-authored-by: David Rowe <david@ctrlaltstudio.com>
 2020-11-27 15:11:18 -08:00
HifiExperiments
c510a8fa3e add comment about material sphere scale 2020-11-27 15:10:14 -08:00
HifiExperiments
2ece568f09 fixing up simple-compound logic 2020-11-27 15:04:56 -08:00
HifiExperiments
2e780c34d1 Merge remote-tracking branch 'upstream/master' into update 2020-11-24 16:34:30 -08:00
HifiExperiments
b6744588f4 loading fix 2020-11-16 21:25:25 -08:00
HifiExperiments
81940214bb
Revert "Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine"" 2020-11-16 21:20:25 -08:00
kasenvr
21f8eac936
Revert "Split Local and owned Avatar Entity scripts into their own ScriptEngine" 2020-11-16 22:35:46 -05:00
HifiExperiments
06f7624512 some more small improvements 2020-11-14 22:34:03 -08:00
HifiExperiments
3b2c219e53 possibly more robust fix? 2020-11-10 21:39:15 -08:00
HifiExperiments
b3e9c1e8f8 Merge remote-tracking branch 'upstream/master' into scriptEngine 2020-11-09 22:00:11 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
HifiExperiments
a7e6332c0e fix alpha material bug 2020-11-04 22:09:11 -08:00
HifiExperiments
a3c85bd438 possible fix for collisions again 2020-11-04 19:41:01 -08:00
HifiExperiments
f413ad3312 small fixes 2020-10-21 16:05:30 -07:00
HifiExperiments
115229da92 build error 2020-10-20 19:31:03 -07:00
HifiExperiments
2dd612b926 more improvements 2020-10-20 17:12:23 -07:00
HifiExperiments
c664991f6f models seem to be working! 2020-10-20 15:06:21 -07:00
HifiExperiments
44b34e0341 what about...this 2020-10-14 13:21:07 -07:00
HifiExperiments
9142b7123d collisions and dimensions seem to be working 2020-10-13 16:27:48 -07:00
HifiExperiments
ae7a46fbca more updates 2020-10-12 22:31:39 -07:00
HifiExperiments
5a8c1a0374 starting improve entity updates pt 2 2020-10-12 18:50:46 -07:00
Dale Glass
2fac1ddf2c Add missing 'override' 
Fixes:
warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override]
 2020-09-26 22:58:44 +02:00
kasenvr
87d4fddb40
Merge branch 'master' into feature/transparent-web-entities 2020-09-26 01:25:02 -04:00
kasenvr
dd3152a2e4
Merge pull request #349 from daleglass/fix_warnings 
Fix warnings emitted by GCC
 2020-09-24 17:06:16 -04:00
HifiExperiments
ae944fd985 merge with master 2020-09-01 09:34:54 -07:00
HifiExperiments
2e4a6ee1b5 fix build errors 2020-08-28 11:22:08 -07:00
HifiExperiments
2a1857e9ec split entity script engines into two 2020-08-27 16:50:32 -07:00
Dale Glass
5a8be4de4b Fix -Wclass-memaccess warnings 2020-08-27 19:49:48 +02:00
Dale Glass
afa44dccf6 Fix initialization order warning 
https://stackoverflow.com/questions/30364585/will-be-initialized-after-wreorder
 2020-08-27 19:27:11 +02:00
HifiExperiments
af82860751 fix shape issue that alezia found 2020-08-19 19:51:16 -07:00
Kasen IO
103288b8de Update bool name "isTransparentWeb" -> "transparent" 2020-08-18 20:04:27 -04:00
Kasen IO
204789bd42 Further fix up web entity property processing on reload. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-08-18 19:22:54 -04:00
Kasen IO
8d904d39ce Semi-working fixes for updates to web entities. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-08-18 04:17:29 -04:00
Kasen IO
c379f6c92f Fix transparency check bug. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-08-18 03:21:34 -04:00
Kasen IO
b05cb8b6ac useBackground property added. 2020-08-18 01:48:27 -04:00
HifiExperiments
e78ece7fc5 CR 2020-08-17 14:16:41 -07:00
Kasen IO
cd5bdf6160 Added transparent + colored background web entity capability dynamically. 2020-08-15 00:56:19 -04:00
Kasen IO
21167a0f6a Maybe fix scriptURL on WebEntities bug 2020-08-14 23:53:01 -04:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
kasenvr
ce6573333c
Merge pull request #543 from HifiExperiments/alpha 
Fix shape alpha 0 issue
 2020-07-23 17:23:20 -04:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
HifiExperiments
e635d0ff87 fix alpha 0 issue 2020-07-16 15:29:58 -07:00
HifiExperiments
c9684b8c6d Merge remote-tracking branch 'upstream/master' into parenting 2020-07-10 11:43:03 -07:00
HifiExperiments
11ad64c606 properly pause particles when you look away 2020-07-01 14:37:09 -07:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
kasenvr
72d931688c
Merge pull request #409 from kasenvr/fix/entity-null-check 
Bugfix: Add null check to entity render clearing to fix crash.
 2020-06-05 13:09:41 -04:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
Kasen IO
94c230b78b Add null check to entity render clearing to fix crash. 
Co-Authored-By: null <HifiExperiments@users.noreply.github.com>
 2020-06-01 22:13:52 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
kasenvr
c5fdacf975
Merge pull request #301 from HifiExperiments/modelBackface 
Models support flipped normals on double sided geometry
 2020-05-13 16:06:26 -04:00
HifiExperiments
8f9c180243 Merge remote-tracking branch 'origin/parenting' into modelShader 2020-05-07 13:43:20 -07:00
HifiExperiments
405d557725
Merge branch 'master' into blendshapes 2020-05-07 13:38:59 -07:00
HifiExperiments
ebc9dae78d
Merge branch 'master' into parenting 2020-05-07 13:35:32 -07:00
HifiExperiments
8017e30ab9
Merge branch 'master' into blendshapes 2020-05-07 13:27:22 -07:00
HifiExperiments
3bf690571c
Merge branch 'master' into zoneOcclusion 2020-05-07 13:13:20 -07:00
HifiExperiments
b6cb1fcfe7 fix procedural applying to other things 2020-04-22 16:36:51 -07:00
HifiExperiments
420af95131 models support flipped normals on double sided geometry 2020-04-16 16:18:39 -07:00
David Rowe
ffeb37e7aa Merge remote-tracking branch 'hifi/master' into merge-hifi-master 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	cmake/externals/glad32es/CMakeLists.txt
#	cmake/externals/glad41/CMakeLists.txt
#	cmake/externals/glad45/CMakeLists.txt
#	cmake/externals/polyvox/CMakeLists.txt
#	cmake/externals/quazip/CMakeLists.txt
#	cmake/externals/vhacd/CMakeLists.txt
#	cmake/init.cmake
#	cmake/ports/hifi-deps/CONTROL
#	cmake/ports/sdl2/CONTROL
#	cmake/ports/sdl2/disable-hidapi-for-uwp.patch
#	cmake/ports/sdl2/enable-winrt-cmake.patch
#	cmake/ports/sdl2/fix-arm64-headers.patch
#	cmake/ports/sdl2/fix-x86-windows.patch
#	cmake/ports/sdl2/portfile.cmake
#	cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake
#	cmake/ports/tbb/portfile.cmake
#	hifi_vcpkg.py
#	interface/src/avatar/MyAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
#	libraries/avatars/src/AvatarData.h
#	libraries/entities-renderer/src/RenderableEntityItem.h
#	libraries/entities/src/EntityItem.cpp
#	libraries/entities/src/EntityItem.h
#	libraries/fbx/src/GLTFSerializer.cpp
#	libraries/graphics-scripting/src/graphics-scripting/Forward.h
#	libraries/networking/src/AddressManager.cpp
#	libraries/networking/src/DomainHandler.h
#	libraries/procedural/src/procedural/ProceduralMaterialCache.cpp
#	libraries/render-utils/src/HighlightEffect.cpp
#	libraries/render-utils/src/MeshPartPayload.cpp
#	libraries/render-utils/src/Model.cpp
#	libraries/render-utils/src/RenderShadowTask.cpp
#	libraries/script-engine/src/WebSocketClass.cpp
 2020-04-09 16:46:27 +12:00
HifiExperiments
eb26d9b4e3 working on parenting fixes 2020-04-06 13:41:01 -07:00
HifiExperiments
6eacc5c8c2 Merge remote-tracking branch 'upstream/kasen/core' into zoneOcclusion 2020-04-03 14:37:14 -07:00
HifiExperiments
c062cb75ae Merge remote-tracking branch 'upstream/kasen/core' into blendshapes 2020-04-03 14:35:21 -07:00
Marcus Llewellyn
e5dd23b922
Merge pull request #33 from kasenvr/feature/metaverse-url-switching 
Ability to change Metaverse API from setting
 2020-01-14 18:40:04 -06:00
HifiExperiments
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
b40a468b4c fix EOF 2020-01-06 18:31:35 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
Brad Hefta-Gaub
fb70569fc2
Merge pull request #16548 from HifiExperiments/visible 
Case 17368: Fix wearables not disappearing with avatar
 2019-12-13 13:20:15 -08:00
Brad Hefta-Gaub
1609e59c42
Merge pull request #16546 from HifiExperiments/cullFace 
Material Entities can specify face culling method, support GLTF doubleSided property
 2019-12-13 13:16:01 -08:00
Brad Hefta-Gaub
f8a9789f86
Merge pull request #16499 from HifiExperiments/proceduralMesh 
Procedural vertex shaders
 2019-12-13 13:00:01 -08:00
Kasen IO
1f01beba70 Fixed patch issues 2019-12-13 12:29:08 -05:00
HifiExperiments
0bd5e15b47 fix non-procedural material entity crash 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-13 02:17:52 -05:00
HifiExperiments
204c7a7391 fix shadows!! 2019-12-12 23:04:55 -05:00
HifiExperiments
6156495345 stupid, shadows still broken 2019-12-12 23:04:47 -05:00
SamGondelman
1736252f0d trying and failing to fix models 2019-12-12 23:04:47 -05:00
HifiExperiments
e0a29d9367 material entities support cullFaceMode and support gltf doubleSided 2019-12-12 23:01:57 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 22:49:48 -05:00
HifiExperiments
2eb0ec18fc fix non-procedural material entity crash 2019-12-11 00:42:59 -08:00
HifiExperiments
400b771a1a fix shadows!! 2019-12-05 01:41:56 -08:00
HifiExperiments
413bf10f79 stupid, shadows still broken 2019-11-26 22:28:06 -08:00
HifiExperiments
3dfd63d46b merge with master 2019-11-26 20:42:44 -08:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
Sabrina Shanman
518d6a530a
Merge pull request #16507 from highfidelity/master 
Merge master into instancing
 2019-11-18 13:54:33 -08:00
HifiExperiments
b73a608094 procedural vertex shaders 2019-11-15 00:22:40 -08:00
Andrew Meadows
dbeea4038d remove unused argument 2019-11-14 09:59:43 -08:00
Andrew Meadows
9d92546a8b revert the revert of PR-16307 2019-11-14 09:59:43 -08:00
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
a42e09aef8 Fix unused variables/implicit type conversions 2019-11-08 10:04:34 -08:00
sabrina-shanman
33bb0e2b19 Change RenderableModelEntityItem::computeShapeInfo to support new HFM format 2019-11-05 14:44:23 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
Sam Gateau
7af0940846 getting coision to work 2019-11-05 10:57:54 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities" 2019-10-11 11:06:10 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave 
DEV-1811: apply deletion rules to linked entities
 2019-10-10 13:24:43 -07:00
Sam Gateau
abaf0262a7 Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-08 18:55:51 -07:00
RebeccaStankus
458d3bfb48 Renamed variable and made it private 2019-10-08 13:47:06 -07:00
RebeccaStankus
092424569d Added flag to ensure mouse event signals are not connected twice 2019-10-08 12:01:47 -07:00
Sam Gateau
521ce3936b I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion... 2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9 apply delete rules down linked hierarchy 2019-10-07 14:38:36 -07:00
Andrew Meadows
470a45c012 EntityItem::_owningAvatarID always AVATAR_SELF_ID for MyAvatar's entities 2019-10-07 14:38:36 -07:00
Sam Gateau
42bc91b389 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-07 09:42:14 -07:00
Zach Fox
5f1c389d1c DEV-611: Ensure that entities with the property set can be clicked in Desktop and VR modes 2019-10-03 09:45:23 -07:00
Sam Gateau
1d19671e88 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-01 11:27:16 -07:00
Sam Gateau
9d999baab2 FIrst pass to clean up before pushing a pr: 2019-09-26 11:59:01 -07:00
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
Sam Gateau
c0660329a3 Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family 2019-09-17 18:06:08 -07:00
Sam Gateau
3d199ff444 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2019-09-16 21:34:56 -07:00
Sam Gateau
18226e64f8 Add a read lock where we think it s needed and banging my head on the problem 2019-09-16 18:06:43 -07:00
sabrina-shanman
76b1f551b1 Merge branch 'master' into instancing 2019-09-16 10:17:59 -07:00
sabrina-shanman
a166b41216 Fix build warnings/errors 2019-09-13 15:39:29 -07:00
Shannon Romano
79d845d127
Merge pull request #16190 from danteruiz/fix-html 
BUGZ-1398: HMD Tablet Apps blocked by Web access error
 2019-09-13 12:35:29 -07:00
danteruiz
8491a37923 fixing WebEntities html 2019-09-13 09:57:51 -07:00