From 6a3b743987ca132729845613bc2d043f75f0d9e5 Mon Sep 17 00:00:00 2001 From: Treeki Date: Fri, 25 Mar 2011 15:58:41 +0100 Subject: a bit of crap --- NW4RTools.userprefs | 19 +++++++++---------- NW4RTools/Models/Animation/CharacterAnim.cs | 2 +- NW4RTools/NW4RTools.pidb | Bin 585922 -> 586068 bytes NW4RTools/ObjImporter.cs | 4 +++- NW4RTools/bin/Debug/NW4RTools.dll | Bin 237568 -> 238592 bytes NW4RTools/bin/Debug/NW4RTools.dll.mdb | Bin 114610 -> 114661 bytes TestApp/Main.cs | 15 +++++++++------ TestApp/TestApp.pidb | Bin 4427 -> 4427 bytes TestApp/bin/Debug/NW4RTools.dll | Bin 237568 -> 238592 bytes TestApp/bin/Debug/NW4RTools.dll.mdb | Bin 114610 -> 114661 bytes TestApp/bin/Debug/TestApp.exe | Bin 7680 -> 6656 bytes TestApp/bin/Debug/TestApp.exe.mdb | Bin 1300 -> 1181 bytes 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/NW4RTools.userprefs b/NW4RTools.userprefs index 08b033a..0317cce 100644 --- a/NW4RTools.userprefs +++ b/NW4RTools.userprefs @@ -1,14 +1,13 @@  - + - + - + - - - + + @@ -21,13 +20,13 @@ - + + + - - - + \ No newline at end of file diff --git a/NW4RTools/Models/Animation/CharacterAnim.cs b/NW4RTools/Models/Animation/CharacterAnim.cs index b350477..33c30ce 100644 --- a/NW4RTools/Models/Animation/CharacterAnim.cs +++ b/NW4RTools/Models/Animation/CharacterAnim.cs @@ -2,7 +2,7 @@ using System; namespace NW4RTools.Models.Animation { public class CharacterAnim { [FlagsAttribute] - public enum Flags { + public enum Flags : uint { Unk0 = 1, Unk1 = 2, Unk2 = 4, diff --git a/NW4RTools/NW4RTools.pidb b/NW4RTools/NW4RTools.pidb index ac72337..db7a70b 100644 Binary files a/NW4RTools/NW4RTools.pidb and b/NW4RTools/NW4RTools.pidb differ diff --git a/NW4RTools/ObjImporter.cs b/NW4RTools/ObjImporter.cs index dc128ce..f00d0f6 100755 --- a/NW4RTools/ObjImporter.cs +++ b/NW4RTools/ObjImporter.cs @@ -639,7 +639,9 @@ namespace NW4RTools { var context = new ShapeContext(); var shape = new Shape(); - shape.Unk = new byte[] { 0, 0, 0x14, 0, 0, 0, 0, 0x02, 0, 0, 0, 0x14 }; + shape.Unk = new byte[] { 0, 0, 0x14, 0, 0, 0, 0, 0x02, 0, 0, + 0, 0x14 }; + // 0x2e00 maybe? shape.DataFlags = 0x2600; shape.ExtraData = new ushort[0]; diff --git a/NW4RTools/bin/Debug/NW4RTools.dll b/NW4RTools/bin/Debug/NW4RTools.dll index 111c9f0..9b33424 100755 Binary files a/NW4RTools/bin/Debug/NW4RTools.dll and b/NW4RTools/bin/Debug/NW4RTools.dll differ diff --git a/NW4RTools/bin/Debug/NW4RTools.dll.mdb b/NW4RTools/bin/Debug/NW4RTools.dll.mdb index 83824f2..183dfbb 100644 Binary files a/NW4RTools/bin/Debug/NW4RTools.dll.mdb and b/NW4RTools/bin/Debug/NW4RTools.dll.mdb differ diff --git a/TestApp/Main.cs b/TestApp/Main.cs index 4901ec4..9d01957 100644 --- a/TestApp/Main.cs +++ b/TestApp/Main.cs @@ -12,7 +12,7 @@ namespace TestApp { string mdlPath = "/home/me/Games/Newer/ModelRev/"; //skawo(); return; - //oldBehaviour(); return; + oldBehaviour(); return; // Going to create a model! @@ -28,12 +28,15 @@ namespace TestApp { File.WriteAllBytes(mdlPath + "SMGoldwood.brres", BrresWriter.WriteFile(rf));*/ - string filename = "MMFullWorld"; + string filename = "DemoMap"; + //string filename = "MMFullWorld"; string resmdlname = "WorldBase"; + //string objname = "fullworld-tree-fbx"; + string objname = "crapmap2"; ResFile rf = new ResFile(); - ObjImporter.ImportModel(mdlPath, File.OpenText(mdlPath + "fullworld-tree-fbx.obj"), rf, resmdlname, ObjImporter.LightmapType.Map); + ObjImporter.ImportModel(mdlPath, File.OpenText(mdlPath + objname + ".obj"), rf, resmdlname, ObjImporter.LightmapType.Map); File.WriteAllBytes(mdlPath + filename + ".brres", BrresWriter.WriteFile(rf)); @@ -83,7 +86,7 @@ namespace TestApp { private static void oldBehaviour() { string mdlPath = "/home/me/Games/Newer/ModelRev/"; - string mdlName = "cobKinokoRed"; + string mdlName = "CS_W1"; //string mdlName = "lift_han_wood"; //string mdlName = "bgB_4502"; //string mdlName = "cobKoopaCastle"; @@ -103,11 +106,11 @@ namespace TestApp { //File.WriteAllBytes(mdlPath + mdlName + "_rewritten.brres", BrresWriter.WriteFile(rf)); - var texs = rf.GetGroup("Textures(NW4R)"); + /*var texs = rf.GetGroup("Textures(NW4R)"); // wtf C#?! foreach (var kv in (IEnumerable>)texs) { kv.Value.Images[0].Save(mdlPath + "images/" + kv.Key + ".png"); - } + }*/ //var objFile = File.Open(mdlPath + "lift_han_wood_M.dae", FileMode.OpenOrCreate); //ColladaExporter.WriteModel(objFile, rf, "lift_han_wood_M"); diff --git a/TestApp/TestApp.pidb b/TestApp/TestApp.pidb index ac6b5b6..99093a0 100644 Binary files a/TestApp/TestApp.pidb and b/TestApp/TestApp.pidb differ diff --git a/TestApp/bin/Debug/NW4RTools.dll b/TestApp/bin/Debug/NW4RTools.dll index 111c9f0..9b33424 100755 Binary files a/TestApp/bin/Debug/NW4RTools.dll and b/TestApp/bin/Debug/NW4RTools.dll differ diff --git a/TestApp/bin/Debug/NW4RTools.dll.mdb b/TestApp/bin/Debug/NW4RTools.dll.mdb index 83824f2..183dfbb 100644 Binary files a/TestApp/bin/Debug/NW4RTools.dll.mdb and b/TestApp/bin/Debug/NW4RTools.dll.mdb differ diff --git a/TestApp/bin/Debug/TestApp.exe b/TestApp/bin/Debug/TestApp.exe index 4e6e71a..90719af 100755 Binary files a/TestApp/bin/Debug/TestApp.exe and b/TestApp/bin/Debug/TestApp.exe differ diff --git a/TestApp/bin/Debug/TestApp.exe.mdb b/TestApp/bin/Debug/TestApp.exe.mdb index f675c74..b688c06 100644 Binary files a/TestApp/bin/Debug/TestApp.exe.mdb and b/TestApp/bin/Debug/TestApp.exe.mdb differ -- cgit v1.2.3