Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:48:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15199 from dback2/avatarExporterOldUnityVersionsFixMaster

Browse source 
Case 21751: Avatar Exporter v0.3.6 - fix 2017.4 Unity versions
This commit is contained in:
Thijs Wenker 2019-03-22 00:04:15 +01:00 committed by GitHub
commit 5e35db1f76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/unity-avatar-exporter/Assets/Editor/AvatarExporter/AvatarExporter.cs
View file

@ -17,7 +17,7 @@ using System.Text.RegularExpressions;
class AvatarExporter : MonoBehaviour { class AvatarExporter : MonoBehaviour {
// update version number for every PR that changes this file, also set updated version in README file // update version number for every PR that changes this file, also set updated version in README file
static readonly string AVATAR_EXPORTER_VERSION = "0.3.5"; static readonly string AVATAR_EXPORTER_VERSION = "0.3.6";
static readonly float HIPS_GROUND_MIN_Y = 0.01f; static readonly float HIPS_GROUND_MIN_Y = 0.01f;
static readonly float HIPS_SPINE_CHEST_MIN_SEPARATION = 0.001f; static readonly float HIPS_SPINE_CHEST_MIN_SEPARATION = 0.001f;
@ -56,6 +56,8 @@ class AvatarExporter : MonoBehaviour {
"2018.1.0f2", "2018.1.0f2",
"2017.4.18f1", "2017.4.18f1",
"2017.4.17f1", "2017.4.17f1",
"2017.4.16f1",
"2017.4.15f1",
}; };
static readonly Dictionary<string, string> HUMANOID_TO_HIFI_JOINT_NAME = new Dictionary<string, string> { static readonly Dictionary<string, string> HUMANOID_TO_HIFI_JOINT_NAME = new Dictionary<string, string> {
@ -1159,8 +1161,7 @@ class AvatarExporter : MonoBehaviour {
static string GetMaterialTexture(Material material, string textureProperty) { static string GetMaterialTexture(Material material, string textureProperty) {
// ensure the texture property name exists in this material and return its texture directory path if so // ensure the texture property name exists in this material and return its texture directory path if so
string[] textureNames = material.GetTexturePropertyNames(); if (material.HasProperty(textureProperty)) {
if (Array.IndexOf(textureNames, textureProperty) >= 0) {
Texture texture = material.GetTexture(textureProperty); Texture texture = material.GetTexture(textureProperty);
if (texture) { if (texture) {
foreach (var textureDependency in textureDependencies) { foreach (var textureDependency in textureDependencies) {
@ -1214,10 +1215,10 @@ class AvatarExporter : MonoBehaviour {
} }
if (unsupportedShaderMaterials.Count > 1) { if (unsupportedShaderMaterials.Count > 1) {
warnings += "The materials " + unsupportedShaders + " are using an unsupported shader. " + warnings += "The materials " + unsupportedShaders + " are using an unsupported shader. " +
"Please change them to a Standard shader type.\n\n"; "We recommend you change them to a Standard shader type.\n\n";
} else if (unsupportedShaderMaterials.Count == 1) { } else if (unsupportedShaderMaterials.Count == 1) {
warnings += "The material " + unsupportedShaders + " is using an unsupported shader. " + warnings += "The material " + unsupportedShaders + " is using an unsupported shader. " +
"Please change it to a Standard shader type.\n\n"; "We recommend you change it to a Standard shader type.\n\n";
} }
} }

2
tools/unity-avatar-exporter/Assets/README.txt
View file

@ -1,6 +1,6 @@
High Fidelity, Inc. High Fidelity, Inc.
Avatar Exporter Avatar Exporter
Version 0.3.5 Version 0.3.6
Note: It is recommended to use Unity versions between 2017.4.17f1 and 2018.2.12f1 for this Avatar Exporter. Note: It is recommended to use Unity versions between 2017.4.17f1 and 2018.2.12f1 for this Avatar Exporter.

BIN
tools/unity-avatar-exporter/avatarExporter.unitypackage
View file

Binary file not shown.