Go back to computing tangents.

Author: NathanKell

RealSolarSystem/Plugins/RealSolarSystem.dll

@@ -15,26 +15,16 @@ public static void UpdateMeshFromFile(Mesh mesh, string filename, float scaleFac
         {
             ProfileTimer.Push("UpdateMeshFromFile");
             List<Vector3> vertices = new List<Vector3>();
-            /*List<Vector3> normals = new List<Vector3>();
+            List<Vector3> normals = new List<Vector3>();
             List<Vector4> tangents = new List<Vector4>();
-            List<Vector2> uv = new List<Vector2>();*/
+            List<Vector2> uv = new List<Vector2>();
             using (StreamReader stream = File.OpenText(filename))
             {
                 stream.ReadLine();
                 string curLine = stream.ReadLine();
                 char[] splitIdentifier = { ' ' };
                 string[] brokenString;
-                /*int v = 0; // first vertex
-                int t = 0; // first tangent
-                int n = 0; // first normal*/
-                // borrowed from mesh-reading code.
-                /*vertices = new Vector3[mesh.vertexCount];
-                normals = new Vector3[mesh.normals.Length];
-                tangents = new Vector4[mesh.tangents.Length];
-                uv = new Vector2[mesh.uv.Length];*/
-
-                //bool log = filename.Contains("un.obj");
-                //if(log) MonoBehaviour.print("*RSSOBJ* Loading " + filename);
+
                 while (curLine != null)
                 {
                     curLine = curLine.Trim();                           //Trim the current line
@@ -46,19 +36,17 @@ public static void UpdateMeshFromFile(Mesh mesh, string filename, float scaleFac
                             vertices.Add(new Vector3(System.Convert.ToSingle(brokenString[1]) * scaleFactor, System.Convert.ToSingle(brokenString[2]) * scaleFactor,
                                 System.Convert.ToSingle(brokenString[3]) * scaleFactor));
                             break;
-                        /*case "vn":
+                        case "vn":
                             normals.Add(new Vector3(System.Convert.ToSingle(brokenString[1]), System.Convert.ToSingle(brokenString[2]),
                                 System.Convert.ToSingle(brokenString[3])));
-                            n++;
                             break;
                         case "t":
                             tangents.Add(new Vector4(System.Convert.ToSingle(brokenString[1]), System.Convert.ToSingle(brokenString[2]),
                                 System.Convert.ToSingle(brokenString[3]), System.Convert.ToSingle(brokenString[4])));
-                            t++;
                             break;
                         case "vt":
                             uv.Add(new Vector2(System.Convert.ToSingle(brokenString[1]), System.Convert.ToSingle(brokenString[2])));
-                            break;*/
+                            break;
                     }
                     curLine = stream.ReadLine();
                     if (curLine != null)
@@ -68,21 +56,9 @@ public static void UpdateMeshFromFile(Mesh mesh, string filename, float scaleFac
                 }
             }
             mesh.vertices = vertices.ToArray();
-
-            /*var f2name = filename + ".tst";
-            using (var sw = new StreamWriter(f2name, false))
-            {
-                foreach (var vertex in vertices)
-                {
-                    sw.WriteLine("v {0} {1} {2}", vertex.x, vertex.y, vertex.z);
-                }
-            }*/
-
-            //mesh.normals = normals.ToArray();
-            //mesh.tangents = tangents.ToArray();
-            /*mesh.uv = uv.ToArray();*/
-            mesh.RecalculateNormals();
-            //mesh.RecalculateBounds();
+            mesh.normals = normals.ToArray();
+            mesh.tangents = tangents.ToArray();
+            mesh.uv = uv.ToArray();
             ProfileTimer.Pop("UpdateMeshFromFile");
         }
         // based on noontz's code here: http://forum.unity3d.com/threads/38984-How-to-Calculate-Mesh-Tangents

Source/ObjLib.cs

@@ -1768,10 +1768,6 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                             }
                             else
                             {
-                                //OnGui();
-                                // **** No longer exporting and importing
-                                // Now I just do everything except tangents each time. Tangents don't seem necessary to fix, and
-                                // the rest is fast enough...and something in .24/64 broke importing for *some* planets. WEIRD.
                                 char sep = System.IO.Path.DirectorySeparatorChar;
                                 string filePath = KSPUtil.ApplicationRootPath + "GameData" + sep + "RealSolarSystem" + sep + "Plugins"
                                             + sep + "PluginData" + sep + t.name;
@@ -1790,15 +1786,8 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                         Utils.CopyMesh(loadInfo.joolMesh.mesh, tMesh);
 
                                         ObjLib.UpdateMeshFromFile(tMesh, filePath);
-                                        //m.mesh.RecalculateBounds();
-                                        // done in UpdateFromFile
-                                        /*m.mesh.RecalculateNormals();
-                                        ObjLib.UpdateTangents(tMesh);*/
                                         m.mesh = tMesh;
                                         m.mesh.RecalculateBounds();
-                                        /*float scaleFactor = (float)(body.Radius / 6000000.0 * SSTScale);
-                                        t.localScale = new Vector3(scaleFactor, scaleFactor, scaleFactor);
-                                        rescale = false;*/
                                         print("*RSS* Loaded " + filePath + " and wrapped.");
                                         ProfileTimer.Pop("LoadSSM_" + body.name);
                                         wrap = false;
@@ -1836,7 +1825,7 @@ private IEnumerator<YieldInstruction> LoadScaledSpace(ConfigNode node, Celestial
                                             tMesh.RecalculateNormals();
 
                                             //ProfileTimer.Pop("Recalc Normals");
-                                            //ObjLib.UpdateTangents(tMesh);
+                                            ObjLib.UpdateTangents(tMesh);
                                             //print("*RSS* wrapped.");
                                         }
                                         m.mesh = tMesh;