Dale Glass
99d00d03cd
Make the "Wrote KTX" message a debug one
2022-06-21 15:12:49 +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
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
7ff796af3e
web textures work on image entities, create supports negative materialMappingScale
2021-03-22 20:52:39 -07:00
HifiExperiments
e5f108b022
bump ktx version to force clear cache
2021-03-21 14:51:21 -07:00
HifiExperiments
35e836d34d
image caching must maintain original image information and pass it around
2021-03-19 22:32:29 -07:00
HifiExperiments
828e653849
able to reference entity ids as textures
2021-03-13 22:34:48 -08:00
Dale Glass
61a159034c
Fix build under Qt 5.14 and later.
...
Solves "redefinition of ‘struct std::hash<QString>’",
"redefinition of ‘struct std::hash<QByteArray>'", and
a build failure in TouchscreenVirtualPadDevice.h.
2020-08-25 23:32:24 +02: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
Kasen IO
c34cd996df
change Metaverse API from setting
2019-12-20 11:39:05 +01:00
David Rowe
5eb6e9dadd
Add recently added properties to caches' JSDoc
2019-11-26 17:00:13 +13:00
HifiExperiments
deb5aacfad
fix materialcachescriptinginterface
2019-10-25 18:16:08 -07:00
HifiExperiments
1e100a672e
merge with master and try to fix opacity mode stuff
2019-10-23 22:21:45 -07:00
Sam Gateau
57f8095506
Pass 4 on cleaning up that pr, put the SortFIlterModel.qml in the new skit/qml lib, setting the opacityMappMode correctly from script
2019-09-27 12:00:45 -07:00
Sam Gateau
24cc302a8b
second pass of cleaning on the code to make it ready for merge
2019-09-26 16:56:00 -07:00
Sam Gateau
dc40c530a3
INstrumenting the code more...
2019-09-25 17:53:59 -07:00
Sam Gateau
c0660329a3
Exposing the REsource Caches through a bit of ui, adding MaterialCache to the family
2019-09-17 18:06:08 -07:00
David Rowe
39ae575ef3
Tidy entities' "unlit" properties
2019-07-23 11:02:43 +12:00
Anthony Thibault
6c66f5a37b
Fix for DependencyManager crash on shutdown on Mac
...
On Mac, it is possible to crash when shutting down, it is not clear if this is due to
shutting down the app on another thread during logout or something that can happen
during normal shutdown, because it is so difficult to reproduce.
However, from looking at the stack traces it is possible for a [NSApplication terminate:]
event to get processed while Appliction::aboutToQuit() is calling ScriptEngine::waitTillDoneRunning()
This causes AppKit to invoke the static destructors too early. Which in turn, causes the
DependencyManager destructor to fire while there are still many dependencies running.
Unfortunatly, the order of destruction is not determinstic, causing them to get shutdown
in an incorrect order.
To workaround this, we delay the call to QCoreApplication::processEvents() as late as possible,
in the Application destructor. Theoretically, this will be a safe time for the static destructors
to be invoked, because it is after all of the DependencyManager's dependencies have been
manually destroyed.
However, this is only a speculative fix, because this is so difficult to reproduce.
2019-07-01 17:37:57 -07:00
David Rowe
2d6d3eb4fe
Doc review
2019-06-28 17:05:36 +12:00
David Rowe
0bee5edc47
Fix documentation of Material's albedo and emissive property values
2019-06-22 08:41:30 +12:00
David Rowe
b16086de74
Revise JSDoc for key Entities methods plus entity properties
2019-06-15 10:44:56 +12: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
Seth Alves
55daef837a
fix uninitialized read
2019-06-04 13:00:26 -07:00
SamGondelman
283cc18269
Merge remote-tracking branch 'upstream/master' into proceduralMesh
2019-05-16 16:33:16 -07:00
SamGondelman
da254c2ccc
(¬‿¬)
2019-05-15 23:48:04 -07:00
David Rowe
d5bb7f25e1
Doc review
2019-05-15 07:56:55 +12:00
David Rowe
7359d42b5c
Window JSDoc update
2019-05-01 08:17:27 +12:00
SamGondelman
6ce6877dfa
Merge remote-tracking branch 'upstream/master' into textureUsage
2019-04-25 15:05:27 -07:00
SamGondelman
3b746384ca
really fix texture baking, and turn off irradiance generation during baking
2019-04-23 16:01:31 -07:00
SamGondelman
b1f00d6f22
attempt to handle atp redirects from .fbx to .baked.fst
2019-04-23 14:54:10 -07:00
Sabrina Shanman
2a7ef5c5bb
Merge pull request #15426 from sabrina-shanman/bug_oven_texture-scale_master
...
(case 22282) Fix some baked models not preserving texture scale (master)
2019-04-22 09:52:36 -07:00
Sabrina Shanman
16da80b9b6
Merge pull request #15425 from sabrina-shanman/bug_hfm_main-thread
...
(case 22011) Fix model processing occurring on main thread
2019-04-19 15:40:54 -07:00
sabrina-shanman
9cb5ed888a
Remove unnecessary hasTexcoordTransform
2019-04-19 11:29:28 -07:00
sabrina-shanman
7b74561b27
Fix baked models not preserving scale in some cases
2019-04-19 11:29:27 -07:00
sabrina-shanman
7333b02f34
Fix model processing occurring on main thread
2019-04-19 09:48:30 -07:00
Shannon Romano
d5ab49c64c
Merge pull request #15402 from sabrina-shanman/hfm_bug_model-materials_master
...
(case 22216) Fix Interface not loading some baked models correctly
2019-04-19 08:53:40 -07:00
sabrina-shanman
b711ee8b8a
Fix MaterialBaker not including names in baked multi-materials
2019-04-17 13:24:04 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
...
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker
...
Case 21764: Oven bakes model materials directly to separate material description
2019-04-05 17:08:22 -07:00
David Rowe
28dfac64ba
Merge branch 'master' into M21460
...
# Conflicts:
# libraries/image/src/image/Image.h
2019-04-05 17:50:46 +13:00
David Rowe
68f76851fd
Updates per doc review
2019-04-05 17:10:52 +13:00
SamGondelman
75a246b82d
simplifying material baker and support bump/gloss maps
2019-04-01 22:35:28 -07:00
Olivier Prat
7af4a52587
Merge branch 'hdr' into amc
2019-04-01 10:44:38 +02:00
