chore: restructure repository to put package at top-level (#477)

* chore: rearrange package structure to have the package at the root

* ci: update CI workflows

* ci: fixing workflow bugs

* ci: recurse building .zip package

* ci: more fixes

* ci: add back in the nadena.dev VPM repo

* ci: fix tests

.github/workflows/build-release.yml

@@ -6,6 +6,7 @@ on:
   push:
     branches:
       - main
+      - refactor-structure
     tags:
       - '**'
 
@@ -25,12 +26,12 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           repository: bdunderscore/modular-avatar-images
-          path: image-assets
+          path: .github/image-assets
       - name: Inject logo assets
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          cp -f image-assets/img/logo/ma_logo.png Packages/${{env.packageName}}/Editor/Images/logo.png
+          cp -f .github/image-assets/img/logo/ma_logo.png Editor/Images/logo.png
-          cp -f image-assets/img/logo/ma_icon.png Packages/${{env.packageName}}/Runtime/Icons/Icon_MA_Script.png
+          cp -f .github/image-assets/img/logo/ma_icon.png Runtime/Icons/Icon_MA_Script.png
 
       - name: Check semver syntax
         id: semver-check
@@ -47,7 +48,7 @@ jobs:
         id: version
         uses: notiz-dev/github-action-json-property@a5a9c668b16513c737c3e1f8956772c99c73f6e8
         with:
-          path: "Packages/${{env.packageName}}/package.json"
+          path: "package.json"
           prop_path: "version"
           
       - name: Check tag consistency
@@ -66,27 +67,14 @@ jobs:
           echo "unityPackage=${{ env.packageName }}-${{ steps.version.outputs.prop }}.unitypackage" >> $GITHUB_ENV
 
       - name: Create Zip
-        uses: thedoctor0/zip-release@a24011d8d445e4da5935a7e73c1f98e22a439464
+        run: |
-        with:
+          zip ".github/${{env.zipFile}}" ./* -r -x .github .git '.git/*' '*~/*' '*.ps1*'
-          type: "zip"
+          mv ".github/${{env.zipFile}}" "${{env.zipFile}}"
-          directory: "Packages/${{env.packageName}}/"
-          filename: "../../${{env.zipFile}}" # make the zip file two directories up, since we start two directories in above
 
       - uses: actions/upload-artifact@v3
         with:
           name: package-zip
           path: ${{ env.zipFile }}
-#
-#      - name: Create unitypackage
-#        uses: anatawa12/sh-actions/create-unitypackage@cf32b535acd8f4f05a0eb03e0851264122f98f62
-#        with:
-#          output-path: ${{ env.unityPackage }}
-#          package-path: Packages/${{ env.packageName }}
-#
-#      - uses: actions/upload-artifact@v3
-#        with:
-#          name: unitypackage
-#          path: ${{ env.unityPackage }}
 
       - name: Make Release
         uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844

.github/workflows/build-test-docs.yml

@@ -1,6 +1,9 @@
 name: Build documentation
 
 on:
+  push:
+    branches:
+      - refactor-structure
   pull_request:
   workflow_call:
     inputs:
@@ -39,7 +42,7 @@ jobs:
           path: modular-avatar-images
       - name: Install logo assets
         run: |
-          cp -Rv modular-avatar-images/img/* docs/static/img
+          cp -Rv modular-avatar-images/img/* docs~/static/img
           
       - name: Setup yarn 2.0
         run: |
@@ -48,7 +51,7 @@ jobs:
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "dir=$(cd docs; yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+        run: echo "dir=$(cd docs~; yarn config get cacheFolder)" >> $GITHUB_OUTPUT
     
       - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
@@ -61,24 +64,24 @@ jobs:
       - name: Set baseUri
         if: ${{ inputs.path }}
         run: |
-          BASEURL="/${{ inputs.path }}/" perl -i -p -e "s{baseUrl: '/'}{baseUrl: '\$ENV{BASEURL}'}" docs/docusaurus.config.js
+          BASEURL="/${{ inputs.path }}/" perl -i -p -e "s{baseUrl: '/'}{baseUrl: '\$ENV{BASEURL}'}" docs~/docusaurus.config.js
-          cat docs/docusaurus.config.js
+          cat docs~/docusaurus.config.js
 
       - name: Build docs
         run: |
-          cd docs
+          cd docs~
           yarn install --immutable
           yarn build
           ls -lR build
 
       - name: Set robots.txt
         run: |
-          if [ -e docs/robots.txt ]; then
+          if [ -e docs~/robots.txt ]; then
-            cp docs/robots.txt docs/build/robots.txt
+            cp docs~/robots.txt docs~/build/robots.txt
           fi
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
           name: ${{ inputs.artifact || 'docs' }}
-          path: docs/build
+          path: docs~/build

.github/workflows/gameci.yml

@@ -26,55 +26,157 @@ name: GameCI
 
 on:
   push:
-    branches: [master, dev, 000/plugin]
+    branches: [main, dev, ci, refactor-structure]
   # This is a bit of a radioactive event; we need to be very careful with what permissions
   # we assign this action, as we're allowing arbitrary code execution with the context of
   # whatever permissions we assign.
-  pull_request_target:
+  pull_request_target: {}
-    paths:
-      - 'Packages/**'
-      - 'Assets/**'
-      - 'ProjectSettings/**'
-      - '.github/workflows/gameci.yml'
   workflow_dispatch: {}
+  workflow_call:
+    secrets:
+      UNITY_LICENSE:
+        required: true
 
 # pull_request_target grants access to a privileged GITHUB_TOKEN by default, revoke this
-permissions:
+permissions: {}
-  contents: read
-  checks: write
 
 jobs:
   build-and-test:
+    name: Unit tests
+    strategy:
+      matrix:
+        unity_version: [ auto ]
+        sdk: [ vrcsdk ]
     runs-on: ubuntu-latest
     permissions:
       checks: write
+      contents: read
     steps:
-      - uses: actions/checkout@v4
+      - id: setup
+        name: Setup
+        env:
+          unity_version: ${{ matrix.unity_version }}
+          sdk: ${{ matrix.sdk }}
+        run: |
+          set -x
+          
+          sudo apt-get install xmlstarlet -y
+          
+          should_test=true
+          if [ $sdk == vrcsdk ] && [ $unity_version != auto ]; then
+            should_test=false
+          fi
+          echo should_test=$should_test >> $GITHUB_OUTPUT
+          
+          can_fail=false
+          if [ $sdk == standalone ] || [ $unity_version != auto ]; then
+            can_fail=$should_test
+          fi
+          echo can_fail=$can_fail >> $GITHUB_OUTPUT
+          
+          if $can_fail; then
+            check_name="Unsupported test result ($unity_version, $sdk)"
+          else
+            check_name="Test result ($unity_version, $sdk)"
+          fi
+          echo check_name=$check_name >> $GITHUB_OUTPUT
+
+      - uses: actions/checkout@v3
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
         with:
           ref: ${{ github.event.pull_request.head.sha }}
+
+      - id: prepare-project
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        name: Prepare project
+        run: |
+          mkdir .github/ProjectRoot/Packages/nadena.dev.modular-avatar -p
+          mv * .github/ProjectRoot/Packages/nadena.dev.modular-avatar
+          mv .github/ProjectRoot/* .
+          mv 'Packages/nadena.dev.modular-avatar/UnitTests~' 'Packages/nadena.dev.modular-avatar/UnitTests'
+          for i in packages-lock manifest; do
+            if [ -e "$i-${{ matrix.unity_version }}.json" ]; then
+              mv "$i-${{ matrix.unity_version }}.json" Packages/$i.json -v
+            fi
+          done
+
       - uses: anatawa12/sh-actions/resolve-vpm-packages@master
+        name: Resolve VPM packages
+        if: ${{ matrix.sdk == 'vrcsdk' && steps.setup.outputs.should_test == 'true' }}
         with:
           repos: |
             https://vpm.nadena.dev/vpm-prerelease.json
 
+      - if: ${{ steps.setup.outputs.should_test == 'true' }}
+        name: "Debug: List project contents"
+        run: |
+          ls -lR
+          ls -lR Packages/nadena*
+
+      - uses: actions/cache@v3
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        with:
+          path: Library
+          key: Library-${{ matrix.unity_version }}-${{ matrix.sdk }}
+          restore-keys: Library-
+
       - uses: game-ci/unity-test-runner@v3
         id: gameci
+        continue-on-error: ${{ steps.setup.outputs.can_fail == 'true' }}
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
         env:
           # meh, just a personal license...
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
         with:
           testMode: EditMode
+          unityVersion: ${{ matrix.unity_version }}
           githubToken: ${{ github.token }}
           coverageOptions: generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:+nadena.dev.*
           customParameters: -nographics -assemblyNames Tests
+          checkName: ${{ steps.setup.outputs.check_name }}
+
+      # For our main "supported" platforms, we report the conclusion of gameci as-is. However, for standalone, we report
+      # neutral if it failed.
+      - id: determine_conclusion
+        name: Determine conclusion
+        if: ${{ steps.setup.outputs.should_test == 'true' }}
+        env:
+          unity_version: ${{ matrix.unity_version }}
+          sdk_platform: ${{ matrix.sdk }}
+          gameci_outcome: ${{ steps.gameci.outcome }}
+          can_fail: ${{ steps.setup.outputs.can_fail }}
+        run: |
+          set -x
+          outcome=$gameci_outcome          
+          
+          # Check whether any tests actually ran
+          test_count=$(
+              if ! cat ${{ steps.gameci.outputs.artifactsPath }}/editmode-results.xml | \
+                    xmlstarlet sel -t -v "/test-run/@total"; then
+                echo 0
+              fi
+          )
+          
+          if [ $test_count -eq 0 ] || [ x$test_count == x ]; then
+            outcome=failure
+            output="{ \"summary\": \"No tests ran\" }"
+          
+            if ! $can_fail; then
+              exit 1
+            fi
+          else
+            output="{ \"summary\": \"Result: $outcome ($test_count tests)\" }"
+          fi
+          
+          if [ "$outcome" == "failure" ] && $can_fail; then
+            outcome=neutral
+          fi
+          echo matrix_outcome=$outcome >> $GITHUB_OUTPUT
+          echo matrix_output=$output >> $GITHUB_OUTPUT
 
       - uses: actions/upload-artifact@v3
-        if: always()
+        if: ${{ steps.setup.outputs.should_test == 'true' && matrix.sdk == 'vrcsdk' && matrix.unity_version == 'auto' }}
+        continue-on-error: true
         with:
-          name: Test results
+          name: Coverage results ${{ matrix.unity_version }} ${{ matrix.sdk }}
-          path: ${{ steps.gameci.outputs.artifactsPath }}
+          path: ${{ steps.gameci.outputs.coveragePath }}
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: Coverage results
-          path: ${{ steps.gameci.outputs.coveragePath }}

.gitignore

@@ -1,87 +1,2 @@
-# This .gitignore file should be placed at the root of your Unity project directory
+UnitTests/
-#
+UnitTests.meta
-# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
-#
-/[Ll]ibrary/
-/[Tt]emp/
-/[Oo]bj/
-/[Bb]uild/
-/[Bb]uilds/
-/[Ll]ogs/
-/[Mm]emoryCaptures/
-
-# Asset meta data should only be ignored when the corresponding asset is also ignored
-!/[Aa]ssets/**/*.meta
-
-# Uncomment this line if you wish to ignore the asset store tools plugin
-# /[Aa]ssets/AssetStoreTools*
-
-# Autogenerated Jetbrains Rider plugin
-[Aa]ssets/Plugins/Editor/JetBrains*
-
-# Visual Studio cache directory
-.vs/
-
-# Gradle cache directory
-.gradle/
-
-# Autogenerated VS/MD/Consulo solution and project files
-ExportedObj/
-.consulo/
-*.csproj
-*.unityproj
-*.sln
-*.suo
-*.tmp
-*.user
-*.userprefs
-*.pidb
-*.booproj
-*.svd
-*.pdb
-*.mdb
-*.opendb
-*.VC.db
-
-# Unity3D generated meta files
-*.pidb.meta
-*.pdb.meta
-*.mdb.meta
-
-# Unity3D generated file on crash reports
-sysinfo.txt
-
-# Builds
-*.apk
-*.unitypackage
-
-# Crashlytics generated file
-crashlytics-build.properties
-
-/UpstreamAssets/
-/.idea/
-
-/Assets/**/*
-
-!/Assets/.gitkeep
-!/Assets/bd_/
-!/Assets/bd_/ModularAvatar/
-!/Assets/bd_/ModularAvatar/.gitkeep
-!/Assets/bd_/ModularAvatar.meta
-!/Assets/bd_.meta
-
-!/Assets/_ModularAvatar.meta
-!/Assets/_ModularAvatar/
-!/Assets/_ModularAvatar/*
-!/Assets/_ModularAvatar/**/*
-
-!/Assets/bd_/ModularAvatar/DevAssets/
-!/Assets/bd_/ModularAvatar/DevAssets/**/*
-
-![Mm]odular[Aa]vatar.meta
-
-Thry
-
-CodeCoverage
-CodeCoverage/*
-

Assets/_ModularAvatar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c5a2bf598635bd4458c4e1ebb1ab1d79
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_ModularAvatar/EditModeTests.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 9d2706d17a5b8ff44b56c779d2bbc439
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: eb865851469d79449b620cadca09b347
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: db7df6396e094e70915707972b534fa3
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/RootAnimation.anim

@@ -1,134 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RootAnimation
-  serializedVersion: 6
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves: []
-  m_FloatCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 0.5
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: RootAnimationTest
-    classID: 1
-    script: {fileID: 0}
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 0
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings:
-    - serializedVersion: 2
-      path: 1348953117
-      attribute: 2086281974
-      script: {fileID: 0}
-      typeID: 1
-      customType: 0
-      isPPtrCurve: 0
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 1
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 0.5
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: RootAnimationTest
-    classID: 1
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_Events: []

Assets/bd_/ModularAvatar/DevAssets/RootAnimation.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8bc4d5b9506611c45a7d9215f59bb94f
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/RootAnimationTest.controller

@@ -1,72 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-1125248755811767262
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RootAnimation
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 8bc4d5b9506611c45a7d9215f59bb94f, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RootAnimationTest
-  serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: rootAnimTest
-    m_StateMachine: {fileID: 3050413205761934622}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1107 &3050413205761934622
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: rootAnimTest
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: -1125248755811767262}
-    m_Position: {x: 315.1202, y: 53.004517, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -1125248755811767262}

Assets/bd_/ModularAvatar/DevAssets/RootAnimationTest.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0e369712684366046b73117734386e5b
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/RootAnimationTest.prefab

@@ -1,98 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &4470255446025870319
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4470255446025870316}
-  - component: {fileID: 4470255446025870315}
-  - component: {fileID: 4470255446025870314}
-  - component: {fileID: 4470255446025870317}
-  m_Layer: 0
-  m_Name: RootAnimationTest
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4470255446025870316
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4470255446025870319}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.144, z: 0.612}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4470255446025870315
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4470255446025870319}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4470255446025870314
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4470255446025870319}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!114 &4470255446025870317
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4470255446025870319}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1bb122659f724ebf85fe095ac02dc339, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  animator: {fileID: 9100000, guid: 0e369712684366046b73117734386e5b, type: 2}
-  layerType: 5
-  deleteAttachedAnimator: 1
-  pathMode: 1

Assets/bd_/ModularAvatar/DevAssets/RootAnimationTest.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9c01879223045064db024459ebe72513
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/SelfAnim.anim

@@ -1,134 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!74 &7400000
-AnimationClip:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: SelfAnim
-  serializedVersion: 6
-  m_Legacy: 0
-  m_Compressed: 0
-  m_UseHighQualityCurve: 1
-  m_RotationCurves: []
-  m_CompressedRotationCurves: []
-  m_EulerCurves: []
-  m_PositionCurves: []
-  m_ScaleCurves: []
-  m_FloatCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 0.5
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: 
-    classID: 1
-    script: {fileID: 0}
-  m_PPtrCurves: []
-  m_SampleRate: 60
-  m_WrapMode: 0
-  m_Bounds:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 0, y: 0, z: 0}
-  m_ClipBindingConstant:
-    genericBindings:
-    - serializedVersion: 2
-      path: 0
-      attribute: 2086281974
-      script: {fileID: 0}
-      typeID: 1
-      customType: 0
-      isPPtrCurve: 0
-    pptrCurveMapping: []
-  m_AnimationClipSettings:
-    serializedVersion: 2
-    m_AdditiveReferencePoseClip: {fileID: 0}
-    m_AdditiveReferencePoseTime: 0
-    m_StartTime: 0
-    m_StopTime: 1
-    m_OrientationOffsetY: 0
-    m_Level: 0
-    m_CycleOffset: 0
-    m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
-    m_LoopBlend: 0
-    m_LoopBlendOrientation: 0
-    m_LoopBlendPositionY: 0
-    m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
-    m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
-    m_Mirror: 0
-  m_EditorCurves:
-  - curve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 0.5
-        value: 0
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: Infinity
-        outSlope: Infinity
-        tangentMode: 103
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    attribute: m_IsActive
-    path: 
-    classID: 1
-    script: {fileID: 0}
-  m_EulerEditorCurves: []
-  m_HasGenericRootTransform: 0
-  m_HasMotionFloatCurves: 0
-  m_Events: []

Assets/bd_/ModularAvatar/DevAssets/SelfAnim.anim.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8299508f042df3649b83f6443d4ed041
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 7400000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/SelfAnimTest.controller

@@ -1,72 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-1125248755811767262
-AnimatorState:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: selfAnim
-  m_Speed: 1
-  m_CycleOffset: 0
-  m_Transitions: []
-  m_StateMachineBehaviours: []
-  m_Position: {x: 50, y: 50, z: 0}
-  m_IKOnFeet: 0
-  m_WriteDefaultValues: 1
-  m_Mirror: 0
-  m_SpeedParameterActive: 0
-  m_MirrorParameterActive: 0
-  m_CycleOffsetParameterActive: 0
-  m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 8299508f042df3649b83f6443d4ed041, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
---- !u!91 &9100000
-AnimatorController:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: SelfAnimTest
-  serializedVersion: 5
-  m_AnimatorParameters: []
-  m_AnimatorLayers:
-  - serializedVersion: 5
-    m_Name: selfAnimTest
-    m_StateMachine: {fileID: 3050413205761934622}
-    m_Mask: {fileID: 0}
-    m_Motions: []
-    m_Behaviours: []
-    m_BlendingMode: 0
-    m_SyncedLayerIndex: -1
-    m_DefaultWeight: 0
-    m_IKPass: 0
-    m_SyncedLayerAffectsTiming: 0
-    m_Controller: {fileID: 9100000}
---- !u!1107 &3050413205761934622
-AnimatorStateMachine:
-  serializedVersion: 6
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: selfAnimTest
-  m_ChildStates:
-  - serializedVersion: 1
-    m_State: {fileID: -1125248755811767262}
-    m_Position: {x: 315.1202, y: 53.004517, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 50, y: 120, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
-  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: -1125248755811767262}

Assets/bd_/ModularAvatar/DevAssets/SelfAnimTest.controller.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1880cdff996ddec488ba62db1359a277
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 9100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/bd_/ModularAvatar/DevAssets/SelfAnimationTest.prefab

@@ -1,98 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &3749365485163865256
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3749365485163865259}
-  - component: {fileID: 3749365485163865260}
-  - component: {fileID: 3749365485163865261}
-  - component: {fileID: 3749365485163865258}
-  m_Layer: 0
-  m_Name: SelfAnimationTest
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3749365485163865259
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3749365485163865256}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.144, z: 0.612}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3749365485163865260
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3749365485163865256}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &3749365485163865261
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3749365485163865256}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
---- !u!114 &3749365485163865258
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3749365485163865256}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1bb122659f724ebf85fe095ac02dc339, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  animator: {fileID: 9100000, guid: 1880cdff996ddec488ba62db1359a277, type: 2}
-  layerType: 5
-  deleteAttachedAnimator: 1
-  pathMode: 0

Assets/bd_/ModularAvatar/DevAssets/SelfAnimationTest.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 85d821cb93b756544901b5c7368965ed
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

COPYING.md

@@ -1,12 +1,9 @@
-Source code is licensed under the MIT license, as reproduced below, with some exceptions:
+Files under Editor/images are licensed for redistribution as part of an official
+modular avatar package only. Please replace them with other images (or delete them)
+if you are making modifications.
+
+All other files are under the MIT license.
 
-* Packages/com.vrchat.core.vpm-resolver is distributed under the VRChat Distro license.
-  See [the associated License.md file](Packages/com.vrchat.core.vpm-resolver/License.md) for details.
-* Images under docs/static/img/irasutoya are Copyrighted by, and/or a derivative work of works copyrighted by
-  いらすとや (irasutoya.com). See [their license page](https://www.irasutoya.com/p/terms.html) for license details.
-* The github source code distribution contains placeholder logo assets. The
-  [actual logo assets](https://github.com/bdunderscore/modular-avatar-images) are Copyright (c) Pumo,
-  and for use as part of packaged official modular avatar distributions only.
 ---
 
 MIT License
@@ -29,4 +26,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.