Commit graph

553 commits

Author SHA1 Message Date
pull[bot]
2f359cc15f
[pull] master from overte-org:master (#93)
* mirrors wip

* fix view + projection, texture flipping, billboarding

* wip portals

* wip

* fix cpu frustum culling (hacky?)

* fix mirrors in deferred

* mirrors on models + text

* portals use exit as ignoreItem

* cleanup

* entity tags

* wild guess to handle view correction, hide portalExitID in create when mirrorMode != portal

* let's try this??

* plz

* promising

* fix paramsOffset and view flipping

* portals shouldn't flip

* break when tag found

* fix portal view calculation

* Revert "Mirrors + Portals"

* Revert "Revert "Mirrors + Portals""

* web entity wantsKeyboardFocus property

* fix typo

* move audio zones to zone entity properties

* fix audio zones in create

* set dynamic factory

* new procecural particle entity type

* fix particle intersection

* shorten create labels

* fix 0 update props case

* Ability to smooth model animations

* sound entities

* fix layered simulate items

* fix stereo sound speed

* support non-localOnly sound avatar entities

* add sound url prompt

* support registration point, improve locking

* remove keyboardRasied

* locking attempt #2

* fix keyboardRasied typo

* add default particle props

* add unlit property for shapes

* Merge branch master into protocol_changes

* add ambient light color

* fix create issue

* fix create issue

* add tonemapping props to zones, wip ambient occlusion

* wip ambient occlusion

* it's working!

* remove attachments

* fix non-localOnly positional sounds not updating

* change AO default to HBAO, remove from create

* more graphics options

* fix AO setting + effects in mirrors

* fix AA in mirrors

* alezia's fixes

* fix haze in mirrors

* add comment for SKYBOX_DISTANCE

* new line

* model loading priority updates over time, takes into account out of bounds, avatar entities have higher priority, and fsts can specify to wait for wearables to load before rendering

* add loadPriority to model entities, working on other avatars waitForWearables

* fix build error

* try to fix isServer assert

* fix stats + waitForWearables

* Listen for click instead of release.

* Reverted initial commit. Implemented hack to listen for menu click events.

* Missed some reverts.

* Missed another one.

* Prevent duplicate actions.

* Added extra needed checks.

* Fix without formatting? (#91)

* Hopefully fixed formatting.

* Things can't be too easy.

* Remove google poly

* automated entity property serialization

* cleanup + automate EntityPropertyFlags

* text vertical alignment, use uint8_t for entity property enums, fix text recalculating too often

* fix text size

* Update interface/resources/controllers/keyboardMouse.json

Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>

* fix component mode serialization

* Fixed mouse look in selfie mode.

* fix text debug assert on invalid or unloaded font

* missed some enums

* fix ADD_GROUP_PROPERTY_TO_MAP

* fix PROP_GRAB_EQUIPPABLE_INDICATOR_URL missing urlPermission

* fix KeyLightPropertyGroup legacy properties

* fix PolyLineEntityItem::getEntityProperties

* comment cmake script

* fix copyright

* Replaced key value with key text.
Added additional comment about the specific delete key used.

* weekly promoted place

Highlight the first place in the list as the weekly promoted place

* Fixed lingering references to `avatarIcon`.

Signed-off-by: armored-dragon <publicmail@armoreddragon.com>

* Adding icon for "Grab And Equip" section

Adding icon for "Grab And Equip" section

* Add "Grab And Equip" section

Add "Grab And Equip" section for the grabbale and Equipable groups of properties.

* Add files via upload

* Add tooltips for the "Grab and Equip" properties

Add the tooltips for the "Grab and Equip" properties

* Text adjustments for grab.equippable

Text adjustments for grab.equippable

* Make Maturity Filter persisted

Make Maturity Filter persisted and with a default value (Teen & Everyone)

* Adjust the default value for maturity

Adjust the default value for maturity

* move "triggerable" under GRAB & EQUIP

move "triggerable" under GRAB & EQUIP

* Remove hifi-screenshare
Cherry picked and updated from Tivoli dd5b6ea6ee5597a06603e16509640e7ed18106bb

Co-authored-by: Julian Groß <julian.g@posteo.de>

* Insert placeholder to not break protocol yet.

* Fix incorrectly resolved merge conflict, left too much code.

* Fixes based on review comments on previous PR

* Remove code accidentally re-added during a conflict fix

* bump protocol

* rebuild fonts with full charset (NOT -allglyphs)

* Attempt at fixing Windows master branch builds

* Change minimum angular velocity to a lower one

* Fix Uuid.NULL behavior

---------

Signed-off-by: armored-dragon <publicmail@armoreddragon.com>
Co-authored-by: HifiExperiments <thingsandstuffblog@gmail.com>
Co-authored-by: ksuprynowicz <ksuprynowicz@post.pl>
Co-authored-by: Dale Glass <51060919+daleglass@users.noreply.github.com>
Co-authored-by: HifiExperiments <53453710+HifiExperiments@users.noreply.github.com>
Co-authored-by: Julian Groß <julian.g@posteo.de>
Co-authored-by: armored-dragon <publicmail@armoreddragon.com>
Co-authored-by: Armored-Dragon <github56254@armoreddragon.com>
Co-authored-by: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Co-authored-by: Maki <mxmcube@gmail.com>
Co-authored-by: Dale Glass <dale@daleglass.net>
2024-10-24 06:32:53 +00:00
HifiExperiments
8f27a4bf2b support VRMC_materials_mtoon and KHR_materials_unlit 2024-04-14 16:23:45 -07: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
b5911d145c Remove debug print with URL from ModelLoader 2024-02-26 23:18:23 +01:00
081ae901d2 glTF importer using cgltf library 2024-02-25 19:57:00 +01:00
ae7d229d0e Fix copyright headers 2023-05-19 00:17:38 +02:00
Heather Anderson
1e018dbc64 isolate calls to the QtScript libraries to an interface we control 2023-05-19 00:17:33 +02:00
Heather Anderson
713b29ee41 ensure all #include's to QtScript are labeled as such (easier to find) 2023-05-19 00:17:33 +02:00
Dale Glass
fed0f21603 Fix StrongRef warning 2022-06-10 00:46:19 +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
d77c8bbe41 Fix warnings related to deprecated usage of multiple keys in QHash and QMap
This replaces those uses with QMultiHash and QMultiMap
2021-11-26 17:53:23 +01: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
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
Kasen IO
21fd10d154 Revert commit 359248829c using -m 1 to temporarily fix issue 383. 2020-06-03 16:08:18 -04:00
David Rowe
5eb6e9dadd Add recently added properties to caches' JSDoc 2019-11-26 17:00:13 +13:00
sabrina-shanman
7b14c00540 Merge branch 'master' into instancing 2019-11-05 10:22:24 -08:00
HifiExperiments
1e100a672e merge with master and try to fix opacity mode stuff 2019-10-23 22:21:45 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
Sam Gateau
a995f2c09f in the middle of something 2019-10-10 17:09:54 -07:00
Sam Gateau
936ac6f120 REmoving more repetitions of the meshParts 2019-10-07 18:03:33 -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
Sam Gateau
dc40c530a3 INstrumenting the code more... 2019-09-25 17:53:59 -07:00
SamGondelman
6d3e23a7fe merge with master 2019-05-16 20:03:10 -07:00
Anthony J. Thibault
98fe059d97 Fix blender::run crash
Pass a shared_ptr of the HFMModel to the Blender.  This will prevent the HFMModel
from being destroyed on the main thread if an Avatar changes their skeletonModelURL.

Also the _blendshapeOffset hash in Model has been eliminated, it was not necessary and
was also a source of data races.

The body of Blender::run has been updated slightly to reduce the number of allocation necessary for temporary QVectors.
2019-05-16 13:12:16 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Clement
ad36df0455 Fix build warnings 2019-05-09 13:59:49 -07:00
Atlante45
3605b3d560 Patch interface redirect code 2019-04-23 14:54:12 -07:00
SamGondelman
b1f00d6f22 attempt to handle atp redirects from .fbx to .baked.fst 2019-04-23 14:54:10 -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
7333b02f34 Fix model processing occurring on main thread 2019-04-19 09:48:30 -07:00
SamGondelman
27f1255899 fix transparent textures on baked assets
(cherry picked from commit b89dbf8346)
2019-04-18 11:23:45 -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
SamGondelman
75a246b82d simplifying material baker and support bump/gloss maps 2019-04-01 22:35:28 -07:00
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13:00
Howard Stearns
44f897fbd2
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst
allow baseURL to be specified in fst
2019-03-19 13:56:27 -07:00
Howard Stearns
61fb65b5a4 don't set _url, so that cache_clearing works 2019-03-19 12:41:58 -07:00
howard-stearns
0e4d3b2aeb allow baseURL to be specified in fst 2019-03-18 17:40:54 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
Shannon Romano
d068630728
Merge pull request #15108 from sabrina-shanman/crash_physics-fst
(case 21585) Fix crash when FST model used as both graphics and physics model
2019-03-06 17:06:38 -08:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
2019-03-06 15:54:12 -08:00
sabrina-shanman
86c948f116 Convert hfmModel and materialMapping fields in model-baker Baker to getters 2019-03-06 15:33:31 -08:00
sabrina-shanman
7ad8b3a610 Fix FST models being copied improperly in the ModelCache 2019-03-05 16:59:36 -08:00
Thijs Wenker
ff8cb27256 include fst URL in the GeometryExtra hash 2019-02-28 23:45:08 +01:00
Thijs Wenker
6aede024f4 use fst mapping path as reference instead of model path 2019-02-28 23:22:55 +01:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00