Code

Icosa integration#710

Code

Draft

andybak wants to merge 162 commits intomainicosa-foundation/open-brush:mainfrom feature/icosa-integrationicosa-foundation/open-brush:feature/icosa-integrationCopy head branch name to clipboard

+49,608-26,393

Commits

Commits on Nov 1, 2023

• API wrapper (autogenerated)

  andybak

  committed
  11cd2a7

• Initial WIP Icosa auth

  andybak

  committed
  a4b5a87

Commits on Nov 6, 2023

• Updated API wrapper

  andybak

  committed
  37bf5a5

• Add Icosa to accounts prefab

  andybak

  committed
  a7cc5c8

• Update IcosaService.cs

  andybak

  committed
  54a59f5

• Icosa UI for accounts panel

  andybak

  committed
  1838374

Commits on Nov 8, 2023

• Working device login

  andybak

  committed
  e0bb481

Commits on Nov 9, 2023

• rename a bunch of Poly things to Icosa in preperation for getting upload working

  andybak

  committed
  d49b332

• Disable Poly Asset component for now

  andybak

  committed
  74f21c5

• Fix for double triggering of key events. Login keyboard switches off after submit (was still double triggering for some reason)

  andybak

  committed
  ab61c67

• Comment is no longer true - we used a separate codepath for Icosa tokens

  andybak

  committed
  d3cf40c

• Fixes for Icosa login

  andybak

  committed
  217cd0c

Commits on Nov 13, 2023

• Improved name/photo handling

  Show description for 2d1c238
  andybak

  committed
  2d1c238

Commits on Nov 14, 2023

• Remove an assert now we have more than one upload service

  andybak

  committed
  5f9c6b4

• Small refactor

  andybak

  committed
  e864cc3

• Method is no longer static

  andybak

  committed
  23675d4

• Uploads to Icosa (WIP pending backend changes to accept zip files)

  andybak

  committed
  9bee419

Commits on Nov 15, 2023

• Fix temp API url

  andybak

  committed
  7230154

• Minor cleanup

  andybak

  committed
  cfb1b14

• Fix for monoscopic mode

  andybak

  committed
  2214964

• Allow real keyboard input while keyboard popups are open

  andybak

  committed
  b8e5eee

Commits on Nov 23, 2023

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  7f021d8

Commits on Dec 5, 2023

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  0220e49

Commits on Dec 7, 2023

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  17505ff

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  75f0c2c

Commits on Dec 20, 2023

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  efff2ab

Commits on Jan 1, 2024

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  6e39b39

Commits on Feb 28, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  Show description for 21562dc
  andybak

  committed
  21562dc

Commits on Mar 5, 2024

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  871eeae

Commits on Apr 3, 2024

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  8f82aa0

• dotnet-format

  andybak

  committed
  3ed97a0

Commits on Apr 7, 2024

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  95fcdaa

Commits on Apr 27, 2024

• Merge remote-tracking branch 'upstream/main' into feature/icosa-integration

  andybak

  committed
  4233cda

Commits on May 1, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  andybak

  committed
  01845d2

Commits on May 2, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  andybak

  committed
  79e1f10

Commits on May 3, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  andybak

  committed
  848f864

Commits on May 19, 2024

• Merge branch 'main' into feature/icosa-integration

  andybak

  committed
  6d40d65

Commits on May 22, 2024

• Merge branch 'main' into feature/icosa-integration

  andybak

  committed
  b42acd6

• Doh. Send the access token not the userId

  andybak

  committed
  47f745d

• Clean up some Icosa code

  andybak

  committed
  3eda3c6

• Store the upload_job id in the response

  andybak

  committed
  1dee775

• Use the current sketch name as the upload name if it's valid

  andybak

  committed
  264606f

• Unused code

  andybak

  committed
  8bad587

• Include thumbnail in the zip

  andybak

  committed
  6b661e3

Commits on May 24, 2024

• Icosa login, logout and upload API endpoints

  andybak

  committed
  28299ac

Commits on May 26, 2024

• Use the new GLTF exporter for editor environment exports

  andybak

  committed
  efd7f2c

Commits on May 28, 2024

• Helpful comments

  andybak

  committed
  a061a33

• Cube map rendering editor utility

  andybak

  committed
  038aa4f

• Optional environment export

  andybak

  committed
  2042cb6

• Editor utility to export environments as GLB

  andybak

  committed
  80fafec

Commits on May 29, 2024

• "Save as" API endpoint

  andybak

  committed
  437f4c5

• Environment metadata for new GLTF exports

  andybak

  committed
  d456a35

• Pose metadata for legacy GLTF export

  andybak

  committed
  df6a67f

• Merge branch 'main' into feature/icosa-integration

  andybak

  committed
  269fad0

• Fix upload naming issues. Include extras in uploaded gltf

  andybak

  committed
  604f995

Commits on May 30, 2024

• Allow non-runtime gltf export without needing to disable our plugin

  andybak

  committed
  21068e2

Commits on Jun 2, 2024

• Add the scene metadata needed for gltf files to recreate lights

  andybak

  committed
  16c7e3c

