Differential D5001 Diff 22028 source/graphics/MapReader.h

Changeset View

Standalone View

source/graphics/MapReader.h

Show All 20 Lines
#include "MapIO.h"		#include "MapIO.h"

#include "graphics/LightEnv.h"		#include "graphics/LightEnv.h"
#include "ps/CStr.h"		#include "ps/CStr.h"
#include "ps/FileIo.h"		#include "ps/FileIo.h"
#include "scriptinterface/ScriptTypes.h"		#include "scriptinterface/ScriptTypes.h"
#include "simulation2/system/Entity.h"		#include "simulation2/system/Entity.h"

		#include <memory>

class CTerrain;		class CTerrain;
class WaterManager;		class WaterManager;
class SkyManager;		class SkyManager;
class CLightEnv;		class CLightEnv;
class CCinemaManager;		class CCinemaManager;
class CPostprocManager;		class CPostprocManager;
class CTriggerManager;		class CTriggerManager;
class CSimulation2;		class CSimulation2;
class CSimContext;		class CSimContext;
class CTerrainTextureEntry;		class CTerrainTextureEntry;
class CGameView;		class CGameView;
class CXMLReader;		class CXMLReader;
class CMapGenerator;
class ScriptContext;		class ScriptContext;
class ScriptInterface;		class ScriptInterface;

		vladislavbelovUnsubmitted Done Inline Actions Too common name in the global space. vladislavbelov: Too common name in the global space.
class CMapReader : public CMapIO		class CMapReader : public CMapIO
{		{
friend class CXMLReader;		friend class CXMLReader;

public:		public:
// constructor		// constructor
CMapReader();		CMapReader();
~CMapReader();		~CMapReader();
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines	private:
CLightEnv m_LightEnv;		CLightEnv m_LightEnv;
// startup script		// startup script
CStrW m_Script;		CStrW m_Script;

// random map data		// random map data
JS::PersistentRootedValue m_ScriptSettings;		JS::PersistentRootedValue m_ScriptSettings;
JS::PersistentRootedValue m_MapData;		JS::PersistentRootedValue m_MapData;

CMapGenerator* m_MapGen;		struct GeneratorState;
		std::unique_ptr<GeneratorState> m_Generator;
		vladislavbelovUnsubmitted Done Inline Actions It sounds like `Generator` and `GeneratorState` have different meanings. vladislavbelov: It sounds like `Generator` and `GeneratorState` have different meanings.

CFileUnpacker unpacker;		CFileUnpacker unpacker;
CTerrain* pTerrain;		CTerrain* pTerrain;
WaterManager* pWaterMan;		WaterManager* pWaterMan;
SkyManager* pSkyMan;		SkyManager* pSkyMan;
CPostprocManager* pPostproc;		CPostprocManager* pPostproc;
CLightEnv* pLightEnv;		CLightEnv* pLightEnv;
CGameView* pGameView;		CGameView* pGameView;
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines