diff --git a/core/assets/warsmash.ini b/core/assets/warsmash.ini index e20aad9..6e6fe50 100644 --- a/core/assets/warsmash.ini +++ b/core/assets/warsmash.ini @@ -1,26 +1,26 @@ -// This is the Warsmash INI file for Project Revolution -// PRSCMOD - [DataSources] -Count=9 +Count=7 Type00=MPQ -Path00="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\war3.mpq" +Path00="E:\Games\Warcraft III Patch 1.22\war3.mpq" Type01=MPQ -Path01="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\War3x.mpq" +Path01="E:\Games\Warcraft III Patch 1.22\War3x.mpq" Type02=MPQ -Path02="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\War3xlocal.mpq" +Path02="E:\Games\Warcraft III Patch 1.22\War3xlocal.mpq" Type03=MPQ -Path03="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\war3patch.mpq" -Type04=MPQ -Path04="E:\Games\Warcraft III Project Revolution\PRSCMOD\Revolution.mpq" -Type05=MPQ -Path05="E:\Games\Warcraft III Project Revolution\PRSCMOD\Sound.mpq" +Path03="E:\Games\Warcraft III Patch 1.22\War3Patch.mpq" +Type04=Folder +Path04="..\..\resources" +Type05=Folder +Path05="E:\Backups\Warsmash\Data" Type06=Folder -Path06="E:\Games\Warcraft III Project Revolution\ProjectRevolusmash" -Type07=Folder -Path07="..\..\resources" -Type08=Folder -Path08="E:\Games\Warcraft III Project Revolution\PRSCMOD\PR-Maps" +Path06="." [Map] -FilePath="ProjectRevolusmash.w3x" \ No newline at end of file +//FilePath="CombatUnitTests.w3x" +//FilePath="PitchRoll.w3x" +//FilePath="PeonStartingBase.w3x" +//FilePath="DungeonGoldMine.w3m" +//FilePath="PlayerPeasants.w3m" +//FilePath="FireLord.w3x" +//FilePath="Maps\Campaign\NightElf03.w3m" +FilePath="PhoenixAttack.w3x" \ No newline at end of file diff --git a/core/assets/warsmash127.ini b/core/assets/warsmash127.ini deleted file mode 100644 index cbfd76d..0000000 --- a/core/assets/warsmash127.ini +++ /dev/null @@ -1,25 +0,0 @@ -[DataSources] -Count=7 -Type00=MPQ -Path00="E:\Games\Warcraft III Patch 1.22\war3.mpq" -Type01=MPQ -Path01="E:\Games\Warcraft III Patch 1.22\War3x.mpq" -Type02=MPQ -Path02="E:\Games\Warcraft III Patch 1.22\War3xlocal.mpq" -Type03=MPQ -Path03="E:\Games\Warcraft III Patch 1.22\War3Patch.mpq" -Type04=Folder -Path04="..\..\resources" -Type05=Folder -Path05="E:\Backups\Warsmash\Data" -Type06=Folder -Path06="." - -[Map] -//FilePath="CombatUnitTests.w3x" -//FilePath="PitchRoll.w3x" -FilePath="PeonStartingBase.w3x" -//FilePath="DungeonGoldMine.w3m" -//FilePath="PlayerPeasants.w3m" -//FilePath="FireLord.w3x" -//FilePath="Maps\Campaign\NightElf03.w3m" \ No newline at end of file diff --git a/core/assets/warsmash131.ini b/core/assets/warsmash131.ini index af6c427..0133118 100644 --- a/core/assets/warsmash131.ini +++ b/core/assets/warsmash131.ini @@ -17,5 +17,6 @@ Path04="." //FilePath="Maps\Campaign\NightElf03.w3m" //FilePath="PrivateDontShare/Cult 8.w3x" //FilePath="TorchLight2.w3x" -FilePath="OrcAssault.w3x" +//FilePath="OrcAssault.w3x" //FilePath="PeonStartingBase.w3x" +FilePath="PhoenixAttack.w3x" diff --git a/core/assets/warsmashPRSCMOD.ini b/core/assets/warsmashPRSCMOD.ini new file mode 100644 index 0000000..e20aad9 --- /dev/null +++ b/core/assets/warsmashPRSCMOD.ini @@ -0,0 +1,26 @@ +// This is the Warsmash INI file for Project Revolution +// PRSCMOD + +[DataSources] +Count=9 +Type00=MPQ +Path00="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\war3.mpq" +Type01=MPQ +Path01="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\War3x.mpq" +Type02=MPQ +Path02="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\War3xlocal.mpq" +Type03=MPQ +Path03="E:\Games\Warcraft III Project Revolution\War3\The Sheep Attack\war3patch.mpq" +Type04=MPQ +Path04="E:\Games\Warcraft III Project Revolution\PRSCMOD\Revolution.mpq" +Type05=MPQ +Path05="E:\Games\Warcraft III Project Revolution\PRSCMOD\Sound.mpq" +Type06=Folder +Path06="E:\Games\Warcraft III Project Revolution\ProjectRevolusmash" +Type07=Folder +Path07="..\..\resources" +Type08=Folder +Path08="E:\Games\Warcraft III Project Revolution\PRSCMOD\PR-Maps" + +[Map] +FilePath="ProjectRevolusmash.w3x" \ No newline at end of file diff --git a/core/src/com/etheller/warsmash/viewer5/handlers/mdx/MdxModel.java b/core/src/com/etheller/warsmash/viewer5/handlers/mdx/MdxModel.java index 27bac4f..eac8ed4 100644 --- a/core/src/com/etheller/warsmash/viewer5/handlers/mdx/MdxModel.java +++ b/core/src/com/etheller/warsmash/viewer5/handlers/mdx/MdxModel.java @@ -87,7 +87,14 @@ public class MdxModel extends com.etheller.warsmash.viewer5.Model { // Initialize the bounds. final Extent extent = parser.getExtent(); - this.bounds.fromExtents(extent.getMin(), extent.getMax()); + final float[] min = extent.getMin(); + final float[] max = extent.getMax(); + for (int i = 0; i < 3; i++) { + if (min[i] > max[i]) { + min[i] = max[i] = 0; + } + } + this.bounds.fromExtents(min, max); // Sequences this.sequences.addAll(parser.getSequences());