HifiExperiments
|
19cd0fa6ad
|
CR
|
2021-01-29 22:31:17 -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
|
2a27fc4de2
|
billboarding for model entities
|
2021-01-13 22:31:21 -08:00 |
|
HifiExperiments
|
ae944fd985
|
merge with master
|
2020-09-01 09:34:54 -07:00 |
|
Kasen IO
|
21fd10d154
|
Revert commit 359248829c using -m 1 to temporarily fix issue 383.
|
2020-06-03 16:08:18 -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
|
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 |
|
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
|
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 |
|
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 |
|
|
|
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
|
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
|
b73a608094
|
procedural vertex shaders
|
2019-11-15 00:22:40 -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
|
6e5217b80d
|
fix build error, add environment variable
|
2019-11-02 01:03:34 -07:00 |
|
Sam Gateau
|
a95a4b5aa2
|
Address warnings and comments from review
|
2019-10-18 11:43:25 -07:00 |
|
Sam Gateau
|
0a9c389641
|
last issue
|
2019-10-16 08:06:35 -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
|
05ac9aefa8
|
the clusterMatrices should be working, but n skin index and weights are assigned yet
|
2019-10-14 02:21:01 -07:00 |
|
Sam Gateau
|
8a1f3648f9
|
fooling around to get the cluster working
|
2019-10-11 18:06:44 -07:00 |
|
Sam Gateau
|
a995f2c09f
|
in the middle of something
|
2019-10-10 17:09:54 -07:00 |
|
Sam Gateau
|
1f3993c308
|
getting the transform right for the rigid bodies
|
2019-10-08 18:13:24 -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 |
|
SamGondelman
|
37feb7f027
|
merge with master
|
2019-06-10 10:29:39 -07:00 |
|
SamGondelman
|
129d96a997
|
get rid of lightmapMap
|
2019-06-07 14:53:31 -07:00 |
|
SamGondelman
|
6d3e23a7fe
|
merge with master
|
2019-05-16 20:03:10 -07:00 |
|
SamGondelman
|
de90c5088c
|
(✿◠‿◠)
|
2019-05-16 19:33:07 -07:00 |
|
SamGondelman
|
3eac2cf1d6
|
(づ｡◕‿‿◕｡)づ
|
2019-05-16 18:31:45 -07:00 |
|
SamGondelman
|
14c38c0fb0
|
ಠ⌣ಠ
|
2019-05-16 10:27:59 -07:00 |
|
SamGondelman
|
da254c2ccc
|
(¬‿¬)
|
2019-05-15 23:48:04 -07:00 |
|
SamGondelman
|
0bcd8b81e1
|
trying and failing to fix models
|
2019-05-01 12:01:49 -07:00 |
|
SamGondelman
|
5a184bd584
|
fix model bounds
|
2019-04-30 13:38:11 -07:00 |
|
Olivier Prat
|
7d412f9109
|
Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.
|
2019-04-19 11:03:43 +02:00 |
|
Olivier Prat
|
3fc711dba2
|
Added opacity mask to shadow casters
|
2019-04-17 12:35:24 +02:00 |
|
SamGondelman
|
27338c3639
|
fix cauterization of entities that are children of MyAvatar's head
|
2019-04-08 19:48:11 -07:00 |
|
SamGondelman
|
dbc3ae3793
|
hmmm not working
|
2019-02-22 14:18:59 -08:00 |
|
SamGondelman
|
56096708d3
|
one more try
|
2019-01-29 15:26:49 -08:00 |
|
