Changeset 47
- Timestamp:
- Jul 4, 2010, 2:07:55 AM (11 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/maps/testmap-grass.tmx
r36 r47 4 4 <image source="../art/test/groundtest.png"/> 5 5 </tileset> 6 <layer name=" Layer0" width="32" height="32">6 <layer name="Ground 0" width="32" height="32"> 7 7 <data encoding="base64" compression="gzip"> 8 8 H4sIAAAAAAAAA+3QyQ2AMAxEUSuQAsJWQCD0XyITyWnBIPQPT5ZPY08xs/IBSSaZJfueA/MXWWWTKofsgTdU//3yzL43uV/oYMzkPUTl959P72DMFpgPAAAAAH/2ACvSWwAAEAAA … … 11 11 <layer name="Layer 1" width="32" height="32"> 12 12 <data encoding="base64" compression="gzip"> 13 H4sIAAAAAAAAA +2SwQqDQAxEtyfZ/kDBW0+uHr1oe+v//5QJ7kAILaWQtSDzYMCsuDOMSYmA178DfAH57g09frk7KsccdE+kfy/K6ZidmF0G7fUhKqJrVXnznZ7nQH+bYRGNVaVqdN56NgX4I4N97kRP0ZD2LiY3I8/ayN/O8PezZrkF+fss3t/vQlTvn/wtdhegqN4B/jf6vBjpu6EKO9Cid4v1J4QQQgg5Ext/7GfGABAAAA==13 H4sIAAAAAAAAA2NgGAUw4DjQDiAAYO5TpKEdpJhNLXcYUckcWthPjzRhhOYGWsYvPvsHMh6McLAHyv6BDouBtn+kA0YkPApGwSgYBaNgFIyCUTCcAABQE1isABAAAA== 14 14 </data> 15 15 </layer> 16 <layer name=" Layer 2" width="32" height="32">16 <layer name="Wall 0" width="32" height="32"> 17 17 <data encoding="base64" compression="gzip"> 18 H4sIAAAAAAAAA2NgG DzAcKAdQAAMdvcNRwALcykg5oJizgFwhzkQawKxBhTT2w3sQKyO5A4LOtsPA5JAbAXE4lC+4gC5Y6QBIyhmQKKpCUDxag3EHATcMApGwSgYBaNgFIyCUTAKhjYAAE/faMAAEAAA18 H4sIAAAAAAAAA2NgGAWjYBQQAiZomF724XMHPewnBtMCsAOxFRCrI9mDzh+ouIDxQW4Rp6P9tPQ3PnPpYT8svmHhyYiEQXLqUAxLA7QOd2T7R8EoGAWjYBSMglEwCoYTAACc6uxXABAAAA== 19 19 </data> 20 20 </layer> 21 <layer name=" Layer 3" width="32" height="32">21 <layer name="Ground 1" width="32" height="32"> 22 22 <data encoding="base64" compression="gzip"> 23 H4sIAAAAAAAAA+ 3OsQkAIBAEwQ/VDrQDUxMFI/tvygssQXjEHdj4zgx4Qzst7yO4rqikotN+V1UNp/2spgpO+wAAAPjDBmeeUZcAEAAA23 H4sIAAAAAAAAA+2SwQnAIAwA7bMdoRNEF2jdf7FGUAih35jPHdwnCBfFUgDAc6tnYr+rol5T+Tkz5lE7PmqdyrS69pi1oL6lu856m7HPm9TfcW/b839hZ9/+hWX0ux/GDDLbAAAAAJF8EOMQKwAQAAA= 24 24 </data> 25 25 </layer> 26 <layer name="Layer 4" width="32" height="32"> 26 <layer name="Object 1" width="32" height="32"> 27 <data encoding="base64" compression="gzip"> 28 H4sIAAAAAAAAA+3QsQ0AIAwDQa/CCLD/cGko6CjtwJ9kpX1FyjHdARfpfS/i59mGO+ATa0/HdTQAAACgtwJ8x6WQABAAAA== 29 </data> 30 </layer> 31 <layer name="Wall 1" width="32" height="32"> 32 <data encoding="base64" compression="gzip"> 33 H4sIAAAAAAAAA+3RsQkAIAxE0XS6gTiBC1jp/nt5tjZ2ich/8OsLxAzATT/yllQLvmGraqgStP+rF/46VQ7aBwAAgI8FOcHtzAAQAAA= 34 </data> 35 </layer> 36 <layer name="Ground 2" width="32" height="32"> 37 <data encoding="base64" compression="gzip"> 38 H4sIAAAAAAAAA+3OsQ0AIAwDwbQwAhPABGT/yXCRgg0M0p/0tR0BvG+oXjXD/lZLzcrx4f6Rpn0AAAAA/zpR9K8YABAAAA== 39 </data> 40 </layer> 41 <layer name="Object 2" width="32" height="32"> 42 <data encoding="base64" compression="gzip"> 43 H4sIAAAAAAAAA+3OQQkAAAgEQTPZwP6l/NhBDmZg/1sFGfqa7xEAAIBAC7dEfuMAEAAA 44 </data> 45 </layer> 46 <layer name="Wall 2" width="32" height="32"> 47 <data encoding="base64" compression="gzip"> 48 H4sIAAAAAAAAA+3NoREAMAgAMSQrdI869t+ryG6AILl7/REAu92vCaerLof+AADs8ABYXepiABAAAA== 49 </data> 50 </layer> 51 <layer name="Ground 3" width="32" height="32"> 52 <data encoding="base64" compression="gzip"> 53 H4sIAAAAAAAAA+3NMREAIBAEsW9BAg5QAP6VcSr4JpnZeqsAeq0002j6n7TTbfoDAMAPD4e462AAEAAA 54 </data> 55 </layer> 56 <layer name="Object 3" width="32" height="32"> 27 57 <data encoding="base64" compression="gzip"> 28 58 H4sIAAAAAAAAA+3OMQEAAAwCICutf7ll8PKBBCTQuXUAAACA2gPEOzOTABAAAA== -
trunk/src/layer.cpp
r38 r47 2 2 #include "layer.h" 3 3 4 Layer::Layer( int w, int h, FILE *fp)4 Layer::Layer(char const *name, int w, int h, FILE *fp) 5 5 { 6 6 width = w; 7 7 height = h; 8 8 data = new unsigned int[w * h]; 9 10 if (sscanf(name, "Ground %d", &z) == 1) 11 ; 12 else if (sscanf(name, "Ground Decal %d", &z) == 1) 13 ; 14 else if (sscanf(name, "Object %d", &z) == 1) 15 ; 16 else if (sscanf(name, "Wall %d", &z) == 1) 17 z++; 18 else if (sscanf(name, "Wall Decal %d", &z) == 1) 19 z++; 20 else 21 z = -1; 9 22 10 23 fread(data, sizeof(unsigned int), width * height, fp); … … 22 35 } 23 36 37 int Layer::GetZ() 38 { 39 return z; 40 } 41 24 42 unsigned int Layer::GetTile(int x, int y) 25 43 { -
trunk/src/layer.h
r38 r47 1 1 2 #if !defined __LAYER_H__ 3 #define __LAYER_H__ 2 /* 3 * The layer object 4 */ 5 6 #if !defined __DH_LAYER_H__ 7 #define __DH_LAYER_H__ 4 8 5 9 #include <cstdio> … … 8 12 { 9 13 public: 10 Layer( int w, int h, FILE *fp);14 Layer(char const *name, int w, int h, FILE *fp); 11 15 ~Layer(); 12 16 17 int GetZ(); 13 18 unsigned int GetTile(int x, int y); 14 19 15 //private:16 int width, height ;20 private: 21 int width, height, z; 17 22 unsigned int *data; 18 23 }; 19 24 20 #endif // __ LAYER_H__25 #endif // __DH_LAYER_H__ 21 26 -
trunk/src/map.cpp
r38 r47 28 28 fgets(tmp, 1024, fp); // Ignore rest of line 29 29 layers = (Layer **)realloc(layers, sizeof(Layer **) * (nlayers + 1)); 30 layers[nlayers] = new Layer( width, height, fp);30 layers[nlayers] = new Layer(name, width, height, fp); 31 31 nlayers++; 32 32 } … … 45 45 { 46 46 for (int i = 0; i < nlayers; i++) 47 { 48 int z = layers[i]->GetZ(); 49 47 50 for (int y = 0; y < 32; y++) 48 51 for (int x = 0; x < 32; x++) 49 tiler->AddTile(layers[i]->GetTile(x, y), x * 32, y * 32, i); 52 tiler->AddTile(layers[i]->GetTile(x, y), x * 32, y * 32, z); 53 } 50 54 } 51 55 -
trunk/src/map.h
r38 r47 1 2 /* 3 * The map object 4 */ 5 6 #if !defined __DH_MAP_H__ 7 #define __DH_MAP_H__ 1 8 2 9 #include <cstdio> … … 18 25 }; 19 26 27 #endif // __DH_MAP_H__ 28 -
trunk/src/test-map.cpp
r38 r47 14 14 Video *video = new Video("Deus Hax", 640, 480); 15 15 Tiler *tiler = new Tiler(); 16 Map *map = new Map("maps/testmap- coll.tmx");16 Map *map = new Map("maps/testmap-grass.tmx"); 17 17 18 18 for (int done = 0; !done; ) … … 25 25 int playerx, playery; 26 26 SDL_GetMouseState(&playerx, &playery); 27 playerx = playerx * (640 - 32) / 640; 28 playery = playery * (480 - 32) / 480; 27 29 28 30 tiler->AddTile(50, playerx, playery, 1); 29 tiler->AddTile(50, playerx + 64, playery + 32, 3);30 31 31 32 tiler->Render(); -
trunk/src/tiler.h
r38 r47 1 2 1 3 2 /* … … 5 4 */ 6 5 7 #if !defined __ TILER_H__8 #define __ TILER_H__6 #if !defined __DH_TILER_H__ 7 #define __DH_TILER_H__ 9 8 10 9 class TilerData; … … 24 23 }; 25 24 26 #endif // __ TILER_H__25 #endif // __DH_TILER_H__ 27 26 -
trunk/src/video.h
r22 r47 1 2 /* 3 * The video driver 4 */ 5 6 #if !defined __DH_VIDEO_H__ 7 #define __DH_VIDEO_H__ 1 8 2 9 class VideoData; … … 17 24 VideoData *data; 18 25 }; 26 27 #endif // __DH_VIDEO_H__ 28
Note: See TracChangeset
for help on using the changeset viewer.