Update obsolete API

alvani · Mar 9, 2017 · 6113294 · 6113294
1 parent 3190f7b
commit 6113294
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/SceneToGlTFWiz.cs b/SceneToGlTFWiz.cs
@@ -27,8 +27,8 @@ public class SceneToGlTFWiz : EditorWindow
 
     static public string path = "?";
 	static XmlDocument xdoc;
-	static string savedPath = EditorPrefs.GetString (KEY_PATH, "/");
-	static string savedFile = EditorPrefs.GetString (KEY_FILE, "test.gltf");
+	static string savedPath;
+	static string savedFile;
 
 	static Preset preset = new Preset();
 	public static UnityEngine.TextAsset presetAsset;
@@ -59,6 +59,12 @@ static void CreateWizard()
 		window.Show();
 	}
 
+	void OnEnable()
+	{
+		savedPath = EditorPrefs.GetString (KEY_PATH, "/");
+		savedFile = EditorPrefs.GetString (KEY_FILE, "test.gltf");
+	}
+
 	void OnWizardUpdate ()
 	{
 //		Texture[] txs = Selection.GetFiltered(Texture, SelectionMode.Assets);
@@ -544,7 +550,7 @@ public static BoundsDouble Export(string path, Transform[] trs, Transform root,
 									else if (pType == ShaderUtil.ShaderPropertyType.TexEnv)
 									{
 										var td = ShaderUtil.GetTexDim(s, j);
-										if (td == ShaderUtil.ShaderPropertyTexDim.TexDim2D)
+										if (td == UnityEngine.Rendering.TextureDimension.Tex2D)
 										{
 											tParam = new GlTF_Technique.Parameter();
 											tParam.name = pName;
@@ -701,7 +707,7 @@ public static BoundsDouble Export(string path, Transform[] trs, Transform root,
 								else if (pType == ShaderUtil.ShaderPropertyType.TexEnv)
 								{
 									var td = ShaderUtil.GetTexDim(s, j);
-									if (td == ShaderUtil.ShaderPropertyTexDim.TexDim2D)
+									if (td == UnityEngine.Rendering.TextureDimension.Tex2D)
 									{											
 										var t = mat.GetTexture(pName);
 										var val = new GlTF_Material.StringValue();

diff --git a/TextureUnpacker.cs b/TextureUnpacker.cs
@@ -67,7 +67,7 @@ static List<Texture> GetTexturesFromRenderer(Renderer r) {
 
 				if (pType == ShaderUtil.ShaderPropertyType.TexEnv) {
 					var td = ShaderUtil.GetTexDim(s, i);
-					if (td == ShaderUtil.ShaderPropertyTexDim.TexDim2D) {
+					if (td == UnityEngine.Rendering.TextureDimension.Tex2D) {
 						var t = mat.GetTexture(pName);
 						if (t != null) {
 							ret.Add(t);
@@ -95,7 +95,7 @@ static List<Texture> GetTexturesFromMaterial(Material mat) {
 
 			if (pType == ShaderUtil.ShaderPropertyType.TexEnv) {
 				var td = ShaderUtil.GetTexDim(s, i);
-				if (td == ShaderUtil.ShaderPropertyTexDim.TexDim2D) {
+				if (td == UnityEngine.Rendering.TextureDimension.Tex2D) {
 					var t = mat.GetTexture(pName);
 					if (t != null) {
 						ret.Add(t);