Skip to content

Release 2.0.0 #231

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.

Sign up for GitHub

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

Merged
merged 21 commits into from
Dec 21, 2020
Merged

Release 2.0.0 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
633a0d8
Merge branch 'dev'
mfe Jul 26, 2019
29bef55
Merge branch 'dev'
mfe Jul 26, 2019
a3fec00
Merge branch 'dev'
lucillecaillaud Nov 6, 2019
3155c83
Merge pull request #150 from Unity-Technologies/dev
judubu Jan 15, 2020
b28f0fe
Merge pull request #151 from Unity-Technologies/dev
judubu Jan 16, 2020
da2ddb5
Merge pull request #162 from Unity-Technologies/dev
judubu Apr 2, 2020
8d9ffd0
[HOTFIX] Fix game object hierarchy when loading as GameObject
judubu Apr 9, 2020
fde5076
Rename master to stable in yamato scripts
judubu Apr 9, 2020
7407d5f
[HOTFIX] Fix game object hierarchy when loading as GameObject
judubu Apr 9, 2020
b26fdad
Udate version in package.json and bump minimum unity version
judubu Apr 23, 2020
cf0975e
Merge pull request #166 from Unity-Technologies/release_1.0.3
judubu Apr 23, 2020
711a72d
Udate changelog for 1.0.3-preview.2
judubu Apr 24, 2020
76825f0
UPM-CI: update registry path from bintray to artifactory
judubu Apr 30, 2020
6ec2e51
Merge pull request #177 from Unity-Technologies/release_1.0.3
judubu May 1, 2020
dfe654f
Update changelog with new version number and release date
judubu Dec 17, 2020
a5489fa
Merge branch 'stable' into release_2.0.0
judubu Dec 18, 2020
558af88
Fix name generation of exported in memory textures
judubu Dec 18, 2020
319aae3
Move yamato pack job to win10 vm
judubu Dec 18, 2020
051117a
Fix post build action on Win and Linux
judubu Dec 18, 2020
bd076a7
Add post build action on OSX
judubu Dec 18, 2020
5d4e629
Remove legacy package-manager-ui package from TestProject
judubu Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/promotion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ promotion_fetch:
variables:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path package/com.unity.formats.usd
artifacts:
packages:
Expand All @@ -37,7 +37,7 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
variables:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package test --unity-version {{ editor.version }} --package-path package/com.unity.formats.usd
artifacts:
logs:
Expand Down Expand Up @@ -66,7 +66,7 @@ promote:
variables:
UPMCI_PROMOTION: 1
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package promote --package-path package/com.unity.formats.usd
triggers:
tags:
Expand Down
13 changes: 6 additions & 7 deletions .yamato/upm-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ test_platforms:
pack:
name: Pack
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.small
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path package/com.unity.formats.usd
artifacts:
packages:
Expand All @@ -35,7 +35,7 @@ test_{{ platform.name }}_{{ editor.version }}:
image: {{ platform.image }}
flavor: {{ platform.flavor}}
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package test --unity-version {{ editor.version }} --package-path package/com.unity.formats.usd
--enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateHtmlReport'
artifacts:
Expand All @@ -47,7 +47,6 @@ test_{{ platform.name }}_{{ editor.version }}:
{% endfor %}
{% endfor %}


test_trigger:
name: Tests Trigger
triggers:
Expand Down Expand Up @@ -88,7 +87,7 @@ run_preview_verified_staging:
flavor: b1.large
name: Runner
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- npm install upm-ci-utils@latest -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package publish --package-path package/com.unity.formats.usd
triggers:
tags:
Expand Down
1 change: 0 additions & 1 deletion TestProject/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"com.unity.analytics": "3.3.5",
"com.unity.ext.nunit": "1.0.0",
"com.unity.formats.usd": "file:../../package/com.unity.formats.usd/",
"com.unity.package-manager-ui": "2.0.3",
"com.unity.test-framework": "1.1.11",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion package/com.unity.formats.usd/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changes in usd-unitysdk for Unity

## [Unreleased] - 2020-10-27
## [2.0.0-exp.1] - 2020-12-21
### Features
- Updated USD version to v20.08
- Set material name in Unity to match the material name in the USD file on import (#174).
Expand Down
21 changes: 11 additions & 10 deletions package/com.unity.formats.usd/Editor/Scripts/UsdBuildPostProcess.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,23 @@ public class UsdBuildPostProcess
public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
{
var source = System.IO.Path.GetFullPath("Packages/com.unity.formats.usd/Runtime/Plugins");
var destination = "";
if (target == BuildTarget.StandaloneLinux64)
{
var destination = pathToBuiltProject.Replace(".x86_64", "_Data/Plugins");

// We need to copy the whole share folder and this one plugInfo.json file
FileUtil.CopyFileOrDirectory(source + "/x86_64/share", destination + "/share");
FileUtil.CopyFileOrDirectory(source + "/x86_64/plugInfo.json", destination + "/plugInfo.json");
destination = pathToBuiltProject.Replace(".x86_64", "_Data/Plugins");
}
else if(target == BuildTarget.StandaloneOSX)
{
destination = pathToBuiltProject + "/Contents/Plugins";
}
else if (target == BuildTarget.StandaloneWindows64)
{
var destination = pathToBuiltProject.Replace(".exe", "_Data/Plugins");

// We need to copy the whole share folder and this one plugInfo.json file
FileUtil.CopyFileOrDirectory(source + "/x86_64/share", destination + "/share");
FileUtil.CopyFileOrDirectory(source + "/x86_64/plugInfo.json", destination + "/plugInfo.json");
destination = pathToBuiltProject.Replace(".exe", "_Data/Plugins");
}

// We need to copy the whole share folder and this one plugInfo.json file
FileUtil.CopyFileOrDirectory(source + "/x86_64/usd", destination + "/usd");
FileUtil.CopyFileOrDirectory(source + "/x86_64/plugInfo.json", destination + "/plugInfo.json");
}
}
}
4 changes: 4 additions & 0 deletions package/com.unity.formats.usd/Runtime/Scripts/IO/Materials/ShaderExporterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,14 @@ protected static string SetupTexture(Scene scene,
// in each of them that might look different between exports.
// TODO Future work could, if necessary, generate a texture content hash to avoid exporting identical textures multiple times
// (Unity's content hash isn't reliable for some types of textures unfortunately, e.g. RTs)
#if UNITY_EDITOR
if (srcTexture2d is Texture2D)
fileName = srcTexture2d.name + "_" + srcTexture2d.imageContentsHash.ToString();
else
fileName = srcTexture2d.name + "_" + Random.Range(10000000, 99999999).ToString();
#else
fileName = srcTexture2d.name + "_" + Random.Range(10000000, 99999999).ToString();
#endif
filePath = System.IO.Path.Combine(destTexturePath, fileName + ".png");

// TODO extra care has to be taken of Normal Maps etc., since these are in a converted format in memory (for example 16 bit AG instead of 8 bit RGBA, depending on platform)
Expand Down