Skip to content

Commit

Permalink
Fix UPM package generation issues for UWP (KhronosGroup#406)
Browse files Browse the repository at this point in the history
* Include .asmdef files for correct UPM package generation

* Fix missing Integrations .meta file position

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Build script updates to properly support UWP with UPM compliant package

* Include .asmdef files for correct UPM package generation

* Fix missing Integrations .meta file position

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Build script updates to properly support UWP with UPM compliant package

* Fixing Travis build environment issues

* Include .asmdef files for correct UPM package generation

* Fix missing Integrations .meta file position

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Build script updates to properly support UWP with UPM compliant package

* Fixing Travis build environment issues

* Pull down upstream changes

* Fixing merge conflict

* Add Roughness float values to MetalRoughMap.cs

* Add names to textures created by GLTFSceneImporter

* Fix texture memory leak

* Add task cancellation support

* Add image name to texture name

* Update UnityGLTF/Assets/UnityGLTF/Scripts/Cache/RefCountedCacheData.cs

Co-Authored-By: rferrese <[email protected]>

* Change cancellation in ConstructMesh

* Camera in test scenes now moves only when dragged (mousedown) and the movement math is cleaner and more accurate, and zoom is now exponential instead of linear. (KhronosGroup#413)

Also clean up some warnings around unused variables.

* Fix loading time issue (KhronosGroup#414)

* Simplify AsyncCoroutineHelper

* revert default budget

* Add missing meta file for integration test directory (KhronosGroup#419)

* Add a component to display the list of models from gltf-Sample-Models and let you load them (KhronosGroup#420)

* Add a component to display the list of sample models and let you load them at runtime.

* Some improvements to the model list loader and adding a main scene to host it

* Fix warning suppression

* Address pr feedback.  Remove commented line.  Give a nice error if the model list json fails to download.  Also improve orbit camera so that scrolling the other list doesn't cause it to zoom.

* OrbitCamera now supports right mouse buttons to change position (KhronosGroup#422)

* right mouse camera controls

* More accurate right click mouse motion

* Set the correct filter mode when loading texture samplers (KhronosGroup#421)

* Include .asmdef files for correct UPM package generation

* Fix missing Integrations .meta file position

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Build script updates to properly support UWP with UPM compliant package

* Include .asmdef files for correct UPM package generation

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Fixing Travis build environment issues

* Include .asmdef files for correct UPM package generation

* Splitting out UnityGLTFEditor scripts with its own asmdef file

* Pull down upstream changes

* Fixing merge conflict

* Enable Azure Pipelines UPM releases (KhronosGroup#2)

* Update Export-upm-packages.sh to support Azure Pipelines
* Remove UPM Package generation from .travis.yml

UPM package generation now works with Azure Pipelines
  • Loading branch information
ei2kpi-ptc authored and AdamMitchell-ms committed May 15, 2019
1 parent 6048621 commit 9327c35
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 1 deletion.
16 changes: 16 additions & 0 deletions Scripts/Editor/UnityGLTFEditor.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "UnityGLTFEditor",
"references": [
"UnityGLTFScripts"
],
"optionalUnityReferences": [],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}
7 changes: 7 additions & 0 deletions Scripts/Editor/UnityGLTFEditor.asmdef.meta

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

2 changes: 1 addition & 1 deletion Scripts/Tests/Integration.meta

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

17 changes: 17 additions & 0 deletions Scripts/Tests/UnityGLTFTests.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "UnityGLTFTests",
"references": [
"UnityGLTFScripts",
"UnityGLTFEditor"
],
"optionalUnityReferences": [
"TestAssemblies"
],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}
7 changes: 7 additions & 0 deletions Scripts/Tests/UnityGLTFTests.asmdef.meta

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

3 changes: 3 additions & 0 deletions Scripts/UnityGLTFScripts.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"name": "UnityGLTFScripts"
}
7 changes: 7 additions & 0 deletions Scripts/UnityGLTFScripts.asmdef.meta

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

0 comments on commit 9327c35

Please sign in to comment.