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 |
|
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 |
|
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 |
|
