From 919d6155e5c0a135b67c2b68ad60d704cba33015 Mon Sep 17 00:00:00 2001 From: devZoGok Date: Sat, 3 Dec 2022 17:17:11 +0200 Subject: [PATCH] minor refactoring --- Assets/Scripts/vehicleData.lua | 278 --------------------------------- inGameAppState.cpp | 7 +- 2 files changed, 6 insertions(+), 279 deletions(-) diff --git a/Assets/Scripts/vehicleData.lua b/Assets/Scripts/vehicleData.lua index bb88499..adbbfa7 100644 --- a/Assets/Scripts/vehicleData.lua +++ b/Assets/Scripts/vehicleData.lua @@ -1,282 +1,4 @@ -numUnits = 3 - -UnitClass = {VESSEL = 0, DESTROYER = 1, CRUISER = 2, AIRCRAFT_CARRIER = 3, SUBMARINE = 4, MISSILE_JET = 5, DEMO_JET = 6, SAMPLE_STRUCTURE = 7}; - -UnitType = {UNDERWATER = 0, SEA_LEVEL = 1, LAND = 2, AIR = 3}; - -unitClass = { - UnitClass.VESSEL, UnitClass.VESSEL, - UnitClass.SAMPLE_STRUCTURE, UnitClass.DESTROYER, - UnitClass.CRUISER, UnitClass.CRUISER, - UnitClass.AIRCRAFT_CARRIER, UnitClass.AIRCRAFT_CARRIER, - UnitClass.SUBMARINE, - UnitClass.MISSILE_JET, UnitClass.DEMO_JET -}; - -unitType = { - UnitType.SEA_LEVEL, UnitType.UNDERWATER, - UnitType.LAND, UnitType.SEA_LEVEL, - UnitType.SEA_LEVEL, UnitType.SEA_LEVEL, - UnitType.SEA_LEVEL, UnitType.SEA_LEVEL, - UnitType.UNDERWATER, - UnitType.AIR, UnitType.AIR -} - speed = {.025, .025, .05, .05, .1, .1, .1, .1, .1, .1, .15} destinationOffset = {.75, .75, 1, 1, .1, .1, .1, .1, .1, .5, .5} anglePrecision = {.1, .1, .1, .1, .1, .1, .1, .1, .1, 3, 3} maxTurnAngle = {.1, .1, .5, .5, 1, 1, .5, .5, 1, 2, 2} - -unitCornerPoints = { - { - {x = .9, y = -1, z = -6}, - {x = -.9, y = -1, z = -6}, - {x = -.9, y = -1, z = 5.8}, - {x = .9, y = -1, z = 5.8}, - {x = .9, y = 3.5, z = -6}, - {x = -.9, y = 3.5, z = -6}, - {x = -.9, y = 3.5, z = 5.8}, - {x = .9, y = 3.5, z = 5.8} - }, - { - {x = .5, y = -.5, z = -7.05}, - {x = -.5, y = -.5, z = -7.05}, - {x = -.5, y = -.5, z = 6.4}, - {x = .5, y = -.5, z = 6.4}, - {x = .5, y = 3, z = -7.05}, - {x = -.5, y = 3, z = -7.05}, - {x = -.5, y = 3, z = 6.4}, - {x = .5, y = 3, z = 6.4} - }, - { - {x = .5, y = -.5, z = -3.4}, - {x = -.5, y = -.5, z = -3.4}, - {x = -.5, y = -.5, z = 3.4}, - {x = .5, y = -.4, z = 3.4}, - {x = .5, y = 2.1, z = -3.4}, - {x = -.5, y = 2, z = -3.4}, - {x = -.5, y = 2, z = 3.4}, - {x = .5, y = 2, z = 3.4} - }, - { - {x = .5, y = -.25, z = -4.8}, - {x = -.5, y = -.25, z = -4.8}, - {x = -.5, y = -.25, z = 4.7}, - {x = .5, y = -.25, z = 4.7}, - {x = .5, y = .8, z = -4.8}, - {x = -.5, y = .8, z = -4.8}, - {x = -.5, y = .8, z = 4.7}, - {x = .5, y = .8, z = 4.7} - }, - { - {x = .7, y = -.3, z = -4}, - {x = -.7, y = -.3, z = -4}, - {x = -.7, y = -.3, z = 3.4}, - {x = .7, y = -.3, z = 3.4}, - {x = .7, y = 2.9, z = -4}, - {x = -.7, y = 2.9, z = -4}, - {x = -.7, y = 2.9, z = 3.4}, - {x = .7, y = 2.9, z = 3.4} - }, - { - {x = .5, y = -.5, z = -6.1}, - {x = -.5, y = -.5, z = -6.1}, - {x = -.5, y = -.5, z = 5.2}, - {x = .5, y = -.5, z = 5.2}, - {x = .5, y = 2.2, z = -6.1}, - {x = -.5, y = 2.2, z = -6.1}, - {x = -.5, y = 2.2, z = 5.2}, - {x = .5, y = 2.2, z = 5.2} - }, - { - {x = 2, y = -.5, z = -10}, - {x = -2, y = -.5, z = -10}, - {x = -2, y = -.5, z = 9}, - {x = 2, y = -.5, z = 9}, - {x = 2, y = 5.5, z = -10}, - {x = -2, y = 5.5, z = -10}, - {x = -2, y = 5.5, z = 9}, - {x = 2, y = 5.5, z = 9} - }, - { - {x = 2, y = -1, z = -10}, - {x = -2, y = -1, z = -10}, - {x = -2, y = -1, z = 9}, - {x = 2, y = -1, z = 9}, - {x = 2, y = 4.5, z = -10}, - {x = -2, y = 4.5, z = -10}, - {x = -2, y = 4.5, z = 9}, - {x = 2, y = 4.5, z = 9} - }, - { - {x = .25, y = -.5, z = -2}, - {x = -.25, y = -.5, z = -2}, - {x = -.25, y = -.5, z = 3}, - {x = .25, y = -.5, z = 3}, - {x = .25, y = .7, z = -2}, - {x = -.25, y = .7, z = -2}, - {x = -.25, y = .7, z = 3}, - {x = .25, y = .7, z = 3} - }, - { - {x = .6, y =-.1, z =-1.3}, - {x = -.6, y =-.1, z =-1.3}, - {x = -.6, y =-.1, z =.8}, - {x = .6, y =-.1, z =.8}, - {x = .6, y =.3, z =-1.3}, - {x = -.6, y =.3, z =-1.3}, - {x = -.6, y =.3, z =.8}, - {x = .6, y =.3, z =.8} - }, - { - {x = .5, y =-.1, z =-1.3}, - {x = -.5, y =-.1, z =-1.3}, - {x = -.5, y =-.1, z =.7}, - {x = .5, y =-.1, z =.7}, - {x = .5, y =.15, z =-1.3}, - {x = -.5, y =.15, z =-1.3}, - {x = -.5, y =.15, z =.7}, - {x = .5, y =.15, z =.7} - } -}; -unitCuboidDimensions = { - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1}, - {x = 1, y = 1, z = 1} - }, - { - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1} - }, - { - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1} - }, - { - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1}, - {x = .1, y = .1, z = .1} - } -}; - -unitAxisLength = {8, 8,6,6,5, 5,8, 8, 7,2,2} -lineOfSight = {5, 8, 4, 4, 3, 3, 6, 6, 3, 3, 8} -name = { - "Battleship", "Battleship", - "Sample", "Destroyer", - "Cruiser", "Cruiser", - "Aircraft carrier", "Aircraft carrier", - "Submarine", - "Jet", "Jet" -} -meshPath = { - "battleship00.xml", "battleship00.xml", - "sample.xml", "destroyer01.xml", - "cruiser00.xml", "cruiser01.xml", - "aircraftCarrier00.xml", "aircraftCarrier01.xml", - "submarine.xml", - "jet00.xml", "jet01.xml" -} -vehiclePrefix = "Models/Units/Vehicles/" -structurePrefix = "Models/Units/Structures/" -basePath = { - PATH .. vehiclePrefix .. "Battleships/", PATH .. vehiclePrefix .. "Battleships/", - PATH .. structurePrefix .. "Sample/", PATH .. vehiclePrefix .. "Destroyers/", - PATH .. vehiclePrefix .. "Cruisers/", PATH .. vehiclePrefix .. "Cruisers/", - PATH .. vehiclePrefix .. "Aircraft carriers/", PATH .. vehiclePrefix .. "Aircraft carriers/", - PATH .. vehiclePrefix .. "Submarines/", - PATH .. vehiclePrefix .. "Jets/", PATH .. vehiclePrefix .. "Jets/" -}; diff --git a/inGameAppState.cpp b/inGameAppState.cpp index b17e70e..e8f2a77 100755 --- a/inGameAppState.cpp +++ b/inGameAppState.cpp @@ -263,7 +263,12 @@ namespace battleship{ void InGameAppState::loadModels(){ LuaManager *lm = LuaManager::getSingleton(); string pathBase = GameManager::getSingleton()->getPath() + "Scripts/"; - lm->buildScript(vector{pathBase + "defPaths.lua", pathBase + "unitData.lua"}); + lm->buildScript(vector{ + pathBase + "defPaths.lua", + pathBase + "unitData.lua", + pathBase + "vehicleData.lua", + pathBase + "structureData.lua" + }); int numUnits = lm->getInt("numUnits"); modelPaths.clear();