Revert "Material drag drop deltas (#1334)"#1365
Merged
AidanCaruso merged 1 commit intointfrom Mar 13, 2025
Merged
Conversation
This reverts commit 74e9f50.
AidanCaruso
requested review from
CITIZENDOT,
DanielBelmes,
MichaelEstes,
SYBIOTE,
aditya-mitra,
dinomut1 and
the-reality-engineer
as code owners
DanielBelmes
approved these changes
Mar 13, 2025
HexaField
added a commit
that referenced
this pull request
Mar 17, 2025
* [GA] Michael/ir 7534 thumbnails int (#1291) * updated the toggle between the "assets" and "files" panel to update the currently selected directory, so thumbnail processing will look in the correct folder on uploading a file from the "assets" panel updated the assets uploadFiles method to be a promise so it's then can be reacted to * updated the seenResources when a file has been deleted * fixed deleting an asset not updating the asset list ui * fixed issue with resource item's name not showing ( wrong color). fixed issue with the thumbnail not updating when uploading a gltf * moved the refresh reaction to the thumbnail job state to a context level to react better to it * updated asset hooks to fetch all assets needed on a force refresh * removed dev logs and the need to set the staticResourcesPagination.skip to 0 to force a refresh * wip - updates to thumbnail job state * removed unneeded tag set * removed dicey query refetch * added logic to check if the uploaded file already has a static resource record and if it does, set it's thumbnailUrl and thumbnailMode to null, so it will trigger the thumbnail generation process later * fixed thumbnail generation edgecase for repeatedly deleting and uploading the same file to the same folder * removed the now unused id references * updated the method name for deletingfiles to removeFromFileThumbnailsSeen to better describe its function * simplified the removeFromFileThumbnailsSeen method to just take the list of files as string * fixed missed ref to FileThumbnailJobState jobs * fixed patch object typing issue * removed project name from patch data * switched from null to undefined for the for the thumbnail patch data * set the static resource patch data object to any to get past the overload ref error issue * removed unused TestState * fixed issue with the static resource data schema not allowing null as a value for thumbnailKey, thumbnailURL, or thumbnailMode * removed thumbnailURL from patch and staticResourceSchema since it no longer exists in the database table * fixed issue with the FileThumbnailJobState jobs reference in the loaders.tsx * fixed ref to thumbnailJobState.jobs.length fixed staticResourceSchema to have thumbnailURL since it is still used * fixed type issue with the thumbnailKey and thumbnailMode in the file-helper * [GA] Add Rooms category for old templates (#1290) Add Rooms category for old templates * update compressed scene name (#1298) update cpmressed scene name * Fix IR-6953: Improve Context and Error messages and validation in the studio at upload files and folders (#1302) * fix IR-6953: remove enconde decode filename, give context and prevent upload files with name that does not valid wit following validations: must be 4-64 characters, start and end with an alphanumeric, and contain only alphanumerics, dashes, underscores, and dots * fix missing validatios for prefabs file names * fixed edge case in adding a slot to the resource list ,it being selec… (#1303) fixed edge case in adding a slot to the resource list ,it being selected, and then adding a video path to the slot and the preview video player not showing up * Force default avatars on iOS (#1299) * force default avatar on ios * add override to initial avatar spawn too --------- Co-authored-by: HexaField <joshfield999@gmail.com> * IR-7950-MT-INT-MacOS-uses-CTRL-instead-of-CMD-for-undo-redo (#1307) use cmd on mac for undo/redo * [IR-7810] Fix project load hook (#1329) check for project lenght * [GA][INT] IR-7771: Fixed quit to dashboard crash (#1323) fix: quit to dashboard crash * Api server optimizations (#1327) * Ensure branch-build workflow runs on int and stg * api server optimizations * Michael/ir 7966 video play (#1322) fixed issue with removing a video while it was playing * Michael/ir 7255 video controls int (#1321) * fixed issue with missing video controls checkbox * moved checkbox to top * Fix color & spacing issue in Profile Menu (#1318) * Fix particle system reactivity and ensure it respects the VisibleComponent (#1309) * [INT] [IR-7631] gcp colliders sporadically spawn in world zero (#1308) Set dirty flag after all reactors have run * enable heapsnapshot (#1330) * enable heapsnapshot * changed to working syntax * Port-some-optimizations-from-ir-5334 (#1331) * fix mesh bvh race condition where fallback runs for pending meshes * fix undesriable import from schemas * default worker pool sizes to 1, ensure ktx2 loader only creates 1 worker * optimize opacity update on viewer container * fix test * update timeouts * update compressed buffer and image name (#1349) * Need to update the default Shadow Bias values for lights. (Example Point light does not show shadows with default bias values.) (#1315) * bias-calculation * remove-log * iterateEntityNode * rootEntity * commitProperty shadowBias * translate * iPhone texture discarding (#1352) * Move joystick images to static folder (#1341) * Move joystick images to static folder * use absolute paths instead of imports * disable shared login modal (#1345) * disable shared login modal * IR-8002 Fix lint * Ensure mobile does not enable video when it's not supposed to (#1358) * Ensure mobile does not enable video when it's not supposed to * fix intended functionality with mobile stream ending * Update colors (#1313) * Mobile: Reduce spacing b/w QR Code & Inputs in Share menu (#1317) * reduce spacing in share menu * set dimensions closer to designs * small studio polish (#1320) * ui polish * dont reset thumbnails * more cleanup * Profile Menu: Update username on clicking outside the Input field (#1319) * Fixed putObject for folders in GCS (#1325) Resolves IR-7864 * p2p data channel fix (#1328) * [IR-7953] Fix Wizard Image and Video uploads (#1332) fix: make thumbnail updates optional for uploaded images and videos * Material drag drop deltas (#1334) * wip get deltas working with material drag drop * remove comment * cleanup * almost fix texture drag drop * fix some stuff * more fixes * use promises * i think it works for real now * Add close button redesign from UI. Remove X again from mobile (#1335) * [GA] allow both "more" and the "moderations options" to be closed when clicked outside (#1336) allow both "more" and the "moderations options" to be closed when clicked outside * fixed autoplay issue (#1340) * IR-7973 fixing collider 'matchMesh' (#1342) fixing collider 'matchMesh' * [MT-INT] IR-7916 Studio: FIX: Invalid File names are renamed instead of failing upload (#1344) fix(IR-7916): validated file names before upload * IR-7955 rotation bug (#1346) fixing target rotation bug where it was writing to the rotation of the value it was checking * Hardened clientDbToSchema to account for different ways JSON is stored (#1357) Cloud SQL stores JSON as a type `JSON`, and seems to pre-parse this when queried. We assumed how MariaDB was storing it as longtext. Now checking from the start whether they're strings that need to be parsed. * INT scope trace unhandle to just development(Memory Leak API server) (#1361) scope trace unhandle to just development * Fixed bug with searching files (#1347) Call to file-browser.find now passes recursive: true, which gets passed to listFolderContent. Prior appending of '/**' to directory only worked for local file storage. Resolves IR-7909 * fixed trigger issues (#1353) * fixed issues with the collider component not setting up correct if adding a trigger * removed dev log * fixed issue with setting the media's seek time, triggered the autoplay check use effect and the HTMLMediaElement's play/pause useEffect * simplified return per Josh's request * fixed the trigger callback component test to make sure the trigger is set to the correct collisionLayer and collisionMask * updated trigger collider tests * reverted the changes to the tigger callback test * removed force setComponents form the trigger callback component, and added them instead to the node editor for the trigger callback component * removed un used code * fixed condition for rigidbidy --------- Co-authored-by: Josh Field <10372036+HexaField@users.noreply.github.com> * Resize confirmation dialog in mobile (#1338) * Resize confirmation dialog in mobile * use breakpoints * [GA][INT] IR-7995: validate form before compress scene and publish (#1362) fix: validate form before compress scene and publish * Revert "Material drag drop deltas (#1334)" (#1365) This reverts commit 74e9f50. * Ha/ir 7180 (#1364) * ch-br * geometry params enum * remove labels for primitivegeo * fix gl.fenceSync() parameter flag (#1374) * regression: remove click event listeners on profile menu (#1372) remove click event listeners on profile menu * Drag drop deltas 2 (#1368) * wip get deltas working with material drag drop * remove comment * cleanup * almost fix texture drag drop * fix some stuff * more fixes * use promises * i think it works for real now * Revert "Material drag drop deltas (#1334)" This reverts commit 74e9f50. * Revert "Revert "Material drag drop deltas (#1334)"" This reverts commit e6c5455. * [IR-7868] add missing sceneId on locations page when trying to publish (#1367) * set missing sceneid * generate thumbnail on on editor * Move SVGs to static (not public) (#1366) * fix checkbox event propagating twice (#1369) fix checkbox event propagated twice * Fixed issue with getting builder images (#1306) Needed to construct repo URL based on GCP-specific repo structure * IR-7992 hover interact fix (#1370) hover interact fix * Fix p2p instance attendance repolling too often (#1380) * Fix gl client wait sync status check (#1375) Fix gl.clientWaitSync status check The check was inverted. * fix overlaycomponent error (#1376) * fix overlaycomponent error * . * add background to custom avatars (#1371) * optimize feathers hooks rerenders (#1385) * Fix material color setting (#1391) * wip * fixes for material deltas * Add a useragent check for IOS (#1389) * IR-8118 fixing a race condition with add colliders and overwrite existing baked colliders from gltf file (#1387) fixing a race condition with add colliders, and an issue where it could overwrite/modify baked colliders from gltf files * change how we init opacity 0 of ui (#1384) * change how we init opacity 0 of ui * Moved to own effect that properly listens to useRef * fix context loss (#1383) * viewer fixes for int (#1339) * added report user on instance chat (#1296) * added report user on instance chat - refactor report user hook into report user state for state usage in both instance chat and video windows - introduce `ReportUserState` - remove `ReportUserProvider` * invert the icons for video and audio - when closed, off icon is used * disable the video and audio buttons when stream is off * fix audio element not working for peers * creator privacy policy (#1300) added creator privacy policy * loading animation fits on mobile screens (#1314) * fix(ui): styles [IR-7554] (#1293) * feat(more-options-menu): add horizontal icon option * fix(projects): styles for ui * Fix get entities by name error (#1397) fix error thrown when getEntitiesByName has no entities with given name * add ref counting to feathers hooks to eliminate realtime refetch leak (#1390) * Fix Export Fallback Material (#1398) prevent export of fallback material on gltf export * fix resource state crashing sometimes (#1400) * pull out texture loader improvements from 5334 (#1399) * pull out texture loader improvements from 5334 * format * revert flipped back to true by default * Add scene delta state key validation for migration on scene name change (#1396) * scene delta migration logic on scene name change * dont mutate if nothings changed * fixes --------- Co-authored-by: Josh Field <10372036+HexaField@users.noreply.github.com> * add condition for material prototype when loading scene delta (#1402) * disable mobile non optimized PR (#1394) * add check to positional audio system network peers get (#1401) * Fix for onClose events being fired when incorrectly (#1408) * fix mobile pointer input (#1406) * fix mobile pointer input * fix test * add physics world body check before updating avatar's local position (#1405) * add physicsWorld dependency to AvatarReactor useEffect to spawn avatar receptor. * updateLocalAvatarPosition checks physics world for entity RigidBody * Use node ids for deltas (#1403) * use node ids instead * rework test to be in line with how we do other editor control tests currently * revert only --------- Co-authored-by: HexaField <joshfield999@gmail.com> * Fix for ir-8112 change that broke desktop studio (#1412) Update index.tsx Fix for change that fixed mobile but broke (studio) desktop * Update for ClickawayListener not working in admin console (#1414) Update index.tsx * Fix gltf importer looking for deltas in the wrong places (#1415) * deltas fixes * remove log * Revert max users back to 5 (#1416) Revert "update max users per instance to 10 (#1095)" This reverts commit 4199d89. * Upload Asset has no upload indication (#1279) file-upload * add ctrl y redo (#1294) * Enhance UserSearchInput with improved input handling and debounce timing (#1312) * Enhance UserSearchInput with input change handling and adjust debounce timing * Add onInputChange callback to Select component * Remove Mesh Decimation from Compression (#1324) remove decimation from the compression parameters * Add reports regex handling and remove unused appendBaseUrl hook (#1343) * Add keyboard shortcuts for modal actions and improve accessibility (#1200) * IR-7859: POC for Google Marketplace account (#1295) * IR-7859: POC for Google Marketplace account * Updated selected radio button selection --------- Co-authored-by: Hurairah Mateen <hurairahmateen@live.com> * Fix npm builds (#1392) * fix npm builds and start to resolve legacy peer dependencies * add step to branch build script * change version of patch * update hookstate patch with correct base version * update checkout config * use correct repo name * try * try not going up a level * [MT-Dev.GCP] Studio: Transform component is missing when object is placed using "Place Object at Origin" option (#1379) video-image-transform --------- Co-authored-by: MbfloydIR <144718558+MbfloydIR@users.noreply.github.com> Co-authored-by: Daniel Belmes <3631206+DanielBelmes@users.noreply.github.com> Co-authored-by: Jiatong Yao <142644522+JT00y@users.noreply.github.com> Co-authored-by: Andres David Jimenez <asulbaran@theinfinitereality.com> Co-authored-by: lonedevr <102248647+AidanCaruso@users.noreply.github.com> Co-authored-by: Andy Chen <44120813+achen5671@users.noreply.github.com> Co-authored-by: José Galván <33644205+jose-galvan@users.noreply.github.com> Co-authored-by: Appaji <52322531+CITIZENDOT@users.noreply.github.com> Co-authored-by: Michael Estes <michael@etherealengine.com> Co-authored-by: infinitelos <150717186+infinitelos@users.noreply.github.com> Co-authored-by: hizir aslan <35542226+hzraslan@users.noreply.github.com> Co-authored-by: Gheric Speiginer <gheric.speiginer@gmail.com> Co-authored-by: Kyle Baran <kbaran@bitscoop.com> Co-authored-by: dtlehrer <19999194+dtlehrer@users.noreply.github.com> Co-authored-by: Aditya Mitra <55396651+aditya-mitra@users.noreply.github.com> Co-authored-by: Sam Mazer <162159423+SamMazerIR@users.noreply.github.com> Co-authored-by: Miguel <113119956+mikeplascdev@users.noreply.github.com> Co-authored-by: David Gordon <94419856+dinomut1@users.noreply.github.com> Co-authored-by: derek-m-ir <102537464+derek-m-ir@users.noreply.github.com> Co-authored-by: glenn-gartner-ir <glenn.gartner@theinfinitereality.com> Co-authored-by: Muhammad Shafiq <shafiqkhuidad@gmail.com> Co-authored-by: Rahul Ghosh <ghoshr698@gmail.com> Co-authored-by: Hanzla Mateen <hanzlamateen@live.com> Co-authored-by: Hurairah Mateen <hurairahmateen@live.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This reverts commit 74e9f50.
Summary
Subtasks Checklist
Breaking Changes
References
closes #insert number here
QA Steps