Changeset 2106
- Timestamp:
- Nov 22, 2012, 12:22:35 AM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r2105 r2106 19 19 lol/unit.h lol/debug.h \ 20 20 lol/core/types.h lol/core/array.h lol/core/string.h lol/core/hash.h \ 21 lol/core/map.h \ 21 22 lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \ 22 23 lol/math/math.h \ -
trunk/src/core.h
r2105 r2106 76 76 // Base types 77 77 #include <lol/debug.h> 78 78 79 #include <lol/core/types.h> 79 80 #include <lol/core/array.h> 80 81 #include <lol/core/string.h> 81 82 #include <lol/core/hash.h> 83 #include <lol/core/map.h> 84 82 85 #include <lol/math/math.h> 83 86 #include <lol/math/half.h> 84 87 #include <lol/math/real.h> 85 88 #include <lol/math/vector.h> 89 86 90 #include "numeric.h" 87 91 #include "timer.h" -
trunk/src/lolcore.vcxproj
r2105 r2106 585 585 <ClInclude Include="lol\core\array.h" /> 586 586 <ClInclude Include="lol\core\hash.h" /> 587 <ClInclude Include="lol\core\map.h" /> 587 588 <ClInclude Include="lol\core\string.h" /> 588 589 <ClInclude Include="lol\core\types.h" /> -
trunk/src/lolcore.vcxproj.filters
r2105 r2106 740 740 </ClInclude> 741 741 <ClInclude Include="hash.h"> 742 <Filter>src\core</Filter> 743 </ClInclude> 744 <ClInclude Include="map.h"> 742 745 <Filter>src\core</Filter> 743 746 </ClInclude> -
trunk/src/map.cpp
r1985 r2106 26 26 27 27 /* 28 * Map implementation class28 * LevelMap implementation class 29 29 */ 30 30 31 class MapData31 class LevelMapData 32 32 { 33 friend class Map;33 friend class LevelMap; 34 34 35 35 static int const MAX_TILESETS = 128; … … 45 45 46 46 /* 47 * Public Map class47 * Public LevelMap class 48 48 */ 49 49 50 Map::Map(char const *path)51 : data(new MapData())50 LevelMap::LevelMap(char const *path) 51 : data(new LevelMapData()) 52 52 { 53 53 data->ntilers = 0; … … 56 56 57 57 char tmp[BUFSIZ]; 58 int gids[ MapData::MAX_TILESETS];58 int gids[LevelMapData::MAX_TILESETS]; 59 59 uint32_t *tiles = NULL; 60 60 int level = 0, orientation = 0, ntiles = 0; … … 152 152 } 153 153 154 Map::~Map()154 LevelMap::~LevelMap() 155 155 { 156 156 for (int i = 0; i < data->ntilers; i++) … … 161 161 } 162 162 163 void Map::Render(int x, int y, int z)163 void LevelMap::Render(int x, int y, int z) 164 164 { 165 165 for (int i = 0; i < data->m_layers.Count(); i++) … … 167 167 } 168 168 169 int Map::GetWidth()169 int LevelMap::GetWidth() 170 170 { 171 171 return data->width * 32; 172 172 } 173 173 174 int Map::GetHeight()174 int LevelMap::GetHeight() 175 175 { 176 176 return data->height * 32; -
trunk/src/map.h
r748 r2106 10 10 11 11 // 12 // The Map class13 // ------------- 14 // A Map object is a collection of Layers and other information (to be12 // The LevelMap class 13 // ------------------ 14 // A LevelMap object is a collection of Layers and other information (to be 15 15 // determined later). 16 16 // 17 17 18 #if !defined __LOL_ MAP_H__19 #define __LOL_ MAP_H__18 #if !defined __LOL_LEVELMAP_H__ 19 #define __LOL_LEVELMAP_H__ 20 20 21 21 namespace lol 22 22 { 23 23 24 class MapData;24 class LevelMapData; 25 25 26 class Map26 class LevelMap 27 27 { 28 28 public: 29 Map(char const *path);30 ~ Map();29 LevelMap(char const *path); 30 ~LevelMap(); 31 31 32 32 void Render(int x, int y, int z); … … 35 35 36 36 private: 37 MapData *data;37 LevelMapData *data; 38 38 }; 39 39
Note: See TracChangeset
for help on using the changeset viewer.