Skip to content

Commit

Permalink
Release samples for Mesh.Toolkit version '5.2407.225'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mesh.Automation committed Jun 25, 2024
1 parent 486db6b commit 5a6eaeb
Show file tree
Hide file tree
Showing 41 changed files with 1,262 additions and 512 deletions.
2 changes: 1 addition & 1 deletion DartRoom/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"com.unity.timeline": "1.7.6",
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.9.1",
"com.microsoft.mesh.toolkit": "5.2406.200"
"com.microsoft.mesh.toolkit": "5.2407.225"
},
"testables": [],
"scopedRegistries": [
Expand Down
13 changes: 11 additions & 2 deletions Mesh101/Assets/StartingPoint.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1630,13 +1630,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
Expand Down Expand Up @@ -6783,13 +6785,15 @@ ParticleSystemRenderer:
m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_FreeformStretching: 0
m_RotateWithStretchDirection: 1
m_UseCustomVertexStreams: 0
m_VertexStreams: 00010304
m_UseCustomTrailVertexStreams: 0
m_TrailVertexStreams: 00010304
m_Mesh: {fileID: 0}
m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0}
Expand Down Expand Up @@ -14515,6 +14519,11 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7cc51c787efb9b84888d0eea6b9b40c7, type: 2}
- target: {fileID: 1670936059622774230, guid: b4c62dd816c91bd489afeed5ad53f0dd,
type: 3}
propertyPath: m_Layer
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7001597364894376079, guid: b4c62dd816c91bd489afeed5ad53f0dd,
type: 3}
propertyPath: m_Name
Expand Down
2 changes: 1 addition & 1 deletion Mesh101/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"com.unity.render-pipelines.universal": "14.0.9",
"com.unity.textmeshpro": "3.0.7",
"com.unity.ugui": "1.0.0",
"com.microsoft.mesh.toolkit": "5.2406.200"
"com.microsoft.mesh.toolkit": "5.2407.225"
},
"testables": [],
"scopedRegistries": [
Expand Down
8 changes: 4 additions & 4 deletions Mesh101/README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Microsoft Mesh Toolkit Sample: Mesh 101

![Chapter 3 and Chapter 4 Sphere Terraces](README/Mesh101.png)
![Chapter 3 and Chapter 4 Sphere Terraces](README/Mesh101.jpg)

## What is Mesh 101?

The *Mesh 101* tutorial project is created for intermediate to advanced Unity developers with an introduction to the fundamental Mesh Toolkit building blocks thus enabling them to hone their skills and eventually create delightful experiences with our Mesh Toolkit in Unity. In the Mesh 101 tutorial project, we demonstrate building shared immersive environments and experiences in Mesh using an interactive learning experience about wind turbines. The tutorial gives a holistic introduction to the power of Mesh, spanning Mesh Physics, Mesh Scripting, and more.
The *Mesh 101* tutorial project is created for intermediate to advanced Unity developers with an introduction to the fundamental Mesh Toolkit building blocks thus enabling them to hone their skills and eventually create delightful experiences with our Mesh Toolkit in Unity. In the Mesh 101 tutorial project, we demonstrate building shared immersive environments and experiences in Mesh using an interactive learning experience about wind turbines. The tutorial gives a holistic introduction to the power of Mesh, spanning Mesh Physics, Mesh Visual Scripting, and more.

In this project, you'll find 2 Scenes:

Expand All @@ -28,7 +28,7 @@ In this tutorial, you'll complete a series of tasks that use Mesh Visual Scripti

Developers start with a pre-built Unity project, where they can add custom interactivity and other Mesh features, and then deploy the project as an Environment to Microsoft Mesh.

## How to use
## Getting started

* Follow the Mesh 101 Tutorial Docs for a guided walkthrough
* Follow the [Mesh 101 Tutorial Docs](aka.ms/Mesh101Tutorial) for a guided walkthrough.
* Additional info about the [Microsoft Mesh Toolkit Control Samples package](Packages/com.microsoft.mesh.toolkit.control.samples/README.md).
3 changes: 3 additions & 0 deletions Mesh101/README/Mesh101.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions Mesh101/README/Mesh101.png

This file was deleted.

10 changes: 8 additions & 2 deletions Mesh201/Assets/.MeshCloudScripting/FinishedProject/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public Task StartAsync(CancellationToken token)
{
infoButton.Selected += async (sender, args) =>
{
// Ensure we have weather data before begining the conversation
// Ensure we have weather data before beginning the conversation
await GetCurrentWeather(_latlong);
// Display an input dialog for the user to send a message to the LLM
Expand Down Expand Up @@ -107,7 +107,13 @@ await _app.ShowInputDialogToParticipantAsync("Ask Azure OpenAI", args.Participan
}
catch (Exception ex)
{
_logger.LogCritical($"Exception during OpenAI request: {ex.Message}");
var log = $"Exception during OpenAI request: {ex.Message}";
_logger.LogCritical(log);
if (!response.IsCanceled)
{
_app.ShowMessageToParticipant(log, args.Participant);
}
}
}, TaskScheduler.Default);
};
Expand Down
Binary file modified Mesh201/Assets/.MeshCloudScripting/FinishedProject/scene.map
Binary file not shown.
2 changes: 1 addition & 1 deletion Mesh201/Assets/.MeshCloudScripting/StartingPoint/App.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public Task StartAsync(CancellationToken token)
{
infoButton.Selected += async (sender, args) =>
{
// Ensure we have weather data before begining the conversation
// Ensure we have weather data before beginning the conversation
await GetCurrentWeather(_latlong);
// Display an input dialog for the user to send a message to the LLM
Expand Down
618 changes: 436 additions & 182 deletions Mesh201/Assets/FinishedProject.unity

Large diffs are not rendered by default.

223 changes: 136 additions & 87 deletions Mesh201/Assets/MeshCloudScripting/5 - AIAssistant.prefab

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Mesh201/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"com.unity.render-pipelines.universal": "14.0.9",
"com.unity.textmeshpro": "3.0.7",
"com.unity.ugui": "1.0.0",
"com.microsoft.mesh.toolkit": "5.2406.200"
"com.microsoft.mesh.toolkit": "5.2407.225"
},
"testables": [],
"scopedRegistries": [
Expand Down
16 changes: 12 additions & 4 deletions Mesh201/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
# Microsoft Mesh Toolkit Sample: Mesh 201

![MeshWebSlate Terraces Showcasing the Earth prefab](README/Mesh201.png)
![MeshWebSlate Terraces Showcasing the Earth prefab](README/Mesh201.jpg)

## What is Mesh 201?

The *Mesh 201* tutorial project is created for intermediate to advanced Unity developers with an introduction to the fundamental Mesh Toolkit building blocks thus enabling them to hone their skills and eventually create delightful experiences with our Mesh Toolkit in Unity. In the Mesh 201 tutorial project, we demonstrate building shared immersive environments and experiences in Mesh using Mesh WebSlates and Mesh Visual Scripting.
The *Mesh 201* tutorial project is intended for intermediate to advanced Unity developers with an introduction to the fundamental Mesh Toolkit building blocks thus enabling them to hone their skills and create delightful experiences with the Mesh Toolkit. In the Mesh 201 tutorial project, we demonstrate building shared immersive environments and experiences in Mesh using Mesh WebSlates, Mesh Visual Scripting, Mesh Cloud Scripting, and Azure OpenAI.

Developers start with a pre-built Unity project, where they can complete a series of tasks to add custom interactivity and other Mesh features, and then deploy the project as an Environment to Microsoft Mesh. The project has 2 Scenes:

* **FinishedProject.unity**: This scene contains a completed version of the tutorial.
* **StartingPoint.unity**: It contains a pre-built scene where Mesh features can be added by following the tutorial.

## How to use
In this tutorial, you'll complete a series of tasks that use Mesh Visual Scripting and Mesh Physics to create an experience that can be uploaded and used in Mesh.

* Follow the Mesh 201 Tutorial Docs for a guided walkthrough
* Chapter 1: Overview, set up, and lLoad a local non-shared HTML file into a WebSlate
* Chapter 2: Load a local non-shared and shared HTML file into a WebSlate
* Chapter 3: Load a URL from a 3D asset
* Chapter 4: Load weather from weatherapi.com
* Chapter 5: Use Azure OpenAI as an assistant

## Getting started

* Follow the [Mesh 201 Tutorial Docs](aka.ms/Mesh201Tutorial) for a guided walkthrough.
* Additional info about the [Microsoft Mesh Toolkit Control Samples package](Packages/com.microsoft.mesh.toolkit.control.samples/README.md).
3 changes: 3 additions & 0 deletions Mesh201/README/Mesh201.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions Mesh201/README/Mesh201.png

This file was deleted.

29 changes: 24 additions & 5 deletions Packages/com.microsoft.mesh.toolkit.control.samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,38 @@ For these types of features, we want the community to get a chance to see them e

## Getting started

There are a few ways to add the Control Samples package to your project: a) copy and paste the *com.microsoft.mesh.toolkit.control.samples* folder located in this repository's `Packages` folder into your project's `Packages` folder, or b) reference the Control Samples package from GitHub. To use this second method, follow these steps:
There are a couple of ways to add the Control Samples package to your project.

