Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean and optimize assets #39

Merged
merged 26 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0405896
INTG-2137 add automation test
Juniverse Dec 13, 2024
fc870ec
update yaml
Juniverse Dec 13, 2024
0459b3c
update yml and gitignore
Juniverse Dec 13, 2024
eb7a153
update yml and secrets
Juniverse Dec 13, 2024
0fcff1e
update built version
Juniverse Dec 13, 2024
758f128
update build path
Juniverse Dec 13, 2024
f4ad07b
INTG-2278 Optimize materials and textures
Juniverse Dec 16, 2024
a661144
INTG-2185 INTG-2306 Update shaders for Angel Innequin
Juniverse Dec 18, 2024
c029175
INTG-2185 INTG-2306 Update shaders for Demon Innequni
Juniverse Dec 18, 2024
0683d5e
INTG-2185 INTG-2311 INTG-2307 Optimize some models. Delete fbx replac…
Juniverse Dec 18, 2024
11e9947
update submodule
Juniverse Dec 18, 2024
efdf20a
Remove huge ground
Juniverse Dec 18, 2024
8be0248
INTG-2307 INTG-2185 Finish until Objects
Juniverse Dec 19, 2024
cac1781
INTG-2308 INTG-2185 Update until Structures
Juniverse Dec 19, 2024
d05fc73
INTG-2309 INTG-2185 Upgrade until toys
Juniverse Dec 19, 2024
2186a86
INTG-2311 Finish until toys
Juniverse Dec 19, 2024
9e8279d
Add scene change to apply mesh
Juniverse Dec 19, 2024
451d2d5
Update README
Juniverse Dec 19, 2024
2b80568
INTG-2311 Optimize models until Objects
Juniverse Dec 19, 2024
0f71a96
INTG-2311 Removed fbx to pure mesh
Juniverse Dec 19, 2024
c669188
Fix building middle
Juniverse Dec 19, 2024
2f49a2d
INTG-2310 RTGI for Lobby
Juniverse Dec 19, 2024
355c666
INTG-2310 Use realtime GI
Juniverse Dec 19, 2024
fd43498
Remove duplicated import/export checking
Juniverse Dec 20, 2024
72fad0e
Resolve comment
Juniverse Dec 23, 2024
dce04ca
Resolve comments
Juniverse Dec 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
56 changes: 56 additions & 0 deletions .github/workflows/BuildAllWorkflows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@

name: BuildAllPlatforms

on:
workflow_dispatch:
pull_request:
branches: [main]

env:
UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}

