diff --git a/.gitmodules b/.gitmodules index ecd2e7a..82dd38d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "external/lua"] path = external/lua url = https://github.com/lua/lua +[submodule "external/tinydir"] + path = external/tinydir + url = https://github.com/cxong/tinydir diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier.blend1 b/Assets/Models/Units/Aircraft carriers/aircraftCarrier.blend1 similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier.blend1 rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier.blend1 diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier00.blend b/Assets/Models/Units/Aircraft carriers/aircraftCarrier00.blend similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier00.blend rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier00.blend diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier00.blend1 b/Assets/Models/Units/Aircraft carriers/aircraftCarrier00.blend1 similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier00.blend1 rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier00.blend1 diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier01.blend b/Assets/Models/Units/Aircraft carriers/aircraftCarrier01.blend similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier01.blend rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier01.blend diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier01.blend1 b/Assets/Models/Units/Aircraft carriers/aircraftCarrier01.blend1 similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier01.blend1 rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier01.blend1 diff --git a/Assets/Models/Aircraft carriers/aircraftCarrier1.blend b/Assets/Models/Units/Aircraft carriers/aircraftCarrier1.blend similarity index 100% rename from Assets/Models/Aircraft carriers/aircraftCarrier1.blend rename to Assets/Models/Units/Aircraft carriers/aircraftCarrier1.blend diff --git a/Assets/Models/Aircraft carriers/hull00.blend b/Assets/Models/Units/Aircraft carriers/hull00.blend similarity index 100% rename from Assets/Models/Aircraft carriers/hull00.blend rename to Assets/Models/Units/Aircraft carriers/hull00.blend diff --git a/Assets/Models/Aircraft carriers/hull00.blend1 b/Assets/Models/Units/Aircraft carriers/hull00.blend1 similarity index 100% rename from Assets/Models/Aircraft carriers/hull00.blend1 rename to Assets/Models/Units/Aircraft carriers/hull00.blend1 diff --git a/Assets/Models/Aircraft carriers/hull00.x b/Assets/Models/Units/Aircraft carriers/hull00.x similarity index 100% rename from Assets/Models/Aircraft carriers/hull00.x rename to Assets/Models/Units/Aircraft carriers/hull00.x diff --git a/Assets/Models/Aircraft carriers/hull01.blend b/Assets/Models/Units/Aircraft carriers/hull01.blend similarity index 100% rename from Assets/Models/Aircraft carriers/hull01.blend rename to Assets/Models/Units/Aircraft carriers/hull01.blend diff --git a/Assets/Models/Aircraft carriers/hull01.x b/Assets/Models/Units/Aircraft carriers/hull01.x similarity index 100% rename from Assets/Models/Aircraft carriers/hull01.x rename to Assets/Models/Units/Aircraft carriers/hull01.x diff --git a/Assets/Models/Battleships/battleship00.blend b/Assets/Models/Units/Battleships/battleship00.blend similarity index 100% rename from Assets/Models/Battleships/battleship00.blend rename to Assets/Models/Units/Battleships/battleship00.blend diff --git a/Assets/Models/Battleships/battleship00.blend1 b/Assets/Models/Units/Battleships/battleship00.blend1 similarity index 100% rename from Assets/Models/Battleships/battleship00.blend1 rename to Assets/Models/Units/Battleships/battleship00.blend1 diff --git a/Assets/Models/Battleships/battleship01.blend b/Assets/Models/Units/Battleships/battleship01.blend similarity index 100% rename from Assets/Models/Battleships/battleship01.blend rename to Assets/Models/Units/Battleships/battleship01.blend diff --git a/Assets/Models/Battleships/battleship01.blend1 b/Assets/Models/Units/Battleships/battleship01.blend1 similarity index 100% rename from Assets/Models/Battleships/battleship01.blend1 rename to Assets/Models/Units/Battleships/battleship01.blend1 diff --git a/Assets/Models/Battleships/bigBarrel.blend1 b/Assets/Models/Units/Battleships/bigBarrel.blend1 similarity index 100% rename from Assets/Models/Battleships/bigBarrel.blend1 rename to Assets/Models/Units/Battleships/bigBarrel.blend1 diff --git a/Assets/Models/Battleships/bigBarrel00.blend b/Assets/Models/Units/Battleships/bigBarrel00.blend similarity index 100% rename from Assets/Models/Battleships/bigBarrel00.blend rename to Assets/Models/Units/Battleships/bigBarrel00.blend diff --git a/Assets/Models/Battleships/bigBarrel00.x b/Assets/Models/Units/Battleships/bigBarrel00.x similarity index 100% rename from Assets/Models/Battleships/bigBarrel00.x rename to Assets/Models/Units/Battleships/bigBarrel00.x diff --git a/Assets/Models/Battleships/bigBarrel01.blend b/Assets/Models/Units/Battleships/bigBarrel01.blend similarity index 100% rename from Assets/Models/Battleships/bigBarrel01.blend rename to Assets/Models/Units/Battleships/bigBarrel01.blend diff --git a/Assets/Models/Battleships/bigBarrel01.x b/Assets/Models/Units/Battleships/bigBarrel01.x similarity index 100% rename from Assets/Models/Battleships/bigBarrel01.x rename to Assets/Models/Units/Battleships/bigBarrel01.x diff --git a/Assets/Models/Battleships/bigMantlet00.blend b/Assets/Models/Units/Battleships/bigMantlet00.blend similarity index 100% rename from Assets/Models/Battleships/bigMantlet00.blend rename to Assets/Models/Units/Battleships/bigMantlet00.blend diff --git a/Assets/Models/Battleships/bigMantlet00.x b/Assets/Models/Units/Battleships/bigMantlet00.x similarity index 100% rename from Assets/Models/Battleships/bigMantlet00.x rename to Assets/Models/Units/Battleships/bigMantlet00.x diff --git a/Assets/Models/Battleships/bigMantlet01.blend b/Assets/Models/Units/Battleships/bigMantlet01.blend similarity index 100% rename from Assets/Models/Battleships/bigMantlet01.blend rename to Assets/Models/Units/Battleships/bigMantlet01.blend diff --git a/Assets/Models/Battleships/bigMantlet01.blend1 b/Assets/Models/Units/Battleships/bigMantlet01.blend1 similarity index 100% rename from Assets/Models/Battleships/bigMantlet01.blend1 rename to Assets/Models/Units/Battleships/bigMantlet01.blend1 diff --git a/Assets/Models/Battleships/bigMantlet01.x b/Assets/Models/Units/Battleships/bigMantlet01.x similarity index 100% rename from Assets/Models/Battleships/bigMantlet01.x rename to Assets/Models/Units/Battleships/bigMantlet01.x diff --git a/Assets/Models/Battleships/bigTurret00.blend b/Assets/Models/Units/Battleships/bigTurret00.blend similarity index 100% rename from Assets/Models/Battleships/bigTurret00.blend rename to Assets/Models/Units/Battleships/bigTurret00.blend diff --git a/Assets/Models/Battleships/bigTurret00.x b/Assets/Models/Units/Battleships/bigTurret00.x similarity index 100% rename from Assets/Models/Battleships/bigTurret00.x rename to Assets/Models/Units/Battleships/bigTurret00.x diff --git a/Assets/Models/Battleships/bigTurret01.blend b/Assets/Models/Units/Battleships/bigTurret01.blend similarity index 100% rename from Assets/Models/Battleships/bigTurret01.blend rename to Assets/Models/Units/Battleships/bigTurret01.blend diff --git a/Assets/Models/Battleships/bigTurret01.blend1 b/Assets/Models/Units/Battleships/bigTurret01.blend1 similarity index 100% rename from Assets/Models/Battleships/bigTurret01.blend1 rename to Assets/Models/Units/Battleships/bigTurret01.blend1 diff --git a/Assets/Models/Battleships/bigTurret01.x b/Assets/Models/Units/Battleships/bigTurret01.x similarity index 100% rename from Assets/Models/Battleships/bigTurret01.x rename to Assets/Models/Units/Battleships/bigTurret01.x diff --git a/Assets/Models/Battleships/hull00.blend b/Assets/Models/Units/Battleships/hull00.blend similarity index 100% rename from Assets/Models/Battleships/hull00.blend rename to Assets/Models/Units/Battleships/hull00.blend diff --git a/Assets/Models/Battleships/hull00.blend1 b/Assets/Models/Units/Battleships/hull00.blend1 similarity index 100% rename from Assets/Models/Battleships/hull00.blend1 rename to Assets/Models/Units/Battleships/hull00.blend1 diff --git a/Assets/Models/Battleships/hull00.x b/Assets/Models/Units/Battleships/hull00.x similarity index 100% rename from Assets/Models/Battleships/hull00.x rename to Assets/Models/Units/Battleships/hull00.x diff --git a/Assets/Models/Battleships/hull01.blend b/Assets/Models/Units/Battleships/hull01.blend similarity index 100% rename from Assets/Models/Battleships/hull01.blend rename to Assets/Models/Units/Battleships/hull01.blend diff --git a/Assets/Models/Battleships/hull01.blend1 b/Assets/Models/Units/Battleships/hull01.blend1 similarity index 100% rename from Assets/Models/Battleships/hull01.blend1 rename to Assets/Models/Units/Battleships/hull01.blend1 diff --git a/Assets/Models/Battleships/hull01.x b/Assets/Models/Units/Battleships/hull01.x similarity index 100% rename from Assets/Models/Battleships/hull01.x rename to Assets/Models/Units/Battleships/hull01.x diff --git a/Assets/Models/Battleships/smallBarrel00.blend b/Assets/Models/Units/Battleships/smallBarrel00.blend similarity index 100% rename from Assets/Models/Battleships/smallBarrel00.blend rename to Assets/Models/Units/Battleships/smallBarrel00.blend diff --git a/Assets/Models/Battleships/smallBarrel00.x b/Assets/Models/Units/Battleships/smallBarrel00.x similarity index 100% rename from Assets/Models/Battleships/smallBarrel00.x rename to Assets/Models/Units/Battleships/smallBarrel00.x diff --git a/Assets/Models/Battleships/smallBarrel01.blend b/Assets/Models/Units/Battleships/smallBarrel01.blend similarity index 100% rename from Assets/Models/Battleships/smallBarrel01.blend rename to Assets/Models/Units/Battleships/smallBarrel01.blend diff --git a/Assets/Models/Battleships/smallBarrel01.blend1 b/Assets/Models/Units/Battleships/smallBarrel01.blend1 similarity index 100% rename from Assets/Models/Battleships/smallBarrel01.blend1 rename to Assets/Models/Units/Battleships/smallBarrel01.blend1 diff --git a/Assets/Models/Battleships/smallBarrel01.x b/Assets/Models/Units/Battleships/smallBarrel01.x similarity index 100% rename from Assets/Models/Battleships/smallBarrel01.x rename to Assets/Models/Units/Battleships/smallBarrel01.x diff --git a/Assets/Models/Battleships/smallMantlet00.blend b/Assets/Models/Units/Battleships/smallMantlet00.blend similarity index 100% rename from Assets/Models/Battleships/smallMantlet00.blend rename to Assets/Models/Units/Battleships/smallMantlet00.blend diff --git a/Assets/Models/Battleships/smallMantlet00.x b/Assets/Models/Units/Battleships/smallMantlet00.x similarity index 100% rename from Assets/Models/Battleships/smallMantlet00.x rename to Assets/Models/Units/Battleships/smallMantlet00.x diff --git a/Assets/Models/Battleships/smallMantlet01.blend b/Assets/Models/Units/Battleships/smallMantlet01.blend similarity index 100% rename from Assets/Models/Battleships/smallMantlet01.blend rename to Assets/Models/Units/Battleships/smallMantlet01.blend diff --git a/Assets/Models/Battleships/smallMantlet01.blend1 b/Assets/Models/Units/Battleships/smallMantlet01.blend1 similarity index 100% rename from Assets/Models/Battleships/smallMantlet01.blend1 rename to Assets/Models/Units/Battleships/smallMantlet01.blend1 diff --git a/Assets/Models/Battleships/smallMantlet01.x b/Assets/Models/Units/Battleships/smallMantlet01.x similarity index 100% rename from Assets/Models/Battleships/smallMantlet01.x rename to Assets/Models/Units/Battleships/smallMantlet01.x diff --git a/Assets/Models/Battleships/smallTurret00.blend b/Assets/Models/Units/Battleships/smallTurret00.blend similarity index 100% rename from Assets/Models/Battleships/smallTurret00.blend rename to Assets/Models/Units/Battleships/smallTurret00.blend diff --git a/Assets/Models/Battleships/smallTurret00.x b/Assets/Models/Units/Battleships/smallTurret00.x similarity index 100% rename from Assets/Models/Battleships/smallTurret00.x rename to Assets/Models/Units/Battleships/smallTurret00.x diff --git a/Assets/Models/Battleships/smallTurret01.blend b/Assets/Models/Units/Battleships/smallTurret01.blend similarity index 100% rename from Assets/Models/Battleships/smallTurret01.blend rename to Assets/Models/Units/Battleships/smallTurret01.blend diff --git a/Assets/Models/Battleships/smallTurret01.blend1 b/Assets/Models/Units/Battleships/smallTurret01.blend1 similarity index 100% rename from Assets/Models/Battleships/smallTurret01.blend1 rename to Assets/Models/Units/Battleships/smallTurret01.blend1 diff --git a/Assets/Models/Battleships/smallTurret01.x b/Assets/Models/Units/Battleships/smallTurret01.x similarity index 100% rename from Assets/Models/Battleships/smallTurret01.x rename to Assets/Models/Units/Battleships/smallTurret01.x diff --git a/Assets/Models/Battleships/turret00.blend b/Assets/Models/Units/Battleships/turret00.blend similarity index 100% rename from Assets/Models/Battleships/turret00.blend rename to Assets/Models/Units/Battleships/turret00.blend diff --git a/Assets/Models/Cruisers/barrel00.blend b/Assets/Models/Units/Cruisers/barrel00.blend similarity index 100% rename from Assets/Models/Cruisers/barrel00.blend rename to Assets/Models/Units/Cruisers/barrel00.blend diff --git a/Assets/Models/Cruisers/barrel00.x b/Assets/Models/Units/Cruisers/barrel00.x similarity index 100% rename from Assets/Models/Cruisers/barrel00.x rename to Assets/Models/Units/Cruisers/barrel00.x diff --git a/Assets/Models/Cruisers/barrel01.blend b/Assets/Models/Units/Cruisers/barrel01.blend similarity index 100% rename from Assets/Models/Cruisers/barrel01.blend rename to Assets/Models/Units/Cruisers/barrel01.blend diff --git a/Assets/Models/Cruisers/barrel01.blend1 b/Assets/Models/Units/Cruisers/barrel01.blend1 similarity index 100% rename from Assets/Models/Cruisers/barrel01.blend1 rename to Assets/Models/Units/Cruisers/barrel01.blend1 diff --git a/Assets/Models/Cruisers/barrel01.x b/Assets/Models/Units/Cruisers/barrel01.x similarity index 100% rename from Assets/Models/Cruisers/barrel01.x rename to Assets/Models/Units/Cruisers/barrel01.x diff --git a/Assets/Models/Cruisers/cruiser00.blend b/Assets/Models/Units/Cruisers/cruiser00.blend similarity index 100% rename from Assets/Models/Cruisers/cruiser00.blend rename to Assets/Models/Units/Cruisers/cruiser00.blend diff --git a/Assets/Models/Cruisers/cruiser01.blend b/Assets/Models/Units/Cruisers/cruiser01.blend similarity index 100% rename from Assets/Models/Cruisers/cruiser01.blend rename to Assets/Models/Units/Cruisers/cruiser01.blend diff --git a/Assets/Models/Cruisers/cruiser01.blend1 b/Assets/Models/Units/Cruisers/cruiser01.blend1 similarity index 100% rename from Assets/Models/Cruisers/cruiser01.blend1 rename to Assets/Models/Units/Cruisers/cruiser01.blend1 diff --git a/Assets/Models/Cruisers/hull00.blend b/Assets/Models/Units/Cruisers/hull00.blend similarity index 100% rename from Assets/Models/Cruisers/hull00.blend rename to Assets/Models/Units/Cruisers/hull00.blend diff --git a/Assets/Models/Cruisers/hull00.x b/Assets/Models/Units/Cruisers/hull00.x similarity index 100% rename from Assets/Models/Cruisers/hull00.x rename to Assets/Models/Units/Cruisers/hull00.x diff --git a/Assets/Models/Cruisers/hull01.blend b/Assets/Models/Units/Cruisers/hull01.blend similarity index 100% rename from Assets/Models/Cruisers/hull01.blend rename to Assets/Models/Units/Cruisers/hull01.blend diff --git a/Assets/Models/Cruisers/hull01.blend1 b/Assets/Models/Units/Cruisers/hull01.blend1 similarity index 100% rename from Assets/Models/Cruisers/hull01.blend1 rename to Assets/Models/Units/Cruisers/hull01.blend1 diff --git a/Assets/Models/Cruisers/hull01.x b/Assets/Models/Units/Cruisers/hull01.x similarity index 100% rename from Assets/Models/Cruisers/hull01.x rename to Assets/Models/Units/Cruisers/hull01.x diff --git a/Assets/Models/Cruisers/mantlet00.blend b/Assets/Models/Units/Cruisers/mantlet00.blend similarity index 100% rename from Assets/Models/Cruisers/mantlet00.blend rename to Assets/Models/Units/Cruisers/mantlet00.blend diff --git a/Assets/Models/Cruisers/mantlet00.x b/Assets/Models/Units/Cruisers/mantlet00.x similarity index 100% rename from Assets/Models/Cruisers/mantlet00.x rename to Assets/Models/Units/Cruisers/mantlet00.x diff --git a/Assets/Models/Cruisers/mantlet01.blend b/Assets/Models/Units/Cruisers/mantlet01.blend similarity index 100% rename from Assets/Models/Cruisers/mantlet01.blend rename to Assets/Models/Units/Cruisers/mantlet01.blend diff --git a/Assets/Models/Cruisers/mantlet01.blend1 b/Assets/Models/Units/Cruisers/mantlet01.blend1 similarity index 100% rename from Assets/Models/Cruisers/mantlet01.blend1 rename to Assets/Models/Units/Cruisers/mantlet01.blend1 diff --git a/Assets/Models/Cruisers/mantlet01.x b/Assets/Models/Units/Cruisers/mantlet01.x similarity index 100% rename from Assets/Models/Cruisers/mantlet01.x rename to Assets/Models/Units/Cruisers/mantlet01.x diff --git a/Assets/Models/Cruisers/turret00.blend b/Assets/Models/Units/Cruisers/turret00.blend similarity index 100% rename from Assets/Models/Cruisers/turret00.blend rename to Assets/Models/Units/Cruisers/turret00.blend diff --git a/Assets/Models/Cruisers/turret00.x b/Assets/Models/Units/Cruisers/turret00.x similarity index 100% rename from Assets/Models/Cruisers/turret00.x rename to Assets/Models/Units/Cruisers/turret00.x diff --git a/Assets/Models/Cruisers/turret01.blend b/Assets/Models/Units/Cruisers/turret01.blend similarity index 100% rename from Assets/Models/Cruisers/turret01.blend rename to Assets/Models/Units/Cruisers/turret01.blend diff --git a/Assets/Models/Cruisers/turret01.blend1 b/Assets/Models/Units/Cruisers/turret01.blend1 similarity index 100% rename from Assets/Models/Cruisers/turret01.blend1 rename to Assets/Models/Units/Cruisers/turret01.blend1 diff --git a/Assets/Models/Cruisers/turret01.x b/Assets/Models/Units/Cruisers/turret01.x similarity index 100% rename from Assets/Models/Cruisers/turret01.x rename to Assets/Models/Units/Cruisers/turret01.x diff --git a/Assets/Models/Depth charge/depthCharge.blend b/Assets/Models/Units/Depth charge/depthCharge.blend similarity index 100% rename from Assets/Models/Depth charge/depthCharge.blend rename to Assets/Models/Units/Depth charge/depthCharge.blend diff --git a/Assets/Models/Depth charge/depthCharge.blend1 b/Assets/Models/Units/Depth charge/depthCharge.blend1 similarity index 100% rename from Assets/Models/Depth charge/depthCharge.blend1 rename to Assets/Models/Units/Depth charge/depthCharge.blend1 diff --git a/Assets/Models/Depth charge/depthCharge.x b/Assets/Models/Units/Depth charge/depthCharge.x similarity index 100% rename from Assets/Models/Depth charge/depthCharge.x rename to Assets/Models/Units/Depth charge/depthCharge.x diff --git a/Assets/Models/Destroyers/barrel00.blend b/Assets/Models/Units/Destroyers/barrel00.blend similarity index 100% rename from Assets/Models/Destroyers/barrel00.blend rename to Assets/Models/Units/Destroyers/barrel00.blend diff --git a/Assets/Models/Destroyers/barrel00.x b/Assets/Models/Units/Destroyers/barrel00.x similarity index 100% rename from Assets/Models/Destroyers/barrel00.x rename to Assets/Models/Units/Destroyers/barrel00.x diff --git a/Assets/Models/Destroyers/barrel01.blend b/Assets/Models/Units/Destroyers/barrel01.blend similarity index 100% rename from Assets/Models/Destroyers/barrel01.blend rename to Assets/Models/Units/Destroyers/barrel01.blend diff --git a/Assets/Models/Destroyers/barrel01.blend1 b/Assets/Models/Units/Destroyers/barrel01.blend1 similarity index 100% rename from Assets/Models/Destroyers/barrel01.blend1 rename to Assets/Models/Units/Destroyers/barrel01.blend1 diff --git a/Assets/Models/Destroyers/barrel01.x b/Assets/Models/Units/Destroyers/barrel01.x similarity index 100% rename from Assets/Models/Destroyers/barrel01.x rename to Assets/Models/Units/Destroyers/barrel01.x diff --git a/Assets/Models/Destroyers/destroyer00.blend b/Assets/Models/Units/Destroyers/destroyer00.blend similarity index 100% rename from Assets/Models/Destroyers/destroyer00.blend rename to Assets/Models/Units/Destroyers/destroyer00.blend diff --git a/Assets/Models/Destroyers/destroyer01.blend b/Assets/Models/Units/Destroyers/destroyer01.blend similarity index 100% rename from Assets/Models/Destroyers/destroyer01.blend rename to Assets/Models/Units/Destroyers/destroyer01.blend diff --git a/Assets/Models/Destroyers/destroyer01.blend1 b/Assets/Models/Units/Destroyers/destroyer01.blend1 similarity index 100% rename from Assets/Models/Destroyers/destroyer01.blend1 rename to Assets/Models/Units/Destroyers/destroyer01.blend1 diff --git a/Assets/Models/Destroyers/hull00.blend b/Assets/Models/Units/Destroyers/hull00.blend similarity index 100% rename from Assets/Models/Destroyers/hull00.blend rename to Assets/Models/Units/Destroyers/hull00.blend diff --git a/Assets/Models/Destroyers/hull00.x b/Assets/Models/Units/Destroyers/hull00.x similarity index 100% rename from Assets/Models/Destroyers/hull00.x rename to Assets/Models/Units/Destroyers/hull00.x diff --git a/Assets/Models/Destroyers/hull01.blend b/Assets/Models/Units/Destroyers/hull01.blend similarity index 100% rename from Assets/Models/Destroyers/hull01.blend rename to Assets/Models/Units/Destroyers/hull01.blend diff --git a/Assets/Models/Destroyers/hull01.blend1 b/Assets/Models/Units/Destroyers/hull01.blend1 similarity index 100% rename from Assets/Models/Destroyers/hull01.blend1 rename to Assets/Models/Units/Destroyers/hull01.blend1 diff --git a/Assets/Models/Destroyers/hull01.x b/Assets/Models/Units/Destroyers/hull01.x similarity index 100% rename from Assets/Models/Destroyers/hull01.x rename to Assets/Models/Units/Destroyers/hull01.x diff --git a/Assets/Models/Destroyers/mantlet00.blend b/Assets/Models/Units/Destroyers/mantlet00.blend similarity index 100% rename from Assets/Models/Destroyers/mantlet00.blend rename to Assets/Models/Units/Destroyers/mantlet00.blend diff --git a/Assets/Models/Destroyers/mantlet00.x b/Assets/Models/Units/Destroyers/mantlet00.x similarity index 100% rename from Assets/Models/Destroyers/mantlet00.x rename to Assets/Models/Units/Destroyers/mantlet00.x diff --git a/Assets/Models/Destroyers/mantlet01.blend b/Assets/Models/Units/Destroyers/mantlet01.blend similarity index 100% rename from Assets/Models/Destroyers/mantlet01.blend rename to Assets/Models/Units/Destroyers/mantlet01.blend diff --git a/Assets/Models/Destroyers/mantlet01.blend1 b/Assets/Models/Units/Destroyers/mantlet01.blend1 similarity index 100% rename from Assets/Models/Destroyers/mantlet01.blend1 rename to Assets/Models/Units/Destroyers/mantlet01.blend1 diff --git a/Assets/Models/Destroyers/mantlet01.x b/Assets/Models/Units/Destroyers/mantlet01.x similarity index 100% rename from Assets/Models/Destroyers/mantlet01.x rename to Assets/Models/Units/Destroyers/mantlet01.x diff --git a/Assets/Models/Destroyers/shell.blend b/Assets/Models/Units/Destroyers/shell.blend similarity index 100% rename from Assets/Models/Destroyers/shell.blend rename to Assets/Models/Units/Destroyers/shell.blend diff --git a/Assets/Models/Destroyers/turret00.blend b/Assets/Models/Units/Destroyers/turret00.blend similarity index 100% rename from Assets/Models/Destroyers/turret00.blend rename to Assets/Models/Units/Destroyers/turret00.blend diff --git a/Assets/Models/Destroyers/turret00.x b/Assets/Models/Units/Destroyers/turret00.x similarity index 100% rename from Assets/Models/Destroyers/turret00.x rename to Assets/Models/Units/Destroyers/turret00.x diff --git a/Assets/Models/Destroyers/turret01.blend b/Assets/Models/Units/Destroyers/turret01.blend similarity index 100% rename from Assets/Models/Destroyers/turret01.blend rename to Assets/Models/Units/Destroyers/turret01.blend diff --git a/Assets/Models/Destroyers/turret01.blend1 b/Assets/Models/Units/Destroyers/turret01.blend1 similarity index 100% rename from Assets/Models/Destroyers/turret01.blend1 rename to Assets/Models/Units/Destroyers/turret01.blend1 diff --git a/Assets/Models/Destroyers/turret01.x b/Assets/Models/Units/Destroyers/turret01.x similarity index 100% rename from Assets/Models/Destroyers/turret01.x rename to Assets/Models/Units/Destroyers/turret01.x diff --git a/Assets/Models/Guided missile/guidedMissile.blend b/Assets/Models/Units/Guided missile/guidedMissile.blend similarity index 100% rename from Assets/Models/Guided missile/guidedMissile.blend rename to Assets/Models/Units/Guided missile/guidedMissile.blend diff --git a/Assets/Models/Guided missile/guidedMissile.blend1 b/Assets/Models/Units/Guided missile/guidedMissile.blend1 similarity index 100% rename from Assets/Models/Guided missile/guidedMissile.blend1 rename to Assets/Models/Units/Guided missile/guidedMissile.blend1 diff --git a/Assets/Models/Guided missile/guidedMissile.x b/Assets/Models/Units/Guided missile/guidedMissile.x similarity index 100% rename from Assets/Models/Guided missile/guidedMissile.x rename to Assets/Models/Units/Guided missile/guidedMissile.x diff --git a/Assets/Models/Jets/aam.x b/Assets/Models/Units/Jets/aam.x similarity index 100% rename from Assets/Models/Jets/aam.x rename to Assets/Models/Units/Jets/aam.x diff --git a/Assets/Models/Jets/aam00.blend b/Assets/Models/Units/Jets/aam00.blend similarity index 100% rename from Assets/Models/Jets/aam00.blend rename to Assets/Models/Units/Jets/aam00.blend diff --git a/Assets/Models/Jets/awm.x b/Assets/Models/Units/Jets/awm.x similarity index 100% rename from Assets/Models/Jets/awm.x rename to Assets/Models/Units/Jets/awm.x diff --git a/Assets/Models/Jets/awm00.blend b/Assets/Models/Units/Jets/awm00.blend similarity index 100% rename from Assets/Models/Jets/awm00.blend rename to Assets/Models/Units/Jets/awm00.blend diff --git a/Assets/Models/Jets/jet00.blend b/Assets/Models/Units/Jets/jet00.blend similarity index 100% rename from Assets/Models/Jets/jet00.blend rename to Assets/Models/Units/Jets/jet00.blend diff --git a/Assets/Models/Jets/jet00.mtl b/Assets/Models/Units/Jets/jet00.mtl similarity index 100% rename from Assets/Models/Jets/jet00.mtl rename to Assets/Models/Units/Jets/jet00.mtl diff --git a/Assets/Models/Jets/jet00.obj b/Assets/Models/Units/Jets/jet00.obj similarity index 100% rename from Assets/Models/Jets/jet00.obj rename to Assets/Models/Units/Jets/jet00.obj diff --git a/Assets/Models/Jets/jet00.x b/Assets/Models/Units/Jets/jet00.x similarity index 100% rename from Assets/Models/Jets/jet00.x rename to Assets/Models/Units/Jets/jet00.x diff --git a/Assets/Models/Jets/jet01.blend b/Assets/Models/Units/Jets/jet01.blend similarity index 100% rename from Assets/Models/Jets/jet01.blend rename to Assets/Models/Units/Jets/jet01.blend diff --git a/Assets/Models/Jets/jet01.x b/Assets/Models/Units/Jets/jet01.x similarity index 100% rename from Assets/Models/Jets/jet01.x rename to Assets/Models/Units/Jets/jet01.x diff --git a/Assets/Models/Jets/jet02.blend b/Assets/Models/Units/Jets/jet02.blend similarity index 100% rename from Assets/Models/Jets/jet02.blend rename to Assets/Models/Units/Jets/jet02.blend diff --git a/Assets/Models/Shell/shell.blend b/Assets/Models/Units/Shell/shell.blend similarity index 100% rename from Assets/Models/Shell/shell.blend rename to Assets/Models/Units/Shell/shell.blend diff --git a/Assets/Models/Shell/shell.blend1 b/Assets/Models/Units/Shell/shell.blend1 similarity index 100% rename from Assets/Models/Shell/shell.blend1 rename to Assets/Models/Units/Shell/shell.blend1 diff --git a/Assets/Models/Shell/shell.x b/Assets/Models/Units/Shell/shell.x similarity index 100% rename from Assets/Models/Shell/shell.x rename to Assets/Models/Units/Shell/shell.x diff --git a/Assets/Models/Submarines/hull.x b/Assets/Models/Units/Submarines/hull.x similarity index 100% rename from Assets/Models/Submarines/hull.x rename to Assets/Models/Units/Submarines/hull.x diff --git a/Assets/Models/Submarines/submarine.blend b/Assets/Models/Units/Submarines/submarine.blend similarity index 100% rename from Assets/Models/Submarines/submarine.blend rename to Assets/Models/Units/Submarines/submarine.blend diff --git a/Assets/Models/Submarines/submarine.blend1 b/Assets/Models/Units/Submarines/submarine.blend1 similarity index 100% rename from Assets/Models/Submarines/submarine.blend1 rename to Assets/Models/Units/Submarines/submarine.blend1 diff --git a/Assets/Models/Submarines/torpedo.blend1 b/Assets/Models/Units/Submarines/torpedo.blend1 similarity index 100% rename from Assets/Models/Submarines/torpedo.blend1 rename to Assets/Models/Units/Submarines/torpedo.blend1 diff --git a/Assets/Models/Torpedo/torpedo.blend b/Assets/Models/Units/Torpedo/torpedo.blend similarity index 100% rename from Assets/Models/Torpedo/torpedo.blend rename to Assets/Models/Units/Torpedo/torpedo.blend diff --git a/Assets/Models/Torpedo/torpedo.blend1 b/Assets/Models/Units/Torpedo/torpedo.blend1 similarity index 100% rename from Assets/Models/Torpedo/torpedo.blend1 rename to Assets/Models/Units/Torpedo/torpedo.blend1 diff --git a/Assets/Models/Torpedo/torpedo.x b/Assets/Models/Units/Torpedo/torpedo.x similarity index 100% rename from Assets/Models/Torpedo/torpedo.x rename to Assets/Models/Units/Torpedo/torpedo.x diff --git a/CMakeLists.txt b/CMakeLists.txt index ca928b5..aabb59d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ add_executable(${GAME_NAME} ${states} ${gui} ${core} ${content} ${util}) target_include_directories(${GAME_NAME} PUBLIC ${FREETYPE_DIR}/include) +include_directories(external/tinydir) include_directories(external/vb01Gui/external/vb01/external/glm) include_directories(external/vb01Gui/external/vb01/external/glm/glm) diff --git a/external/tinydir b/external/tinydir new file mode 160000 index 0000000..9f866c1 --- /dev/null +++ b/external/tinydir @@ -0,0 +1 @@ +Subproject commit 9f866c1ec09e62aa4df50d7209556ed705a4dd90 diff --git a/util.cpp b/util.cpp index 3a7ad5b..0f87a13 100755 --- a/util.cpp +++ b/util.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include "util.h" #include "gameManager.h" #include "guiAppState.h" @@ -107,10 +109,30 @@ namespace battleship{ factions.push_back("0"); factions.push_back("1"); + tinydir_dir dir; + int i; + tinydir_open_sorted(&dir, (PATH + "Models/Maps").c_str()); + vector folders; + + for (i = 0; i < dir.n_files; i++) { + tinydir_file file; + tinydir_readfile_n(&dir, &file, i); + + if (file.is_dir && file.name[0] != '.') + folders.push_back(file.name); + + cout << "\n"; + } + + tinydir_close(&dir); + string font = PATH + "Fonts/batang.ttf"; Listbox *cpuDifficulty = new Listbox(Vector2(pos.x, pos.y + 30), Vector2(100, 20), difficulties, 3, font); Listbox *cpuFaction = new Listbox(Vector2(pos.x + 110, pos.y + 30), Vector2(100, 20), factions, 2, font); Listbox *playerFaction = new Listbox(Vector2(pos.x + 110, pos.y), Vector2(100, 20), factions, 2, font); + int numMinDirs = 3; + int numShowDirs = folders.size() < numMinDirs ? folders.size() : numMinDirs; + Listbox *map = new Listbox(Vector2(pos.x + 110, pos.y + 100), Vector2(100, 20), folders, numShowDirs, font); Listbox **difficultyListboxes=new Listbox*[1]; Listbox **factionListboxes=new Listbox*[2]; @@ -126,9 +148,11 @@ namespace battleship{ state->addListbox(cpuDifficulty); state->addListbox(cpuFaction); state->addListbox(playerFaction); + state->addListbox(map); state->removeButton("Options"); state->removeButton("Exit"); state->removeButton("Singleplayer"); + } private: GuiAppState *state;