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

4584 commits

Author SHA1 Message Date
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
56fa143ee6 Merge remote-tracking branch 'upstream/master' into pivot 2021-02-02 22:27:49 -08:00
HifiExperiments
19cd0fa6ad CR 2021-01-29 22:31:17 -08:00
HifiExperiments
7030798d41 cleanup 2021-01-17 22:47:26 -08: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
Phil Palmer
1cdc3610c3 Disable z-write for transparent fonts, grid entities and teleport beams 
as suggested in the review here: https://github.com/vircadia/vircadia/pull/953#pullrequestreview-560779456
 2021-01-05 06:47:33 -05:00
HifiExperiments
030524c3ee CR and actually send property over wire 2021-01-03 21:03:43 -08:00
Phil Palmer
4f71cb5945 Disable z-write when drawing web entities with alpha < 1. 2021-01-03 22:59:31 -05:00
Phil Palmer
90799e10da Fix z-write enabled for transparent draws. 
Fix z-write being enabled for transparencies in GeometryCache::getSimplePipeline and Procedural::Procedural (fixes https://github.com/vircadia/vircadia/issues/224).
Z-write is controlled by the 'writeMask' parameter of gpu::State::setDepthTest.
 2021-01-03 16:31:51 -05: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
1475cae504 wip 2020-12-23 21:29:59 -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
7bfbf3c99c Merge remote-tracking branch 'upstream/master' into update 2020-11-09 19:33:38 -08:00
HifiExperiments
ccd5ef80b3 remove isActive, fix contains, maybe fix green box issue 2020-11-09 19:14:30 -08:00
HifiExperiments
c8532a1ac5 another unused variable 2020-11-04 22:21:24 -08:00
Dale Glass
3284313399 Mark font textures as something that shouldn't be downscaled 2020-10-27 18:24:08 +01:00
HifiExperiments
c664991f6f models seem to be working! 2020-10-20 15:06:21 -07:00
HifiExperiments
9142b7123d collisions and dimensions seem to be working 2020-10-13 16:27:48 -07:00
HifiExperiments
5a8c1a0374 starting improve entity updates pt 2 2020-10-12 18:50:46 -07: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
Dale Glass
e6bd75d497 Fix incorrect fall-through in RenderPipelines 2020-08-27 19:27:11 +02:00
HifiExperiments
e78ece7fc5 CR 2020-08-17 14:16:41 -07:00
HifiExperiments
87fd039f99 fix merge issue 2020-08-04 08:54:44 -07:00
HifiExperiments
0d62798860 Merge remote-tracking branch 'upstream/master' into parenting 2020-08-04 08:52:13 -07:00
kasenvr
80d3e3c455
Merge pull request #520 from kasenvr/fix/move-user-agent 
Fix/move user agent
 2020-07-23 17:13:18 -04:00
HifiExperiments
aa6eedf0fe make sure render with zones works on models on restart/reload 2020-07-21 12:06:38 -07:00
Kasen IO
4b1e82fc0b Move user agent to networking constants. 2020-07-08 14:18:24 -04:00
HifiExperiments
56d359f2ba Merge remote-tracking branch 'upstream/master' into parenting 2020-06-14 17:30:26 -07:00
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
kasenvr
1a46b28b71
Merge pull request #62 from HifiExperiments/blendshapes 
Support blendshapes on model entities
 2020-05-31 18:34:42 -04:00
Kasen IO
6c6a405020 Add periods and remove double copyright in tabletaboutdialog.qml 2020-05-25 16:41:16 -04:00
Kasen IO
a4bf1c4d82 Update copyright headers. 2020-05-25 15:59:43 -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
91e177f68b add spaces after fors 2020-05-07 13:23: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
bc319cb340 zone occlusion 2020-01-11 22:29:07 -08:00
HifiExperiments
ef8f085b47 support blendshapes on model entities 2020-01-05 02:37:44 -08: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
9839b23061 Made Sam's graphics patches work with 86 K2. 2019-12-13 02:38:14 -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
59c67e5590 put back stepping in translucent case 2019-12-12 23:01:57 -05:00
HifiExperiments
3fe395ca32 properly implement alphaModes 2019-12-12 23:01:57 -05:00
HifiExperiments
b66fa1d57a put back stepping in translucent case 2019-12-12 22:58:36 -05:00
HifiExperiments
d54ca43554 properly implement alphaModes 2019-12-12 22:58:36 -05:00
HifiExperiments
6e961b9f2f procedural vertex shaders 
Signed-off-by: Kasen IO <kasenvr@gmail.com>
 2019-12-12 22:49:48 -05:00
Marcus Llewellyn
af4c0ea0d1 Removes the environment variable requirement for procedural material shaders. 
Signed-off-by: Marcus Llewellyn <marcus.llewellyn@gmail.com>
 2019-12-10 16:52:19 -06: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
HifiExperiments
b4c9a3e73d Merge remote-tracking branch 'origin/alphaModes' into cullFace 2019-11-25 14:23:50 -08:00
HifiExperiments
f55c4b8b12 put back stepping in translucent case 2019-11-24 12:44:42 -08:00
HifiExperiments
5371fd613a properly implement alphaModes 2019-11-22 00:41:32 -08:00
sabrina-shanman
79d470c70e Call updateGeometry before Model::createRenderItemSet to ensure well-defined state 2019-11-21 16:12:49 -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
sabrina-shanman
516debdcb2 Fix code style / remove cruft 2019-11-13 12:50:13 -08:00
sabrina-shanman
b7da5d0d72 Update Model::calculateTriangleSets to use hfm::Shapes 2019-11-08 13:56:49 -08:00
Sam Gateau
8175b9486f Fix crash when highlighting custom pipeline shapes 2019-11-08 11:18:02 -08:00
Sabrina Shanman
eebb9ad51f
Merge pull request #16475 from highfidelity/master 
Merge master into instancing
 2019-11-08 10:10:50 -08:00
Sam Gateau
269289412e Same fix for highlight effects 2019-11-08 09:11:58 -08:00
Sam Gateau
5682e8ee2f Fixing bug with custom pipeline and deformed shape renderItems in shadow pass 2019-11-07 15:16:11 -08:00
Sam Gateau
86b62f921d Now that avatars can potentially have their own custom pipeline, shadow pass needs to support it 2019-11-07 14:01:50 -08:00
sabrina-shanman
da5f80c139 Use std::vector types in ShapeInfo 2019-11-05 10:57:55 -08:00
sabrina-shanman
67e05a70d4 Fix build error with _drawTransform 2019-11-05 10:56:29 -08:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
Sam Gateau
a4696992e8 Renaming the env variable to enable Material Proecural Shaders 2019-11-04 11:15:37 -08:00
HifiExperiments
bae2ba7bae merge with master 2019-11-02 01:08:56 -07:00
HifiExperiments
6e5217b80d fix build error, add environment variable 2019-11-02 01:03:34 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master 
Merge master into instancing
 2019-10-31 17:39:15 -07:00
sabrina-shanman
4e0db5d641 Fix build warnings 2019-10-24 15:49:03 -07:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Anthony J. Thibault
92f1b59cc8 Full legacy API and FST support 2019-10-18 16:30:32 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -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
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
Sam Gateau
0a9c389641 last issue 2019-10-16 08:06:35 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00