bug fix
This commit is contained in:
@@ -0,0 +1,176 @@
|
||||
using Newtonsoft.Json;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Net.Http;
|
||||
using UnityEditor;
|
||||
using UnityEngine;
|
||||
using UnityGLTF.Loader;
|
||||
|
||||
namespace UnityGLTF
|
||||
{
|
||||
[CustomEditor(typeof(SampleModelList))]
|
||||
public class SampleModelListInspector : Editor
|
||||
{
|
||||
private List<SampleModel> models = null;
|
||||
private bool requestedModelList = false;
|
||||
private Vector2 scrollPosition = Vector2.zero;
|
||||
|
||||
public override void OnInspectorGUI()
|
||||
{
|
||||
DrawDefaultInspector();
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
|
||||
bool enabled = true;
|
||||
var targetObject = serializedObject.targetObject as SampleModelList;
|
||||
|
||||
if (targetObject != null)
|
||||
{
|
||||
enabled = targetObject.enabled;
|
||||
}
|
||||
|
||||
bool shouldShowList = Application.isPlaying && enabled;
|
||||
|
||||
if (!shouldShowList)
|
||||
{
|
||||
models = null;
|
||||
requestedModelList = false;
|
||||
scrollPosition = Vector2.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!requestedModelList)
|
||||
{
|
||||
requestedModelList = true;
|
||||
|
||||
DownloadSampleModelList();
|
||||
}
|
||||
|
||||
EditorGUILayout.LabelField("Models:");
|
||||
|
||||
if (models != null)
|
||||
{
|
||||
using (var scrollView = new EditorGUILayout.ScrollViewScope(scrollPosition))
|
||||
{
|
||||
scrollPosition = scrollView.scrollPosition;
|
||||
|
||||
foreach (var model in models)
|
||||
{
|
||||
DrawModel(model);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void DrawModel(SampleModel model)
|
||||
{
|
||||
using (var horizontal = new EditorGUILayout.HorizontalScope())
|
||||
{
|
||||
if (model.Expanded)
|
||||
{
|
||||
GUILayout.Label(model.Name);
|
||||
|
||||
foreach (var variant in model.Variants)
|
||||
{
|
||||
DrawModelLoadButton(variant.Name, variant.ModelFilePath);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
DrawModelLoadButton(model.Name, model.DefaultFilePath);
|
||||
}
|
||||
|
||||
if (model.Variants.Count > 1)
|
||||
{
|
||||
model.Expanded = DrawExpandCollapseButton(model.Expanded, model.Variants.Count);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private bool DrawExpandCollapseButton(bool expanded, int count)
|
||||
{
|
||||
string expandCollapseText = expanded ? "-" : "+";
|
||||
string buttonText = $"{expandCollapseText} ({count})";
|
||||
var buttonPressed = GUILayout.Button(buttonText, GUILayout.Width(40));
|
||||
|
||||
if (buttonPressed)
|
||||
{
|
||||
return !expanded;
|
||||
}
|
||||
else
|
||||
{
|
||||
return expanded;
|
||||
}
|
||||
}
|
||||
|
||||
private void DrawModelLoadButton(string title, string modelRelativePath)
|
||||
{
|
||||
var currentModelPath = serializedObject.FindProperty(SampleModelList.ModelRelativePathFieldName).stringValue;
|
||||
bool focused = currentModelPath == modelRelativePath;
|
||||
|
||||
GUIStyle style = new GUIStyle(GUI.skin.button);
|
||||
if (focused)
|
||||
{
|
||||
style.fontStyle = FontStyle.Bold;
|
||||
}
|
||||
|
||||
var buttonPressed = GUILayout.Button(title, style);
|
||||
|
||||
if (buttonPressed)
|
||||
{
|
||||
LoadModel(modelRelativePath);
|
||||
}
|
||||
}
|
||||
|
||||
private void LoadModel(string relativePath)
|
||||
{
|
||||
serializedObject.FindProperty(SampleModelList.ModelRelativePathFieldName).stringValue = relativePath;
|
||||
serializedObject.FindProperty(SampleModelList.LoadThisFrameFieldName).boolValue = true;
|
||||
serializedObject.ApplyModifiedProperties();
|
||||
}
|
||||
|
||||
private async void DownloadSampleModelList()
|
||||
{
|
||||
var pathRoot = serializedObject.FindProperty(SampleModelList.PathRootFieldName).stringValue;
|
||||
var manifestRelativePath = serializedObject.FindProperty(SampleModelList.ManifestRelativePathFieldName).stringValue;
|
||||
|
||||
var loader = new WebRequestLoader(pathRoot);
|
||||
Stream stream;
|
||||
try
|
||||
{
|
||||
stream = await loader.LoadStreamAsync(manifestRelativePath);
|
||||
}
|
||||
catch (HttpRequestException)
|
||||
{
|
||||
Debug.LogError($"Failed to download sample model list manifest from: {pathRoot}{manifestRelativePath}", serializedObject.targetObject);
|
||||
throw;
|
||||
}
|
||||
|
||||
var jsonReader = CreateJsonReaderFromStream(stream);
|
||||
jsonReader.Read();
|
||||
var listType = SampleModelListParser.DetermineListSource(jsonReader);
|
||||
|
||||
jsonReader = CreateJsonReaderFromStream(stream);
|
||||
jsonReader.Read();
|
||||
|
||||
|
||||
if (listType == SampleModelListParser.ListType.SampleModels)
|
||||
{
|
||||
models = SampleModelListParser.ParseSampleModels(jsonReader);
|
||||
}
|
||||
else
|
||||
{
|
||||
models = SampleModelListParser.ParseAssetGeneratorModels(jsonReader);
|
||||
}
|
||||
}
|
||||
|
||||
private JsonReader CreateJsonReaderFromStream(Stream stream)
|
||||
{
|
||||
stream.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
var streamReader = new StreamReader(stream);
|
||||
|
||||
return new JsonTextReader(streamReader);
|
||||
}
|
||||
}
|
||||
}
|
||||
+11
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f28130cf15191b44ea20112e38fb9a6c
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -0,0 +1,329 @@
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace UnityGLTF
|
||||
{
|
||||
public class SampleModelVariant
|
||||
{
|
||||
public SampleModelVariant(string name, string modelFilePath)
|
||||
{
|
||||
Name = name;
|
||||
ModelFilePath = modelFilePath;
|
||||
}
|
||||
|
||||
public string Name { get; }
|
||||
public string ModelFilePath { get; }
|
||||
}
|
||||
|
||||
public class SampleModel
|
||||
{
|
||||
public string Name;
|
||||
public string ScreenshotPath;
|
||||
public List<SampleModelVariant> Variants;
|
||||
public string DefaultFilePath => Variants[0].ModelFilePath;
|
||||
public bool Expanded = false;
|
||||
}
|
||||
|
||||
public static class SampleModelListParser
|
||||
{
|
||||
public enum ListType
|
||||
{
|
||||
SampleModels,
|
||||
AssetGenerator
|
||||
}
|
||||
|
||||
public static ListType DetermineListSource(JsonReader reader)
|
||||
{
|
||||
ParseStartArray(reader, "models");
|
||||
ParseStartObject(reader, "modelOrFolder");
|
||||
|
||||
if (reader.TokenType != JsonToken.PropertyName)
|
||||
{
|
||||
throw new Exception("Failed to parse first property to determine list type");
|
||||
}
|
||||
|
||||
string firstProperty = reader.Value.ToString();
|
||||
|
||||
switch (firstProperty.ToLowerInvariant())
|
||||
{
|
||||
case "folder":
|
||||
case "id":
|
||||
case "models":
|
||||
return ListType.AssetGenerator;
|
||||
|
||||
case "name":
|
||||
case "screenshot":
|
||||
case "variants":
|
||||
return ListType.SampleModels;
|
||||
|
||||
default:
|
||||
throw new FormatException("Error parsing json to determine list type");
|
||||
}
|
||||
}
|
||||
|
||||
public static List<SampleModel> ParseAssetGeneratorModels(JsonReader reader)
|
||||
{
|
||||
var models = new List<SampleModel>();
|
||||
|
||||
ParseStartArray(reader, "folders");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
ParseAssetGeneratorFolder(reader, models);
|
||||
}
|
||||
|
||||
ParseEndArray(reader, "folders");
|
||||
|
||||
return models;
|
||||
}
|
||||
|
||||
private static void ParseAssetGeneratorFolder(JsonReader reader, IList<SampleModel> models)
|
||||
{
|
||||
string folderName = null;
|
||||
|
||||
ParseStartObject(reader, "folder");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.PropertyName)
|
||||
{
|
||||
throw new Exception("Failed to parse folder property");
|
||||
}
|
||||
var propertyName = reader.Value.ToString().ToLowerInvariant();
|
||||
reader.Read();
|
||||
|
||||
switch (propertyName)
|
||||
{
|
||||
case "folder":
|
||||
folderName = ParsePropertyValueAsString(reader, propertyName);
|
||||
break;
|
||||
case "id":
|
||||
// There will be a number. Read that and ignore it.
|
||||
reader.Read();
|
||||
break;
|
||||
case "models":
|
||||
Debug.Assert(!string.IsNullOrEmpty(folderName), "Asset generator list should have folder listed before models.");
|
||||
ParseAssetGeneratorModels(reader, models, folderName);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ParseEndObject(reader, "folder");
|
||||
}
|
||||
|
||||
private static void ParseAssetGeneratorModels(JsonReader reader, IList<SampleModel> models, string folderName)
|
||||
{
|
||||
ParseStartArray(reader, "models");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
models.Add(ParseAssetGeneratorModel(reader, folderName));
|
||||
}
|
||||
|
||||
ParseEndArray(reader, "models");
|
||||
}
|
||||
|
||||
private static SampleModel ParseAssetGeneratorModel(JsonReader reader, string folderName)
|
||||
{
|
||||
var result = new SampleModel();
|
||||
result.Variants = new List<SampleModelVariant>();
|
||||
|
||||
ParseStartObject(reader, "model");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.PropertyName)
|
||||
{
|
||||
throw new Exception("Failed to parse model property");
|
||||
}
|
||||
var propertyName = reader.Value.ToString().ToLowerInvariant();
|
||||
reader.Read();
|
||||
|
||||
switch (propertyName)
|
||||
{
|
||||
case "filename":
|
||||
var fileName = ParsePropertyValueAsString(reader, propertyName);
|
||||
result.Name = fileName;
|
||||
result.Variants.Add(new SampleModelVariant(result.Name, $"{folderName}/{fileName}"));
|
||||
break;
|
||||
case "loadable":
|
||||
// There will be a bool. Read that and ignore it.
|
||||
reader.Read();
|
||||
break;
|
||||
case "sampleimagename":
|
||||
result.ScreenshotPath = ParsePropertyValueAsString(reader, propertyName);
|
||||
break;
|
||||
case "camera":
|
||||
ParseCamera(reader);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ParseEndObject(reader, "model");
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static void ParseCamera(JsonReader reader)
|
||||
{
|
||||
ParseStartObject(reader, "camera");
|
||||
|
||||
ParseToken(reader, JsonToken.PropertyName, "translation");
|
||||
ParseStartArray(reader, "translation");
|
||||
while (reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
reader.Read();
|
||||
}
|
||||
ParseEndArray(reader, "translation");
|
||||
|
||||
ParseEndObject(reader, "camera");
|
||||
}
|
||||
|
||||
private static void ParseToken(JsonReader reader, JsonToken expectedTokenType, string expectedString)
|
||||
{
|
||||
if (reader.TokenType != expectedTokenType
|
||||
|| reader.Value.ToString().ToLowerInvariant() != expectedString)
|
||||
{
|
||||
throw new Exception($"Failed to parse {expectedString}");
|
||||
}
|
||||
reader.Read();
|
||||
}
|
||||
|
||||
public static List<SampleModel> ParseSampleModels(JsonReader reader)
|
||||
{
|
||||
var models = new List<SampleModel>();
|
||||
|
||||
ParseStartArray(reader, "models");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
models.Add(ParseSampleModel(reader));
|
||||
}
|
||||
|
||||
ParseEndArray(reader, "models");
|
||||
|
||||
return models;
|
||||
}
|
||||
|
||||
private static SampleModel ParseSampleModel(JsonReader reader)
|
||||
{
|
||||
var result = new SampleModel();
|
||||
|
||||
ParseStartObject(reader, "model");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.PropertyName)
|
||||
{
|
||||
throw new Exception("Failed to parse model property");
|
||||
}
|
||||
var propertyName = reader.Value.ToString().ToLowerInvariant();
|
||||
reader.Read();
|
||||
|
||||
switch (propertyName)
|
||||
{
|
||||
case "name":
|
||||
result.Name = ParsePropertyValueAsString(reader, propertyName);
|
||||
break;
|
||||
case "screenshot":
|
||||
result.ScreenshotPath = ParsePropertyValueAsString(reader, propertyName);
|
||||
break;
|
||||
case "variants":
|
||||
Debug.Assert(!string.IsNullOrEmpty(result.Name), "Model index should have a name before a list of variants.");
|
||||
result.Variants = ParseVariants(reader, result.Name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ParseEndObject(reader, "model");
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string ParsePropertyValueAsString(JsonReader reader, string propertyName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.String)
|
||||
{
|
||||
throw new Exception($"Failed to parse string value for {propertyName}");
|
||||
}
|
||||
var result = reader.Value.ToString();
|
||||
|
||||
reader.Read();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<SampleModelVariant> ParseVariants(JsonReader reader, string modelName)
|
||||
{
|
||||
var variants = new List<SampleModelVariant>();
|
||||
|
||||
ParseStartObject(reader, "variants");
|
||||
|
||||
while (reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
variants.Add(ParseVariant(reader, modelName));
|
||||
}
|
||||
|
||||
ParseEndObject(reader, "variants");
|
||||
|
||||
return variants;
|
||||
}
|
||||
|
||||
private static SampleModelVariant ParseVariant(JsonReader reader, string modelName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.PropertyName)
|
||||
{
|
||||
throw new Exception("Failed to parse model variant name");
|
||||
}
|
||||
string variantType = reader.Value.ToString();
|
||||
reader.Read();
|
||||
|
||||
if (reader.TokenType != JsonToken.String)
|
||||
{
|
||||
throw new Exception("Failed to parse model variant filename");
|
||||
}
|
||||
string variantName = reader.Value.ToString();
|
||||
reader.Read();
|
||||
|
||||
return new SampleModelVariant(variantType, $"{modelName}/{variantType}/{variantName}");
|
||||
}
|
||||
|
||||
private static void ParseStartObject(JsonReader reader, string objectName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.StartObject)
|
||||
{
|
||||
throw new Exception($"Failed to parse {objectName} start");
|
||||
}
|
||||
reader.Read();
|
||||
}
|
||||
|
||||
private static void ParseEndObject(JsonReader reader, string objectName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.EndObject)
|
||||
{
|
||||
throw new Exception($"Failed to parse {objectName} end");
|
||||
}
|
||||
reader.Read();
|
||||
}
|
||||
|
||||
private static void ParseStartArray(JsonReader reader, string objectName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.StartArray)
|
||||
{
|
||||
throw new Exception($"Failed to parse {objectName} start");
|
||||
}
|
||||
reader.Read();
|
||||
}
|
||||
|
||||
private static void ParseEndArray(JsonReader reader, string objectName)
|
||||
{
|
||||
if (reader.TokenType != JsonToken.EndArray)
|
||||
{
|
||||
throw new Exception($"Failed to parse {objectName} end");
|
||||
}
|
||||
reader.Read();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 59a81a17ba63ebb4a9897bfeb7693a26
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
+23
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"name": "UnityGLTF.Samples.Misc.Editor",
|
||||
"rootNamespace": "",
|
||||
"references": [
|
||||
"UnityGLTF.Samples.Misc",
|
||||
"UnityGLTFScripts",
|
||||
"UnityEditor.TestRunner",
|
||||
"UnityEngine.TestRunner"
|
||||
],
|
||||
"includePlatforms": [
|
||||
"Editor"
|
||||
],
|
||||
"excludePlatforms": [],
|
||||
"allowUnsafeCode": false,
|
||||
"overrideReferences": true,
|
||||
"precompiledReferences": [
|
||||
"Newtonsoft.Json.dll"
|
||||
],
|
||||
"autoReferenced": false,
|
||||
"defineConstraints": [],
|
||||
"versionDefines": [],
|
||||
"noEngineReferences": false
|
||||
}
|
||||
+7
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0ac8d19e05d7cac4c96014c85320bcb0
|
||||
AssemblyDefinitionImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user