jobs:
buildForAllSupportedPlatforms:
name: Build for ${{ matrix.targetPlatform }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
targetPlatform:
- StandaloneOSX # Build a macOS standalone (Intel 64-bit).
- StandaloneWindows # Build a Windows standalone.
- StandaloneWindows64 # Build a Windows 64-bit standalone.

steps:
- name: Checkout Repo
uses: actions/checkout@v4
with:
lfs: true

- name: Cleanup before build
run: |
docker system prune -af
docker volume prune -f

- name: Import SDK
run: |
python importSDK.py

- name: Cache Library
uses: actions/cache@v3
with:
path: Library
key: Library-${{ matrix.targetPlatform }}
restore-keys: Library-

- name: Build Test
uses: game-ci/unity-builder@v4
with:
buildMethod: Inworld.Playground.PlaygroundExporter.BuildPlaygroundScene
unityVersion: 6000.0.25f1
targetPlatform: ${{ matrix.targetPlatform }}



32 changes: 32 additions & 0 deletions .github/workflows/header-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# /*************************************************************************************************
# * Copyright 2022-2024 Theai, Inc. dba Inworld AI
# *
# * Use of this source code is governed by the Inworld.ai Software Development Kit License Agreement
# * that can be found in the LICENSE.md file or at https://www.inworld.ai/sdk-license
# *************************************************************************************************/

name: Check license header

on:
pull_request:
branches: [main]

jobs:
##approved:
## if: github.event.review.state == 'approved'
## runs-on: ubuntu-latest
## steps:
## - run: echo "This PR was approved"

check_header:
##needs: [approved]
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check License Header
uses: apache/[email protected]
with:
mode: check
29 changes: 15 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,20 @@ PlaygroundAssetNames.csv
PlaygroundAssetNames.csv.meta

# Inworld SDK Related Files
/SDK/
/Assets/Inworld.meta
/Assets/Inworld/Editor.meta
/Assets/Inworld/Editor/
/Assets/Inworld/Inworld.Assets.meta
/Assets/Inworld/Inworld.Assets/
/Assets/Inworld/Inworld.Editor.meta
/Assets/Inworld/Inworld.Editor/
/Assets/Inworld/Inworld.Native.meta
/Assets/Inworld/Inworld.Native/
/Assets/Inworld/Inworld.Samples.Innequin.meta
/Assets/Inworld/Inworld.Samples.Innequin/
/Assets/Inworld/Inworld.Samples.RPM.meta
/Assets/Inworld/Inworld.Samples.RPM/
SDK/
Assets/Inworld.meta
Assets/Inworld/Editor.meta
Assets/Inworld/Editor/
Assets/Inworld/Inworld.Assets.meta
Assets/Inworld/Inworld.Assets/
Assets/Inworld/Inworld.Editor.meta
Assets/Inworld/Inworld.Editor/
Assets/Inworld/Inworld.Native.meta
Assets/Inworld/Inworld.Native/
Assets/Inworld/Inworld.Samples.Innequin.meta
Assets/Inworld/Inworld.Samples.Innequin/
Assets/Inworld/Inworld.Samples.RPM.meta
Assets/Inworld/Inworld.Samples.RPM/
Assets/Inworld/Inworld.Playground.meta
Juniverse marked this conversation as resolved.
Show resolved Hide resolved
Assets/Inworld/*.tgz
Assets/Inworld/*.tgz.meta
168 changes: 168 additions & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
header:
license:
spdx-id: Inworld
copyright-owner: Theai, Inc. (DBA Inworld)
content : |
/*************************************************************************************************
* Copyright 2022-2024 Theai, Inc. dba Inworld AI
*
* Use of this source code is governed by the Inworld.ai Software Development Kit License Agreement
* that can be found in the LICENSE.md file or at https://www.inworld.ai/sdk-license
*************************************************************************************************/

paths-ignore:
- '.github/ISSUE_TEMPLATE'
- '.github/PULL_REQUEST_TEMPLATE'
- '**/.gitignore'
- '.gitmodules'
- '.gitattributes'
- '.lift'
- '.mvn'
- 'apm-protocol/apm-network/src/main/proto/.gitignore'
- 'codeStyle.xml'
- 'docker/.env'
- 'dist'
- 'licenses'
- 'dist-material/release-docs'
- '**/*.py'
- '**/*.FBX'
- '**/*.fbx'
- '**/*.png'
- '**/*.exr'
- '**/*.tga'
- '**/*.glb'
- '**/*.md'
- '**/*.json'
- '**/*.ftl'
- '**/target/**'
- '**/*.iml'
- '**/*.ini'
- '**/*.crt'
- '**/*.pem'
- 'LICENSE'
- 'NOTICE'
- 'skywalking-ui/dist'
- 'skywalking-ui/node_modules'
- 'skywalking-ui/node'
- 'skywalking-ui/.browserslistrc'
- 'skywalking-ui/.prettierrc'
- 'skywalking-ui/src/types/auto-imports.d.ts'
- 'skywalking-ui/src/types/components.d.ts'
- '**/src/main/fbs/istio/**'
- '**/src/main/proto/envoy/**'
- '**/src/main/proto/udpa/**'
- '**/src/main/proto/google/**'
- '**/src/main/proto/istio/**'
- '**/src/main/proto/jaeger/**'
- '**/src/main/proto/mixer/**'
- '**/src/main/proto/policy/**'
- '**/src/main/proto/prometheus/client_model/metrics.proto'
- '**/src/main/proto/protoc-gen-swagger/**'
- '**/src/main/proto/validate/validate.proto'
- '**/src/main/proto/opencensus/**'
- '**/src/main/proto/opentelemetry/**'
- 'oap-server/server-starter/src/main/resources/version.properties'
- '**/ThirdParty/**'
- '**/UnityWebSocket/**'
- '**/Packages/**'
- '**/ProjectSettings/**'
- '**/UserSettings/**'
- '**/*.anim'
- '**/*.meta'
- '**/*.asset'
- '**/*.unity'
- '**/*.prefab'
- '**/*.dwlt'
- '**/*.cginc'
- '**/*.mat'
- '**/*.lighting'
- '**/*.uxml'
- '**/*.xml'
- '**/*.asmdef'
- '**/*.mesh'
- '**/*.shadergraph'
- '**/*.ShaderGraph'
- '**/*.shader'
- '**/*.mask'
- '**/*.controller'
- '**/*.yaml'
- '**/*.yml'
- '**/*.config'
- '**/*.editorconfig'

comment: on-failure

dependency:
files:
- pom.xml
- skywalking-ui/package.json
excludes:
- name: org.openjdk.jmh:jmh-core # We don't distribute the dependencies, they are just for the build process
recursive: true
- name: org.apache.skywalking:* # Exclude self dependencies
licenses:
- name: org.slf4j:slf4j-api
version: 1.7.30,1.7.32
license: Apache-2.0
- name: com.squareup.okhttp3:okhttp
version: 3.14.9,3.12.2
license: Apache-2.0
- name: com.google.guava:listenablefuture
version: 9999.0-empty-to-avoid-conflict-with-guava
license: Apache-2.0
- name: io.swagger:swagger-annotations
version: 1.6.6
license: Apache-2.0
- name: com.squareup.okio:okio
version: 1.15.0,1.17.2
license: Apache-2.0
- name: com.squareup.retrofit2:retrofit
version: 2.3.0,2.5.0
license: Apache-2.0
- name: com.squareup.retrofit2:converter-jackson
version: 2.3.0,2.5.0
license: Apache-2.0
- name: com.fasterxml.jackson.module:jackson-module-kotlin
version: 2.13.4
license: Apache-2.0
- name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
version: 2.13.2
license: Apache-2.0
- name: com.graphql-java:graphql-java-extended-scalars
version: 18.1
license: MIT
- name: com.github.luben:zstd-jni
version: 1.4.3-1
license: BSD-2-Clause
- name: com.h2database:h2
version: 2.1.212
license: MPL-2.0
- name: org.antlr:antlr4-runtime
version: 4.9.2
license: BSD-3-Clause
- name: com.google.flatbuffers:flatbuffers-java
version: 1.12.0
license: Apache-2.0
- name: build.buf.protoc-gen-validate:pgv-java-stub
version: 0.6.13
license: Apache-2.0
- name: build.buf.protoc-gen-validate:protoc-gen-validate
version: 0.6.13
license: Apache-2.0
2 changes: 1 addition & 1 deletion Assets/Inworld.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public static class PlaygroundExporter
const string k_ExportPath = "Inworld.Playground";
static readonly string s_PlaygroundAssetPath = $"{k_FullPackagePath}/{k_ExportPath}/InworldPlaygroundAssets.unitypackage";
static readonly string s_PlaygroundPackagePath = $"{k_FullPackagePath}/InworldPlayground.unitypackage";
static readonly string s_PlayGroundScenePath = $"{k_FullPackagePath}/{k_ExportPath}/Scenes/Lobby.unity";
static readonly string s_PlayGroundScenePath = $"{k_FullPackagePath}/{k_ExportPath}/Runtime/Scenes/Lobby.unity";

[MenuItem("Inworld/Export Package/Playground/Playground Assets", false, 110)]
public static void ExportPlaygroundAssets()
Expand All @@ -40,7 +40,7 @@ public static void ExportPlaygroundPackage()
};
AssetDatabase.ExportPackage(assetPaths, s_PlaygroundPackagePath, ExportPackageOptions.Recurse);
}

