HifiExperiments
56f697e5f0
merge old work
2024-02-24 23:26:34 -08:00
HifiExperiments
c04c037588
native MToon materials
2024-02-02 17:59:32 -08:00
Dale Glass
e7591d6794
Revert "Revert "Mirrors + Portals""
2024-01-13 11:23:36 +01:00
c6e4e5de37
Revert "Mirrors + Portals"
2024-01-13 11:18:08 +01:00
c73566d7f2
Merge pull request #721 from HifiExperiments/mirror
...
Mirrors + Portals
2024-01-13 11:18:00 +01:00
HifiExperiments
c608e82f22
portals shouldn't flip
2023-12-21 15:41:16 -08:00
HifiExperiments
5159367b4c
fix paramsOffset and view flipping
2023-12-18 15:42:17 -08:00
HifiExperiments
3e0c50e077
wild guess to handle view correction, hide portalExitID in create when mirrorMode != portal
2023-12-04 14:49:35 -08:00
HifiExperiments
6af7b9f772
cleanup
2023-11-19 15:17:18 -08:00
HifiExperiments
3336efb6ee
portals use exit as ignoreItem
2023-11-19 14:57:02 -08:00
HifiExperiments
a630a6f9c9
mirrors on models + text
2023-11-19 14:57:02 -08:00
HifiExperiments
093cf29778
fix mirrors in deferred
2023-11-19 14:57:02 -08:00
HifiExperiments
d9ee3791e6
fix deprecated warning
2023-11-18 23:12:28 -08:00
HifiExperiments
97c4184db1
wip portals
2023-11-13 15:27:36 -08:00
HifiExperiments
10de1288c2
fix view + projection, texture flipping, billboarding
2023-11-13 14:40:56 -08:00
HifiExperiments
89e6cbbfa4
mirrors wip
2023-11-13 14:40:56 -08:00
ae7d229d0e
Fix copyright headers
2023-05-19 00:17:38 +02:00
e9984c72f0
Added QTimer* script data type and some nullptr checks
2023-05-19 00:17:35 +02:00
ad57a5e6fd
Fixed enums in scripting engine
2023-05-19 00:17:35 +02:00
Heather Anderson
8581022a53
rework ScriptValue to act like a stack variable rather than a pointer
2023-05-19 00:17:34 +02:00
Heather Anderson
1e018dbc64
isolate calls to the QtScript libraries to an interface we control
2023-05-19 00:17:33 +02:00
8b973bdfa3
Remove executable permission from a bunch of files
2023-03-14 00:02:33 +01:00
f1d7421698
Workaround for Nvidia driver bug
2022-12-23 20:25:10 +01:00
Dale Glass
81b2af88ae
Clear _meshStates after warning, not before.
...
Fixes #257
2022-12-03 00:51:06 +01:00
d2a768c2f0
Renamed environment variables
2022-09-08 22:18:50 +02:00
Kalila
03b5b83b67
Merge pull request #1339 from odysseus654/pr/make_shared
...
Housekeeping: use of std::make_shared / QSharedPointer::create.
2021-12-09 17:14:04 -05:00
Dale Glass
65a87b9603
Fix for _meshStates.empty() assertion
...
See the comment in the code for a detailed discussion of the issue. This is
a workaround, but it should be a safe one.
2021-11-22 01:13:39 +01:00
Penguin-Guru
44fb53d4f2
Removed comment.
2021-10-30 10:43:10 -07:00
Penguin-Guru
e6a41e85b2
Added comments. Referenced all enums explicitly.
2021-10-25 13:40:36 -07:00
Penguin-Guru
8386f2eb61
Clumsy fix for enum storage.
2021-10-24 19:19:20 -07:00
Penguin-Guru
66fdfa40ad
Hopefully implemented antialiasing setting.
2021-10-24 15:32:51 -07:00
Dale Glass
b8d1057e1f
Replace the deprecated QMutex{ QMutex::Recursive} with QRecursiveMutex
...
This fixes around 1700 warnings.
2021-09-26 01:27:19 +02:00
Heather Anderson
bcce9a2091
convert explicit shared pointer creation (using "new") to make_shared where possible/appropriate
2021-09-11 15:15:04 -07:00
Heather Anderson
ab4d70760e
review and cleanup of "#include <QtCore/QSharedPointer>"
2021-09-10 21:40:54 -07:00
Dale Glass
24b2cdfcd2
Fix QString::SplitBehavior deprecation, replace with Qt::
2021-08-06 20:16:10 +02:00
Dale Glass
567ff291fe
Merge pull request #943 from daleglass/cmake-build-in-build-dir
...
Cmake: build in build dir
2021-07-22 23:26:21 +02:00
Dale Glass
32c3725b5d
Define _USE_MATH_DEFINES everywhere that uses math constants
...
On Win32, things are failing to build with messages like:
RenderableEntityItem.cpp(674,51): error C2065: 'M_PI': undeclared identifier
This is because as per Microsoft documentation, _USE_MATH_DEFINES is needed to
obtain constants like M_PI:
https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=msvc-160
It seems this worked previously due to some quirk of CMake, but stopped working
after some reordering. This change makes this definition explicit where it is needed.
2021-07-17 19:34:26 +02:00
HifiExperiments
bdbb88084b
CR
2021-07-05 21:02:40 -07:00
HifiExperiments
7f99ddca2e
merge with master
2021-07-05 16:48:45 -07:00
David Rowe
4d11d1d515
Convert all "/**jsdoc" occurrences to "/*@jsdoc"
2021-05-12 10:54:45 +12:00
Julian Groß
ecb7c47f1a
Rename fbx folder to model-serializers
2021-04-15 19:26:10 +02:00
Kalila
f5b91b17ea
Merge pull request #1124 from ctrlaltdavid/fix/avatar-parts-rotating
...
Fix avatar parts rotating
2021-04-01 19:11:52 -04:00
David Rowe
12ceb0d93e
Fix avatar parts rotating
2021-03-28 21:11:58 +13: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
ccda630a3a
fixing _glColor4f
2021-03-02 21:44:06 -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
Kalila
26894b4325
Merge pull request #1020 from HifiExperiments/alignment
...
Text Entity alignment property
2021-02-13 01:28:41 -05:00
HifiExperiments
56fa4698da
potential fix for offset soft attachments
2021-02-11 20:07:46 -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
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
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
