Commit graph

189 commits

Author SHA1 Message Date
HifiExperiments
79484c4b1d Merge remote-tracking branch 'overte/master' into taa 2025-01-23 22:26:40 -08:00
HifiExperiments
ce7c304025 Merge remote-tracking branch 'overte/master' into taa 2024-10-29 23:30:11 -07:00
HifiExperiments
65b7329136 support more procedural shader uniform types, including arrays 2024-10-21 17:05:36 -07:00
HifiExperiments
8fc734b168 Merge remote-tracking branch 'overte/master' into master_to_protocol_changes3 2024-08-17 12:07:21 -07:00
HifiExperiments
200a6e4821 typo 2024-07-06 16:40:36 -07:00
HifiExperiments
2a3d1c639c disabled fallback 2024-06-29 22:49:55 -07:00
HifiExperiments
206d1c0157 shader error fallback 2024-06-29 21:50:33 -07:00
HifiExperiments
ee705d285e Merge branch master into protocol_changes 2024-06-18 21:08:21 -07:00
HifiExperiments
74002b4738 simplify constructors 2024-04-19 16:05:59 -07:00
HifiExperiments
8f27a4bf2b support VRMC_materials_mtoon and KHR_materials_unlit 2024-04-14 16:23:45 -07:00
edb3580520 Fixed emtpy texture issue 2024-03-26 21:24:02 +01:00
65387adee8 Reapply "Disabled texture loading for agent"
This reverts commit bf601dfa6e.
2024-03-26 21:06:11 +01:00
bf601dfa6e Revert "Disabled texture loading for agent"
This reverts commit a0aae43386.
2024-03-26 17:40:03 +01:00
a0aae43386 Disabled texture loading for agent 2024-03-25 22:31:53 +01:00
HifiExperiments
f7c17d6035 new procecural particle entity type 2024-03-21 16:43:09 -07:00
HifiExperiments
f2ebca9935 more fixes 2024-02-29 17:45:56 -08:00
HifiExperiments
d5e251d8da minor cleanup, copyright 2024-02-28 15:23:04 -08:00
HifiExperiments
56f697e5f0 merge old work 2024-02-24 23:26:34 -08:00
HifiExperiments
5f0cbe9799 comment about bit mapping in GraphicsScriptingInterface 2024-02-12 13:40:36 -08:00
HifiExperiments
9cb29bb3a3 fix some warnings, disable outlines for now 2024-02-03 22:31:27 -08:00
HifiExperiments
c04c037588 native MToon materials 2024-02-02 17:59:32 -08: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
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
HifiExperiments
12833b9c93 CR and percent decoding 2021-07-06 19:13:33 -07: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
HifiExperiments
15ba6c8637 fix build 2021-03-17 21:14:22 -07:00
HifiExperiments
5fd4f215f1 more docs 2021-03-17 19:18:30 -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
f5e2cb6e2b update docs 2021-03-14 18:13:44 -07:00
HifiExperiments
ae26416c59
Merge branch 'master' into billboard 2021-02-09 22:57:10 -08:00
HifiExperiments
92ea14a059 proper render bounds for models (need to pass RenderArgs to getBound everywhere) 2021-01-17 22:08:06 -08: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
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04: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
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
David Rowe
ec1e6bc7d3 Merge branch 'DOC-55-C' into api-docs 2020-01-14 18:04:32 +13:00
David Rowe
a92830f2c1 Miscellaneous JSDoc fixes 2019-12-23 09:09:27 +13:00
Kasen IO
c34cd996df change Metaverse API from setting 2019-12-20 11:39:05 +01:00
David Rowe
a04e57d82d Miscellaneous JSDoc fixes noticed in passing 2019-12-19 11:38:17 +13: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
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
5fc55d1763
Merge branch 'master' into cullFace 2019-12-11 00:49:58 -08:00
HifiExperiments
69714a89ca material entities support cullFaceMode and support gltf doubleSided 2019-11-26 14:48:48 -08:00
David Rowe
c998148589 Revise recent changes to Entities.Material JSDoc 2019-11-26 17:43:41 +13:00