Changeset View
Changeset View
Standalone View
Standalone View
source/graphics/MapReader.cpp
| Show All 22 Lines | |||||
| #include "graphics/CinemaManager.h" | #include "graphics/CinemaManager.h" | ||||
| #include "graphics/Entity.h" | #include "graphics/Entity.h" | ||||
| #include "graphics/GameView.h" | #include "graphics/GameView.h" | ||||
| #include "graphics/MapGenerator.h" | #include "graphics/MapGenerator.h" | ||||
| #include "graphics/Patch.h" | #include "graphics/Patch.h" | ||||
| #include "graphics/Terrain.h" | #include "graphics/Terrain.h" | ||||
| #include "graphics/TerrainTextureEntry.h" | #include "graphics/TerrainTextureEntry.h" | ||||
| #include "graphics/TerrainTextureManager.h" | #include "graphics/TerrainTextureManager.h" | ||||
| #include "graphics/Water.h" | |||||
| #include "lib/timer.h" | #include "lib/timer.h" | ||||
| #include "lib/external_libraries/libsdl.h" | #include "lib/external_libraries/libsdl.h" | ||||
| #include "maths/MathUtil.h" | #include "maths/MathUtil.h" | ||||
| #include "ps/CLogger.h" | #include "ps/CLogger.h" | ||||
| #include "ps/Loader.h" | #include "ps/Loader.h" | ||||
| #include "ps/LoaderThunks.h" | #include "ps/LoaderThunks.h" | ||||
| #include "ps/World.h" | #include "ps/World.h" | ||||
| #include "ps/XML/Xeromyces.h" | #include "ps/XML/Xeromyces.h" | ||||
| #include "renderer/PostprocManager.h" | #include "renderer/PostprocManager.h" | ||||
| #include "renderer/SkyManager.h" | #include "renderer/SkyManager.h" | ||||
| #include "renderer/WaterManager.h" | |||||
| #include "scriptinterface/Object.h" | #include "scriptinterface/Object.h" | ||||
| #include "scriptinterface/ScriptContext.h" | #include "scriptinterface/ScriptContext.h" | ||||
| #include "scriptinterface/ScriptRequest.h" | #include "scriptinterface/ScriptRequest.h" | ||||
| #include "scriptinterface/JSON.h" | #include "scriptinterface/JSON.h" | ||||
| #include "simulation2/Simulation2.h" | #include "simulation2/Simulation2.h" | ||||
| #include "simulation2/components/ICmpCinemaManager.h" | #include "simulation2/components/ICmpCinemaManager.h" | ||||
| #include "simulation2/components/ICmpGarrisonHolder.h" | #include "simulation2/components/ICmpGarrisonHolder.h" | ||||
| #include "simulation2/components/ICmpObstruction.h" | #include "simulation2/components/ICmpObstruction.h" | ||||
| Show All 16 Lines | |||||
| CMapReader::CMapReader() | CMapReader::CMapReader() | ||||
| : xml_reader(0), m_PatchesPerSide(0), m_MapGen(0) | : xml_reader(0), m_PatchesPerSide(0), m_MapGen(0) | ||||
| { | { | ||||
| cur_terrain_tex = 0; // important - resets generator state | cur_terrain_tex = 0; // important - resets generator state | ||||
| } | } | ||||
| // LoadMap: try to load the map from given file; reinitialise the scene to new data if successful | // LoadMap: try to load the map from given file; reinitialise the scene to new data if successful | ||||
| void CMapReader::LoadMap(const VfsPath& pathname, const ScriptContext& cx, JS::HandleValue settings, CTerrain *pTerrain_, | void CMapReader::LoadMap(const VfsPath& pathname, const ScriptContext& cx, JS::HandleValue settings, CTerrain *pTerrain_, | ||||
| WaterManager* pWaterMan_, SkyManager* pSkyMan_, | CWater* pWater_, SkyManager* pSkyMan_, | ||||
| CLightEnv *pLightEnv_, CGameView *pGameView_, CCinemaManager* pCinema_, CTriggerManager* pTrigMan_, CPostprocManager* pPostproc_, | CLightEnv *pLightEnv_, CGameView *pGameView_, CCinemaManager* pCinema_, CTriggerManager* pTrigMan_, CPostprocManager* pPostproc_, | ||||
| CSimulation2 *pSimulation2_, const CSimContext* pSimContext_, int playerID_, bool skipEntities) | CSimulation2 *pSimulation2_, const CSimContext* pSimContext_, int playerID_, bool skipEntities) | ||||
| { | { | ||||
| pTerrain = pTerrain_; | pTerrain = pTerrain_; | ||||
| pWater = pWater_; | |||||
| pLightEnv = pLightEnv_; | pLightEnv = pLightEnv_; | ||||
| pGameView = pGameView_; | pGameView = pGameView_; | ||||
| pWaterMan = pWaterMan_; | |||||
| pSkyMan = pSkyMan_; | pSkyMan = pSkyMan_; | ||||
| pCinema = pCinema_; | pCinema = pCinema_; | ||||
| pTrigMan = pTrigMan_; | pTrigMan = pTrigMan_; | ||||
| pPostproc = pPostproc_; | pPostproc = pPostproc_; | ||||
| pSimulation2 = pSimulation2_; | pSimulation2 = pSimulation2_; | ||||
| pSimContext = pSimContext_; | pSimContext = pSimContext_; | ||||
| m_PlayerID = playerID_; | m_PlayerID = playerID_; | ||||
| m_SkipEntities = skipEntities; | m_SkipEntities = skipEntities; | ||||
| ▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines | void CMapReader::LoadMap(const VfsPath& pathname, const ScriptContext& cx, JS::HandleValue settings, CTerrain *pTerrain_, | ||||
| RegMemFun(this, &CMapReader::ApplyData, L"CMapReader::ApplyData", 5); | RegMemFun(this, &CMapReader::ApplyData, L"CMapReader::ApplyData", 5); | ||||
| // load map settings script (must be done after reading map) | // load map settings script (must be done after reading map) | ||||
| RegMemFun(this, &CMapReader::LoadMapSettings, L"CMapReader::LoadMapSettings", 5); | RegMemFun(this, &CMapReader::LoadMapSettings, L"CMapReader::LoadMapSettings", 5); | ||||
| } | } | ||||
| // LoadRandomMap: try to load the map data; reinitialise the scene to new data if successful | // LoadRandomMap: try to load the map data; reinitialise the scene to new data if successful | ||||
| void CMapReader::LoadRandomMap(const CStrW& scriptFile, const ScriptContext& cx, JS::HandleValue settings, CTerrain *pTerrain_, | void CMapReader::LoadRandomMap(const CStrW& scriptFile, const ScriptContext& cx, JS::HandleValue settings, CTerrain *pTerrain_, | ||||
| WaterManager* pWaterMan_, SkyManager* pSkyMan_, | CWater* pWater_, SkyManager* pSkyMan_, | ||||
| CLightEnv *pLightEnv_, CGameView *pGameView_, CCinemaManager* pCinema_, CTriggerManager* pTrigMan_, CPostprocManager* pPostproc_, | CLightEnv *pLightEnv_, CGameView *pGameView_, CCinemaManager* pCinema_, CTriggerManager* pTrigMan_, CPostprocManager* pPostproc_, | ||||
| CSimulation2 *pSimulation2_, int playerID_) | CSimulation2 *pSimulation2_, int playerID_) | ||||
| { | { | ||||
| m_ScriptFile = scriptFile; | m_ScriptFile = scriptFile; | ||||
| pSimulation2 = pSimulation2_; | pSimulation2 = pSimulation2_; | ||||
| pSimContext = pSimulation2 ? &pSimulation2->GetSimContext() : NULL; | pSimContext = pSimulation2 ? &pSimulation2->GetSimContext() : NULL; | ||||
| m_ScriptSettings.init(cx.GetGeneralJSContext(), settings); | m_ScriptSettings.init(cx.GetGeneralJSContext(), settings); | ||||
| pTerrain = pTerrain_; | pTerrain = pTerrain_; | ||||
| pWater = pWater_; | |||||
| pLightEnv = pLightEnv_; | pLightEnv = pLightEnv_; | ||||
| pGameView = pGameView_; | pGameView = pGameView_; | ||||
| pWaterMan = pWaterMan_; | |||||
| pSkyMan = pSkyMan_; | pSkyMan = pSkyMan_; | ||||
| pCinema = pCinema_; | pCinema = pCinema_; | ||||
| pTrigMan = pTrigMan_; | pTrigMan = pTrigMan_; | ||||
| pPostproc = pPostproc_; | pPostproc = pPostproc_; | ||||
| m_PlayerID = playerID_; | m_PlayerID = playerID_; | ||||
| m_SkipEntities = false; | m_SkipEntities = false; | ||||
| m_StartingCameraTarget = INVALID_ENTITY; | m_StartingCameraTarget = INVALID_ENTITY; | ||||
| ▲ Show 20 Lines • Show All 99 Lines • ▼ Show 20 Lines | if (m_PatchesPerSide == 0) | ||||
| // we'll probably crash when trying to use this map later | // we'll probably crash when trying to use this map later | ||||
| throw PSERROR_Game_World_MapLoadFailed("Error loading map: no terrain data.\nCheck application log for details."); | throw PSERROR_Game_World_MapLoadFailed("Error loading map: no terrain data.\nCheck application log for details."); | ||||
| } | } | ||||
| if (!only_xml) | if (!only_xml) | ||||
| { | { | ||||
| // initialise the terrain | // initialise the terrain | ||||
| pTerrain->Initialize(m_PatchesPerSide, &m_Heightmap[0]); | pTerrain->Initialize(m_PatchesPerSide, &m_Heightmap[0]); | ||||
| pWater->SetMapSize(m_PatchesPerSide * PATCH_SIZE); | |||||
| if (CTerrainTextureManager::IsInitialised()) | if (CTerrainTextureManager::IsInitialised()) | ||||
| { | { | ||||
| // setup the textures on the minipatches | // setup the textures on the minipatches | ||||
| STileDesc* tileptr = &m_Tiles[0]; | STileDesc* tileptr = &m_Tiles[0]; | ||||
| for (ssize_t j=0; j<m_PatchesPerSide; j++) { | for (ssize_t j=0; j<m_PatchesPerSide; j++) { | ||||
| for (ssize_t i=0; i<m_PatchesPerSide; i++) { | for (ssize_t i=0; i<m_PatchesPerSide; i++) { | ||||
| for (ssize_t m=0; m<PATCH_SIZE; m++) { | for (ssize_t m=0; m<PATCH_SIZE; m++) { | ||||
| ▲ Show 20 Lines • Show All 272 Lines • ▼ Show 20 Lines | #undef AT | ||||
| m_MapReader.m_PatchesPerSide = patches; | m_MapReader.m_PatchesPerSide = patches; | ||||
| // Load the texture | // Load the texture | ||||
| CTerrainTextureEntry* texentry = nullptr; | CTerrainTextureEntry* texentry = nullptr; | ||||
| if (CTerrainTextureManager::IsInitialised()) | if (CTerrainTextureManager::IsInitialised()) | ||||
| texentry = g_TexMan.FindTexture(texture); | texentry = g_TexMan.FindTexture(texture); | ||||
| m_MapReader.pTerrain->Initialize(patches, NULL); | m_MapReader.pTerrain->Initialize(patches, NULL); | ||||
| m_MapReader.pWater->SetMapSize(patches * PATCH_SIZE); | |||||
| // Fill the heightmap | // Fill the heightmap | ||||
| u16* heightmap = m_MapReader.pTerrain->GetHeightMap(); | u16* heightmap = m_MapReader.pTerrain->GetHeightMap(); | ||||
| ssize_t verticesPerSide = m_MapReader.pTerrain->GetVerticesPerSide(); | ssize_t verticesPerSide = m_MapReader.pTerrain->GetVerticesPerSide(); | ||||
| for (ssize_t i = 0; i < SQR(verticesPerSide); ++i) | for (ssize_t i = 0; i < SQR(verticesPerSide); ++i) | ||||
| heightmap[i] = height; | heightmap[i] = height; | ||||
| // Fill the texture map | // Fill the texture map | ||||
| ▲ Show 20 Lines • Show All 136 Lines • ▼ Show 20 Lines | else if (element_name == el_water) | ||||
| XERO_ITER_EL(element, waterbody) | XERO_ITER_EL(element, waterbody) | ||||
| { | { | ||||
| ENSURE(waterbody.GetNodeName() == el_waterbody); | ENSURE(waterbody.GetNodeName() == el_waterbody); | ||||
| XERO_ITER_EL(waterbody, waterelement) | XERO_ITER_EL(waterbody, waterelement) | ||||
| { | { | ||||
| int water_element_name = waterelement.GetNodeName(); | int water_element_name = waterelement.GetNodeName(); | ||||
| if (water_element_name == el_height) | if (water_element_name == el_height) | ||||
| { | { | ||||
| if (m_MapReader.pWater) | |||||
| m_MapReader.pWater->SetWaterHeight(waterelement.GetText().ToFloat()); | |||||
| CmpPtr<ICmpWaterManager> cmpWaterManager(*m_MapReader.pSimContext, SYSTEM_ENTITY); | CmpPtr<ICmpWaterManager> cmpWaterManager(*m_MapReader.pSimContext, SYSTEM_ENTITY); | ||||
| ENSURE(cmpWaterManager); | ENSURE(cmpWaterManager); | ||||
| cmpWaterManager->SetWaterLevel(entity_pos_t::FromString(waterelement.GetText())); | cmpWaterManager->SetWaterLevel(entity_pos_t::FromString(waterelement.GetText())); | ||||
vladislavbelov: Looks like a duplication, are there guarantees that the heights will always match? | |||||
| continue; | continue; | ||||
| } | } | ||||
| // The rest are purely graphical effects, and should be ignored if | // The rest are purely graphical effects, and should be ignored if | ||||
| // graphics are disabled | // graphics are disabled | ||||
| if (!m_MapReader.pWaterMan) | if (!m_MapReader.pWater) | ||||
| continue; | continue; | ||||
| if (water_element_name == el_type) | if (water_element_name == el_type) | ||||
| { | { | ||||
| if (waterelement.GetText() == "default") | if (waterelement.GetText() == "default") | ||||
| m_MapReader.pWaterMan->m_WaterType = L"ocean"; | m_MapReader.pWater->m_WaterType = L"ocean"; | ||||
| else | else | ||||
| m_MapReader.pWaterMan->m_WaterType = waterelement.GetText().FromUTF8(); | m_MapReader.pWater->m_WaterType = waterelement.GetText().FromUTF8(); | ||||
| } | } | ||||
| #define READ_COLOR(el, out) \ | #define READ_COLOR(el, out) \ | ||||
| else if (water_element_name == el) \ | else if (water_element_name == el) \ | ||||
| { \ | { \ | ||||
| XMBAttributeList colorAttrs = waterelement.GetAttributes(); \ | XMBAttributeList colorAttrs = waterelement.GetAttributes(); \ | ||||
| out = CColor( \ | out = CColor( \ | ||||
| colorAttrs.GetNamedItem(at_r).ToFloat(), \ | colorAttrs.GetNamedItem(at_r).ToFloat(), \ | ||||
| colorAttrs.GetNamedItem(at_g).ToFloat(), \ | colorAttrs.GetNamedItem(at_g).ToFloat(), \ | ||||
| colorAttrs.GetNamedItem(at_b).ToFloat(), \ | colorAttrs.GetNamedItem(at_b).ToFloat(), \ | ||||
| 1.f); \ | 1.f); \ | ||||
| } | } | ||||
| #define READ_FLOAT(el, out) \ | #define READ_FLOAT(el, out) \ | ||||
| else if (water_element_name == el) \ | else if (water_element_name == el) \ | ||||
| { \ | { \ | ||||
| out = waterelement.GetText().ToFloat(); \ | out = waterelement.GetText().ToFloat(); \ | ||||
| } \ | } \ | ||||
| READ_COLOR(el_color, m_MapReader.pWaterMan->m_WaterColor) | READ_COLOR(el_color, m_MapReader.pWater->m_WaterColor) | ||||
| READ_COLOR(el_tint, m_MapReader.pWaterMan->m_WaterTint) | READ_COLOR(el_tint, m_MapReader.pWater->m_WaterTint) | ||||
| READ_FLOAT(el_waviness, m_MapReader.pWaterMan->m_Waviness) | READ_FLOAT(el_waviness, m_MapReader.pWater->m_Waviness) | ||||
| READ_FLOAT(el_murkiness, m_MapReader.pWaterMan->m_Murkiness) | READ_FLOAT(el_murkiness, m_MapReader.pWater->m_Murkiness) | ||||
| READ_FLOAT(el_windangle, m_MapReader.pWaterMan->m_WindAngle) | READ_FLOAT(el_windangle, m_MapReader.pWater->m_WindAngle) | ||||
| #undef READ_FLOAT | #undef READ_FLOAT | ||||
| #undef READ_COLOR | #undef READ_COLOR | ||||
| else | else | ||||
| debug_warn(L"Invalid map XML data"); | debug_warn(L"Invalid map XML data"); | ||||
| } | } | ||||
| ▲ Show 20 Lines • Show All 751 Lines • ▼ Show 20 Lines | #define GET_ENVIRONMENT_PROPERTY(val, prop, out)\ | ||||
| float waterHeight; | float waterHeight; | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Height, waterHeight) | GET_ENVIRONMENT_PROPERTY(waterBodyObj, Height, waterHeight) | ||||
| CmpPtr<ICmpWaterManager> cmpWaterManager(*pSimulation2, SYSTEM_ENTITY); | CmpPtr<ICmpWaterManager> cmpWaterManager(*pSimulation2, SYSTEM_ENTITY); | ||||
| ENSURE(cmpWaterManager); | ENSURE(cmpWaterManager); | ||||
| cmpWaterManager->SetWaterLevel(entity_pos_t::FromFloat(waterHeight)); | cmpWaterManager->SetWaterLevel(entity_pos_t::FromFloat(waterHeight)); | ||||
| // If we have graphics, get rest of settings | // If we have graphics, get rest of settings | ||||
| if (pWaterMan) | if (pWater) | ||||
| { | { | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Type, pWaterMan->m_WaterType) | pWater->SetWaterHeight(waterHeight); | ||||
| if (pWaterMan->m_WaterType == L"default") | |||||
| pWaterMan->m_WaterType = L"ocean"; | GET_ENVIRONMENT_PROPERTY(waterBodyObj, Type, pWater->m_WaterType) | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Color, pWaterMan->m_WaterColor) | if (pWater->m_WaterType == L"default") | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Tint, pWaterMan->m_WaterTint) | pWater->m_WaterType = L"ocean"; | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Waviness, pWaterMan->m_Waviness) | GET_ENVIRONMENT_PROPERTY(waterBodyObj, Color, pWater->m_WaterColor) | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Murkiness, pWaterMan->m_Murkiness) | GET_ENVIRONMENT_PROPERTY(waterBodyObj, Tint, pWater->m_WaterTint) | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, WindAngle, pWaterMan->m_WindAngle) | GET_ENVIRONMENT_PROPERTY(waterBodyObj, Waviness, pWater->m_Waviness) | ||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, Murkiness, pWater->m_Murkiness) | |||||
| GET_ENVIRONMENT_PROPERTY(waterBodyObj, WindAngle, pWater->m_WindAngle) | |||||
| } | } | ||||
| JS::RootedValue fogObject(rq.cx); | JS::RootedValue fogObject(rq.cx); | ||||
| GET_ENVIRONMENT_PROPERTY(envObj, Fog, &fogObject); | GET_ENVIRONMENT_PROPERTY(envObj, Fog, &fogObject); | ||||
| GET_ENVIRONMENT_PROPERTY(fogObject, FogFactor, m_LightEnv.m_FogFactor); | GET_ENVIRONMENT_PROPERTY(fogObject, FogFactor, m_LightEnv.m_FogFactor); | ||||
| GET_ENVIRONMENT_PROPERTY(fogObject, FogThickness, m_LightEnv.m_FogMax); | GET_ENVIRONMENT_PROPERTY(fogObject, FogThickness, m_LightEnv.m_FogMax); | ||||
| ▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines | |||||
Wildfire Games · Phabricator
Looks like a duplication, are there guarantees that the heights will always match?