// Used in Github Actions.
public static void BuildPlaygroundScene()
{
string[] scenes = { s_PlayGroundScenePath };
Expand Down
16 changes: 11 additions & 5 deletions Assets/Inworld/Inworld.Playground/Editor/PlaygroundImporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using UnityEditor.PackageManager.Requests;
using UnityEngine;


namespace Inworld.Playground
{
[InitializeOnLoad]
Expand All @@ -35,10 +36,15 @@ static PlaygroundImporter()
{
AssetDatabase.importPackageCompleted += name =>
{
if (name == k_PkgName)
CheckDependencies();
if (name == k_AssetPkgName)
Debug.Log($"{k_PkgName} installed.");
switch (name)
{
case k_PkgName:
CheckDependencies();
break;
case k_AssetPkgName:
Debug.Log($"{k_PkgName} installed.");
break;
}
};
}
[MenuItem("Inworld/Playground/Reinstall")]
Expand All @@ -50,7 +56,7 @@ public static async void CheckDependencies()
EditorUtility.DisplayDialog(k_ErrorTitle, k_UpgradeContent, "OK");
return;
}
ListRequest listRequest = UnityEditor.PackageManager.Client.List();
ListRequest listRequest = Client.List();

while (!listRequest.IsCompleted)
{
Expand Down
3 changes: 2 additions & 1 deletion Assets/Inworld/Inworld.Playground/Runtime/Materials/Day.mat
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _GroundColor: {r: 0.369, g: 0.349, b: 0.341, a: 1}
- _GroundColor: {r: 0.3764706, g: 0.4, b: 0.29411766, a: 1}
- _SkyTint: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
Loading
Loading