diff options
Diffstat (limited to '')
| -rw-r--r-- | NW4RTools.userprefs | 19 | ||||
| -rw-r--r-- | NW4RTools/Models/Animation/CharacterAnim.cs | 2 | ||||
| -rw-r--r-- | NW4RTools/NW4RTools.pidb | bin | 585922 -> 586068 bytes | |||
| -rwxr-xr-x | NW4RTools/ObjImporter.cs | 4 | ||||
| -rwxr-xr-x | NW4RTools/bin/Debug/NW4RTools.dll | bin | 237568 -> 238592 bytes | |||
| -rw-r--r-- | NW4RTools/bin/Debug/NW4RTools.dll.mdb | bin | 114610 -> 114661 bytes |
6 files changed, 13 insertions, 12 deletions
diff --git a/NW4RTools.userprefs b/NW4RTools.userprefs index 08b033a..0317cce 100644 --- a/NW4RTools.userprefs +++ b/NW4RTools.userprefs @@ -1,14 +1,13 @@ <Properties> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> - <MonoDevelop.Ide.Workbench ActiveDocument="NW4RTools/Models/Animation/CharacterAnim.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="NW4RTools/BrresReader.cs"> <Files> - <File FileName="NW4RTools/ObjImporter.cs" Line="718" Column="1" /> + <File FileName="NW4RTools/ObjImporter.cs" Line="278" Column="1" /> <File FileName="NW4RTools/ObjExporter.cs" Line="105" Column="25" /> - <File FileName="NW4RTools/BrresReader.cs" Line="516" Column="1" /> + <File FileName="NW4RTools/BrresReader.cs" Line="586" Column="31" /> <File FileName="NW4RTools/BrresWriter.cs" Line="1262" Column="1" /> - <File FileName="NW4RTools/Models/Model.cs" Line="1" Column="1" /> - <File FileName="NW4RTools/Models/ByteCode.cs" Line="1" Column="1" /> - <File FileName="TestApp/Main.cs" Line="1" Column="1" /> + <File FileName="NW4RTools/Models/Model.cs" Line="29" Column="1" /> + <File FileName="TestApp/Main.cs" Line="15" Column="4" /> <File FileName="NW4RTools/Types.cs" Line="1" Column="1" /> <File FileName="NW4RTools/VertexSettings.cs" Line="184" Column="46" /> <File FileName="NW4RTools/Models/VertexData.cs" Line="238" Column="31" /> @@ -21,13 +20,13 @@ <File FileName="NW4RTools/OutputStream.cs" Line="62" Column="32" /> <File FileName="NW4RTools/ColladaExporter.cs" Line="273" Column="7" /> <File FileName="NW4RTools/ResFile.cs" Line="1" Column="1" /> - <File FileName="NW4RTools/Models/Animation/CharacterAnim.cs" Line="11" Column="14" /> + <File FileName="NW4RTools/Models/Animation/CharacterAnim.cs" Line="5" Column="28" /> + <File FileName="NW4RTools/Models/ByteCode.cs" Line="1" Column="1" /> + <File FileName="NW4RTools/Models/Material.cs" Line="1" Column="1" /> </Files> </MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.DebuggingService.Breakpoints> - <BreakpointStore> - <Breakpoint file="/home/me/Dev/NW4RTools/NW4RTools/BrresReader.cs" line="558" /> - </BreakpointStore> + <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.PinnedWatches /> </Properties>
\ 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 Binary files differindex ac72337..db7a70b 100644 --- a/NW4RTools/NW4RTools.pidb +++ b/NW4RTools/NW4RTools.pidb 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 Binary files differindex 111c9f0..9b33424 100755 --- a/NW4RTools/bin/Debug/NW4RTools.dll +++ b/NW4RTools/bin/Debug/NW4RTools.dll diff --git a/NW4RTools/bin/Debug/NW4RTools.dll.mdb b/NW4RTools/bin/Debug/NW4RTools.dll.mdb Binary files differindex 83824f2..183dfbb 100644 --- a/NW4RTools/bin/Debug/NW4RTools.dll.mdb +++ b/NW4RTools/bin/Debug/NW4RTools.dll.mdb |