forked from 0ad/0ad
Ykkrosh
35e91718c5
Atlas: Added ActorViewer. Moved GL canvas into separate class for shared use. Disabled message-handling callback while blocked on the game, and stopped creating dialog boxes inside the game thread in order to avoid deadlocks (hopefully). Support multiple Views (for independent sets of camera/update/render code). Recalculate territory boundaries when necessary. Changed default list of animations to match those currently used by actors. # Tidied up more code. Moved some more #includes out of .h files, to minimise unnecessary compilation. MathUtil: Deleted unused/unuseful macros (M_PI (use PI instead), M_PI_2 (use PI/2), MAX3, ABS (use abs)). ObjectManager: Removed some ScEd-specific things. Unit: Moved creation out of UnitManager, so units can be created without adding to the manager. Changed CStr8 to the more conventional CStr. app_hooks: Removed warning for setting multiple times. win: Restored SEH catcher. GameSetup, GameView: Removed RenderNoCull, because it doesn't seem to do what it says it does ("force renderer to load everything") since we're loading-on-demand most stuff and it doesn't seem especially useful since we'd prefer to minimise loading times (but feel free to correct me if I'm wrong). (And because it crashes when things need to be initialised in a different order, so it's easier to remove than to understand and fix it.) PatchRData, Renderer: Work sensibly when there's no game (hence no LOS manager, water, etc). LOSManager: Use entity position instead of actor position when possible. TerritoryManager: Allow delayed recalculations (so Atlas can issue lots of move+recalculate commands per frame). Cinematic: Non-pointer wxTimer, so it doesn't leak and doesn't have to be deleted manually. This was SVN commit r4261.
115 lines
2.9 KiB
C++
115 lines
2.9 KiB
C++
#include "precompiled.h"
|
|
|
|
#include "MessageHandler.h"
|
|
#include "../GameLoop.h"
|
|
|
|
#include "graphics/GameView.h"
|
|
#include "graphics/MapWriter.h"
|
|
#include "graphics/Patch.h"
|
|
#include "graphics/Terrain.h"
|
|
#include "graphics/TextureEntry.h"
|
|
#include "graphics/TextureManager.h"
|
|
#include "ps/Game.h"
|
|
#include "ps/GameAttributes.h"
|
|
#include "ps/Loader.h"
|
|
#include "renderer/Renderer.h"
|
|
#include "simulation/LOSManager.h"
|
|
#include "simulation/Simulation.h"
|
|
|
|
namespace AtlasMessage {
|
|
|
|
static void InitGame(std::wstring map)
|
|
{
|
|
if (g_Game)
|
|
delete g_Game;
|
|
|
|
// Set attributes for the game:
|
|
|
|
g_GameAttributes.m_MapFile = map;
|
|
// Make all players locally controlled
|
|
for (int i=1; i<8; ++i)
|
|
g_GameAttributes.GetSlot(i)->AssignLocal();
|
|
|
|
// Make the whole world visible
|
|
g_GameAttributes.m_LOSSetting = 2;
|
|
|
|
// Initialise the game:
|
|
g_Game = new CGame();
|
|
}
|
|
|
|
static void StartGame()
|
|
{
|
|
PSRETURN ret = g_Game->StartGame(&g_GameAttributes);
|
|
debug_assert(ret == PSRETURN_OK);
|
|
LDR_NonprogressiveLoad();
|
|
ret = g_Game->ReallyStartGame();
|
|
debug_assert(ret == PSRETURN_OK);
|
|
|
|
// Make sure entities get rendered in the correct location
|
|
g_Game->GetSimulation()->Update(0.0);
|
|
}
|
|
|
|
MESSAGEHANDLER(GenerateMap)
|
|
{
|
|
InitGame(L"");
|
|
|
|
// Convert size in patches to number of vertices
|
|
int vertices = msg->size * PATCH_SIZE + 1;
|
|
|
|
// Generate flat heightmap
|
|
u16* heightmap = new u16[vertices*vertices];
|
|
for (int z = 0; z < vertices; ++z)
|
|
for (int x = 0; x < vertices; ++x)
|
|
// heightmap[x + z*vertices] = 32768 +(int)(2048.f*(rand()/(float)RAND_MAX-0.5f));
|
|
heightmap[x + z*vertices] = 16384;
|
|
|
|
// Initialise terrain using the heightmap
|
|
CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
|
|
terrain->Initialize(msg->size, heightmap);
|
|
|
|
delete[] heightmap;
|
|
|
|
// Start the game, load data files - this must be done before initialising
|
|
// the terrain texture below, since the terrains must be loaded before being
|
|
// used.
|
|
StartGame();
|
|
|
|
// Cover terrain with default texture
|
|
// TODO: split into fCoverWithTexture
|
|
CTextureEntry* texentry = g_TexMan.FindTexture("grass1_spring"); // TODO: make default customisable
|
|
Handle tex = texentry ? texentry->GetHandle() : 0;
|
|
|
|
int patches = terrain->GetPatchesPerSide();
|
|
for (int pz = 0; pz < patches; ++pz) {
|
|
for (int px = 0; px < patches; ++px) {
|
|
|
|
CPatch* patch = terrain->GetPatch(px, pz);
|
|
|
|
for (int z = 0; z < PATCH_SIZE; ++z)
|
|
for (int x = 0; x < PATCH_SIZE; ++x)
|
|
{
|
|
patch->m_MiniPatches[z][x].Tex1 = tex;
|
|
patch->m_MiniPatches[z][x].Tex1Priority = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
MESSAGEHANDLER(LoadMap)
|
|
{
|
|
InitGame(*msg->filename);
|
|
StartGame();
|
|
}
|
|
|
|
MESSAGEHANDLER(SaveMap)
|
|
{
|
|
CMapWriter writer;
|
|
writer.SaveMap(CStr(L"maps/scenarios/" + *msg->filename),
|
|
g_Game->GetWorld()->GetTerrain(), g_Game->GetWorld()->GetUnitManager(),
|
|
g_Renderer.GetWaterManager(), g_Renderer.GetSkyManager(),
|
|
&g_LightEnv, g_Game->GetView()->GetCamera(), g_Game->GetView()->GetCinema());
|
|
}
|
|
|
|
}
|