Commits on Jun 10, 2024

• WIP implementation of sketchbook and poly panel API integration

  andybak

  committed
  a60ede9

Commits on Jun 15, 2024

• Create cameras and animation clips for GLTF export (WIP)

  andybak

  committed
  3d8fb2f

Commits on Jun 17, 2024

• Switch to official UnityGLTF repo

  andybak

  committed
  0ad431e

• Update UnityGLTFSettings.asset

  andybak

  committed
  9e11bf9

• Move GLTF export standin handling to prefab. Stub out sky export logic

  andybak

  committed
  c0aa661

• Missing user config entry

  andybak

  committed
  55c03ce

• Unused import

  andybak

  committed
  d0c39b3

Commits on Jun 18, 2024

• Move camera path export logic to the export plugin

  andybak

  committed
  4ec1567

Commits on Jun 20, 2024

• "Camera Path" mode for the spectator cam. (via HTTP API only for now)

  andybak

  committed
  28abbd1

• ShouldNodeExport method (needs custom fork of UnityGLTF)

  andybak

  committed
  d65cdac

Commits on Jun 30, 2024

• Set alphamode and doublesided based on brush manifest.

  andybak

  committed
  e5c46a8

• switch to our fork of UnityGLTF

  andybak

  committed
  09bd471

• Bool check was inverted

  andybak

  committed
  6c7f2bc

• Give ConcaveHull it's own copy of the MatteHull material to ease matching of material to manifest

  andybak

  committed
  69ce46a

• manifest and alpha mode logic for new GLTF export

  andybak

  committed
  194fe2a

• Can't exclude BaseBrushScript gameobjects if we want to support unbatched strokes

  andybak

  committed
  f7233f6

Commits on Jul 1, 2024

• API Brush json was included invalid brushes and name matching was buggy

  andybak

  committed
  b2f54b0

• Revert "Give ConcaveHull it's own copy of the MatteHull material to ease matching of material to manifest"

  Show description for a1419c3
  andybak

  committed
  a1419c3

Commits on Jul 7, 2024

• Merge branch 'main' into feature/icosa-integration

  andybak

  committed
  8fb9df3

Commits on Jul 10, 2024

• Updated urls

  andybak

  committed
  b8cdc01

• Fix assets api url. remove useless property

  andybak

  committed
  d530368

Commits on Jul 11, 2024

• Editor utility to ease testing of logged in actions

  andybak

  committed
  d7112ac

• Unused method

  andybak

  committed
  14baac5

• Allow unauthenticated logins

  andybak

  committed
  ba2d85d

• Use Icosa icon instead of Poly

  andybak

  committed
  2f39e33

Commits on Jul 12, 2024

• Fixes and changes for Icosa API integration

  andybak

  committed
  fe41fd4

• Handle weird situations where we init API too early.

  andybak

  committed
  7c8911c

Commits on Jul 13, 2024

• Icosa model loading is working finally

  andybak

  committed
  20a4952

Commits on Jul 14, 2024

• Fix login base urls and make Icosa urls overrideable

  andybak

  committed
  3bcfd28

• Minor changes

  andybak

  committed
  c7cbd64

• Unbreak Google login

  andybak

  committed
  be018e2

• Redundant default param

  andybak

  committed
  292bce3

• Google login enum. Remove redundant code

  andybak

  committed
  7cc4890

• Fix monoscopic reticle bounds

  andybak

  committed
  bcd668e

• Remove formerly serialized attributes

  andybak

  committed
  45557e7

• Allow breaking apart on icosa models

  andybak

  committed
  c26aeb3

• Fix error when breaking up icosa models

  andybak

  committed
  8f85801

Commits on Jul 15, 2024

• Use "blocks" pseudo-format

  andybak

  committed
  35df610

• More room for title on sketchbook panel

  andybak

  committed
  88dc001

Commits on Jul 16, 2024

• Use edit_url from upload response instead of job id

  andybak

  committed
  b4c6fc4

Commits on Aug 5, 2024

• Remove out of date comment

  andybak

  committed
  7fab9b2

Commits on Aug 15, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  andybak

  committed
  8228ffd

Commits on Sep 11, 2024

• Merge branch 'main' into feature/icosa-integration

  andybak

  committed
  4e3b80a

Commits on Sep 12, 2024

• Icosa panel shouldn't begin fixed

  andybak

  committed
  a8eab36

• Renable poly button and rename to Icosa

  andybak

  committed
  68c819d

• Disable m_UseLocalFeaturedSketches in the asset catalog

  andybak

  committed
  2e83abc

• Curated also requiresIcosa now. Remove duplicate code.

  andybak

  committed
  e9c01c0

• Add a comment

  andybak

  committed
  a862b99

• We now have assetId directly in the api results

  andybak

  committed
  1032622

• Better logging

  andybak

  committed
  698ea97

• Remove some logging noise

  andybak

  committed
  be6f11e

• Update a comment

  andybak

  committed
  426a05d

• Some code prepping for dynamic switching between online/offline features sketches

  andybak

  committed
  33b5394