1. In Unity select `Window > Package Manager` from the file menu bar
1. Copy and paste the com.microsoft.mesh.toolkit.control.samples folder located in this repository's Packages folder into your project's Packages folder.
2. Reference the Control Samples package from GitHub.

1. Click the `'+'` icon within the Package Manager and select `"Add package from git URL..."`
> [!IMPORTANT]
> To reference the Control Samples package from GitHub you must have [Git](https://gitforwindows.org/) installed on your computer.
To import the Control Samples package into your Unity project using GitHub:

1. In your project, on the menu bar, select Window > Package Manager.

1. In the Package Manager, click the '+' drop-down and then select "Add package from git URL..."

![Package Manager Add](README~/PackageManagerAdd.png)

1. Paste *https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.control.samples* into the text field and click `"Add"`
1. Paste <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.control.samples> into the text field and then click Add.

![Package Manager Paste](README~/PackageManagerPaste.png)

The Control Samples will now be installed within your Unity project as package within the project's `Packages` folder named `Microsoft Mesh Toolkit Control Samples`. You can now start using prefabs and visual scripts within the Control Samples' runtime folder.
The Control Samples package will now be installed in your Unity project as a package in the project's Packages folder with the name Microsoft Mesh Toolkit Control Samples. You can now start using prefabs and visual scripts within the Control Samples runtime folder.

> [!TIP]
> It is advised you use a specific release of the Control Samples package to ensure your project is locked to a release.
You can reference a specific release version, branch, or git commit hash by altering the URL in step 3 as demonstrated below:

| Syntax | URL example |
|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------|
| Specific version | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.control.samples#vX.Y.Z> |
| Specific branch | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.control.samples#my_branch> |
| Git commit hash | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.control.samples#badc0ffee0ddf00ddead10cc8badf00d1badb002> |

## List of controls

Expand Down
49 changes: 49 additions & 0 deletions Packages/com.microsoft.mesh.toolkit.toybox/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# What is the Toybox package?

Toybox is a Unity Engine package that empowers creators to build interactive experiences and games for Microsoft Mesh. This package provides visual scripts, assets, and shaders to help jumpstart creating activities for Mesh environments while staying within performance budgets.

## Getting started

There are a couple of ways to add the Toybox package to your project.

1. Copy and paste the com.microsoft.mesh.toolkit.toybox folder located in this repository's Packages folder into your project's Packages folder.
2. Reference the Toybox package from GitHub.

> [!IMPORTANT]
> To reference the Toybox package from GitHub you must have [Git](https://gitforwindows.org/) installed on your computer.
To import the Toybox package into your Unity project using GitHub:

1. In your project, on the menu bar, select Window > Package Manager.

1. In the Package Manager, click the '+' drop-down and then select "Add package from git URL..."

![Package Manager Add](README~/PackageManagerAdd.png)

1. Paste <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.toybox> into the text field and then click Add.

![Package Manager Paste](README~/PackageManagerPaste.png)

The Toybox package will now be installed in your Unity project as a package in the project's Packages folder with the name Microsoft Mesh Toolkit Toybox. You can now start using prefabs and visual scripts within the Toybox runtime folder.

> [!TIP]
> It is advised you use a specific release of the Toybox package to ensure your project is locked to a release.
You can reference a specific release version, branch, or git commit hash by altering the URL in step 3 as demonstrated below:

| Syntax | URL example |
|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------|
| Specific version | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.toybox#vX.Y.Z> |
| Specific branch | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.toybox#my_branch> |
| Git commit hash | <https://github.com/microsoft/Mesh-Toolkit-Unity.git?path=/Packages/com.microsoft.mesh.toolkit.toybox#badc0ffee0ddf00ddead10cc8badf00d1badb002> |

## List of activities

In the Runtime folder you will find the following activities:

- Bean Bag Toss - two versions :trophy:
- Fire Pit & Roasting Marshmallows :fire:
- Ice Breaker :interrobang:
- Sound Orbs :notes:
- Radio & Boombox :musical_note:
- *Bonus: Astronaut :rocket:*
7 changes: 7 additions & 0 deletions Packages/com.microsoft.mesh.toolkit.toybox/README.md.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5064684263032372861}
- component: {fileID: 962199763285338550}
- component: {fileID: 8326535161521976183}
- component: {fileID: 2296439075468361368}
m_Layer: 0
Expand All @@ -66,19 +65,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1312669811333387240}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &962199763285338550
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2386000869970405573}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f5c0a2371b63dc44199935c88ef12809, type: 3}
m_Name:
m_EditorClassIdentifier:
m_usdPrimPath: /baseball
--- !u!33 &8326535161521976183
MeshFilter:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -225,6 +211,7 @@ MonoBehaviour:
CustomHandPose:
HandPoseShape: 0
HandPoseSize: 1
OverrideHandRotation: 0
HandRotation: {x: 0, y: 0, z: 0}
EnableIkTracking: 0
ConstrainArmWithinSphere: 1
Expand Down Expand Up @@ -352,13 +339,15 @@ MonoBehaviour:
forceMode: 0
scale:
enabled: 0
minScale: 0.3
maxScale: 10
minScale: {x: 0.3, y: 0.3, z: 0.3}
maxScale: {x: 10, y: 10, z: 10}
uniformScale: 1
translation:
enabled: 1
x: 1
y: 1
z: 1
manipulationTranslationLogic: 0
rotation:
enabled: 1
x: 1
Expand All @@ -374,6 +363,7 @@ MonoBehaviour:
CustomHandPose:
HandPoseShape: 6
HandPoseSize: 1
OverrideHandRotation: 0
HandRotation: {x: 0, y: 0, z: 0}
EnableIkTracking: 1
ConstrainArmWithinSphere: 1
Expand Down
Loading

0 comments on commit 5a6eaeb

Please sign in to comment.