Skip to content

Commit 31576e6

Browse files
committed
feat: merge avatar systems into sdk
1 parent 37e0d35 commit 31576e6

44 files changed

Lines changed: 12 additions & 127 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/scripts/unitypackagegen.sh

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ PACKAGES="Packages/org.basisvr.generator.equals-3.2.0.tgz:
77
Packages/org.basisvr.simplebase-4.0.2.tgz:
88
Packages/org.basisvr.bouncycastle-2.5.0.tgz"
99
SUBFOLDERS="Packages/com.basis.sdk:
10+
Packages/com.basis.openlipsync:
1011
Packages/UnityJigglePhysics-upm:
1112
Packages/com.basis.bundlemanagement:
1213
Packages/com.basis.server"
@@ -16,21 +17,14 @@ EXTRASUBFOLDER=""
1617
EXTRASUBFOLDERS=""
1718
MOREFILES=""
1819

19-
# Creator-side authoring packages
20-
CREATOR_SUBFOLDERS="Packages/com.basis.creator:
21-
Packages/com.basis.openlipsync:
22-
Packages/dev.hai-vr.basis.ndmf"
23-
2420

2521
if [[ "$1" == "full" ]]; then
2622

2723
echo "Producing FULL package"
2824

2925
PACKAGES+=":Packages/com.valvesoftware.unity.openvr-1.2.1.tgz"
3026

31-
SUBFOLDERS+=":${CREATOR_SUBFOLDERS}"
32-
33-
# Framework + client-only additions on top of the SDK + creator base.
27+
# Framework + client-only additions on top of the SDK base.
3428
SUBFOLDERS+=":Packages/com.avionblock.opussharp:
3529
Packages/com.basis.addon.snapcontrols:
3630
Packages/com.basis.common:
@@ -77,14 +71,8 @@ elif [[ "$1" == "sdk" ]]; then
7771
echo "Producing SDK package"
7872
# All things are already included.
7973

80-
elif [[ "$1" == "creator" ]]; then
81-
82-
echo "Producing CREATOR package"
83-
84-
SUBFOLDERS+=":${CREATOR_SUBFOLDERS}"
85-
8674
else
87-
echo "Only full, sdk, and creator targets are specified."
75+
echo "Only full and sdk targets are specified."
8876
exit 1
8977
fi
9078

.github/vpm-packages.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ com.basis.server
99
com.basis.framework
1010
com.basis.framework.editor
1111
com.basis.openlipsync
12-
com.basis.creator
1312
com.basis.common
1413
com.basis.eventdriver
1514
com.basis.profilerintergration

.github/workflows/compilation.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,6 @@ jobs:
353353
- name: "Produce SDK unitypackage."
354354
timeout-minutes: 5
355355
run: .github/scripts/unitypackagegen.sh sdk
356-
- name: "Produce Creator unitypackage."
357-
timeout-minutes: 5
358-
run: .github/scripts/unitypackagegen.sh creator
359356
- name: "Produce full unitypackage."
360357
timeout-minutes: 5
361358
run: .github/scripts/unitypackagegen.sh full
@@ -365,7 +362,6 @@ jobs:
365362
name: unitypackage_upload
366363
path: |
367364
Basis/Basis.sdk.unitypackage
368-
Basis/Basis.creator.unitypackage
369365
Basis/Basis.full.unitypackage
370366
- name: "Release unitypackage"
371367
if: github.ref_type == 'tag'
@@ -374,5 +370,4 @@ jobs:
374370
with:
375371
files: |
376372
Basis/Basis.sdk.unitypackage
377-
Basis/Basis.creator.unitypackage
378373
Basis/Basis.full.unitypackage

Basis/Packages/com.basis.creator/Basis Creator.asmdef

Lines changed: 0 additions & 19 deletions
This file was deleted.

Basis/Packages/com.basis.creator/Basis Creator.asmdef.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

Basis/Packages/com.basis.creator/Editor.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Basis/Packages/com.basis.creator/Editor/Basis Creator.Editor.asmdef

Lines changed: 0 additions & 21 deletions
This file was deleted.

Basis/Packages/com.basis.creator/Editor/Basis Creator.Editor.asmdef.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

Basis/Packages/com.basis.creator/package.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

Basis/Packages/com.basis.creator/package.json.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)