• We now have assetid available

  andybak

  committed
  67ff241

• Handle missing thumbnails better

  andybak

  committed
  ade568e

• No need to check GoogleIdentity here

  andybak

  committed
  ccfd9d3

• Make user models panel the default

  andybak

  committed
  4ab872d

• Disable m_InternetError as well before figuring out general panel visibility (for consistency)

  andybak

  committed
  a7c7434

• Remove debug log

  andybak

  committed
  41a7ef4

Commits on Sep 14, 2024

• Tweak default lister params

  andybak

  committed
  653e3a6

• Limit the number of pages we retrieve

  andybak

  committed
  97c5097

• Not sure what changed the main scene

  andybak

  committed
  ac0121e

• Avoid errors when author is missing

  andybak

  committed
  0f89153

Commits on Sep 15, 2024

• Log a warning if we can't find a GLTF2

  andybak

  committed
  193bb31

• Sort featured sketches by "best"

  andybak

  committed
  60e864c

Commits on Sep 25, 2024

• Update packages-lock.json

  andybak

  committed
  cb24340

• Comment

  andybak

  committed
  f0b4547

• Comment

  andybak

  committed
  08bb3d4

Commits on Nov 13, 2024

• Fix: authorname not displayname

  andybak

  committed
  a051f12

• Add some TODOs and commented-out wip code

  andybak

  committed
  430e328

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  Show description for 26da063
  andybak

  committed
  26da063

• Use correct API url

  andybak

  committed
  e7d846b

Commits on Nov 19, 2024

• More fixes for non-runtime gltf export

  andybak

  committed
  fb66e70

Commits on Nov 23, 2024

• Switch back to Openxr

  andybak

  committed
  7c3a217

• Revert "Switch back to Openxr"

  Show description for 04c3ebf
  andybak

  committed
  04c3ebf

• Switch back to Openxr

  andybak

  committed
  e479c83

Commits on Nov 26, 2024

• initial fix: enable unpacking GLTF models multiple levels

  Show description for 547affb
  eeropomell

  committed
  547affb

Commits on Dec 1, 2024

• optimize a method in BreakModelApartCommand

  Show description for ef18b58
  eeropomell

  committed
  ef18b58

Commits on Dec 2, 2024

• We should include extras in all GLTF exports

  andybak

  committed
  a02b0ba

• Merge remote-tracking branch 'eeropomell/fix/gltf-import-unpack-objects' into feature/icosa-integration

  andybak

  committed
  3c73383

Commits on Dec 5, 2024

• Merge remote-tracking branch 'origin/main' into feature/icosa-integration

  andybak

  committed
  64ad82a

Commits on Dec 6, 2024

• Rider package update

  andybak

  committed
  fbe5aa8

• License filter works now.

  andybak

  committed
  fb3ace5

• Remove old comment

  andybak

  committed
  3564933

• Accept GLTF2

  andybak

  committed
  5aa6a9f

• add clarifying comments to ModelWidget

  eeropomell

  committed
  6af1917

• add initial version for a map from unique id to each node in a Model

  eeropomell

  committed
  ad3fa0d

• switch from default string concat to StringBuilder as it's faster

  eeropomell

  committed
  5de976f

• remove unnecessary using directive

  eeropomell

  committed
  a14492b

Commits on Dec 7, 2024

• [CI BUILD DEV] [CI BUILD]

  eeropomell

  committed
  219270c

• add profile markers for profiling Model.cs

  Show description for d8aa0c7
  eeropomell

  committed
  d8aa0c7

Commits on Dec 8, 2024

• Simplify unique node name generation logic

  Show description for ea48923
  eeropomell

  committed
  ea48923

• apply code formatting

  eeropomell

  committed
  0d2e987

• Update UnityGLTF

  andybak

  committed
  274a6a3

• Very basic support for importing files with multiple resources via the API.

  andybak

  committed
  ae83bff

Commits on Dec 9, 2024

• [CI BUILD]

  andybak

  committed
  e344cce

• Log UnityGLTF exceptions when falling back to legacy

  Show description for 76d9082
  andybak

  committed
  76d9082

• Quick test to see if hashes in the file path are the cause of the bug in the build

  Show description for b23622d
  andybak

  committed
  b23622d

Commits on Dec 10, 2024

• Remove # from the productName, if set (affects save path)

  mikeage

  committed
  8e73b80

• Remove # from the 'description'

  mikeage

  committed
  226f3a5

• Revert "Quick test to see if hashes in the file path are the cause of the bug in the build"

  Show description for 2c0e55f
  andybak

  committed
  2c0e55f

• Merge remote-tracking branch 'mikeage/rename_pr_build' into feature/icosa-integration

  andybak

  committed
  f7c91b8

• Undo formatting changes

  andybak

  committed
  7ac28f7

• fix a mistaken formatting fix

  andybak

  committed
  c944cab

Commits on Dec 13, 2024

• Merge branch 'fix/modelwidget-subtree-string-handling' into feature/icosa-integration

  andybak

  committed
  c228c1a