Menu update

egormkn · Feb 17, 2017 · b0b1b90 · b0b1b90
1 parent e6c08fb
commit b0b1b90
Show file tree

Hide file tree

Showing 5 changed files with 420 additions and 39 deletions.
diff --git a/Box2D b/Box2D
diff --git a/SDLXX/base/Texture.h b/SDLXX/base/Texture.h
@@ -5,6 +5,7 @@
 #include <SDL_render.h>
 #include <SDL_image.h>
 #include "../ttf/Font.h"
+#include "../Log.h"
 
 namespace SDLXX {
     class Texture {
@@ -20,39 +21,27 @@ namespace SDLXX {
                 throw Exception("Unable to load image", IMG_GetError());
             }
             SDL_SetColorKey(surface, SDL_TRUE, SDL_MapRGB(surface->format, 0, 0xFF, 0xFF));
-            SDL_Rect stretchRect;
-            stretchRect.x = 0;
-            stretchRect.y = 0;
-            stretchRect.w = w;
-            stretchRect.h = h;
-            //FIXME: chack size of surface aster bliting
-            Uint32 rmask, gmask, bmask, amask;
-#if SDL_BYTEORDER == SDL_BIG_ENDIAN
-            rmask = 0xff000000;
-            gmask = 0x00ff0000;
-            bmask = 0x0000ff00;
-            amask = 0x000000ff;
-#else
-            rmask = 0x000000ff;
-            gmask = 0x0000ff00;
-            bmask = 0x00ff0000;
-            amask = 0xff000000;
-#endif
-
-            SDL_Surface *scaled = SDL_CreateRGBSurface(0, w, h, 32,
-                                           rmask, gmask, bmask, amask);
-            SDL_SetColorKey(scaled, SDL_TRUE, SDL_MapRGB(scaled->format, 0, 0xFF, 0xFF));
-            SDL_BlitScaled(surface, NULL, scaled, &stretchRect);
 
-            SDL_FreeSurface(surface);
-
-            texture = SDL_CreateTextureFromSurface(renderer, scaled);
+            /*if (w > 0 && h > 0) {
+                SDL_Rect stretchRect;
+                stretchRect.x = 0;
+                stretchRect.y = 0;
+                stretchRect.w = w;
+                stretchRect.h = h;
+                SDL_Surface *scaled = SDL_CreateRGBSurface(0, w, h, 32, 0,0,0,0);
+                SDL_BlitScaled(surface, NULL, scaled, &stretchRect);
+                SDL_SetColorKey(scaled, SDL_TRUE, SDL_MapRGB(scaled->format, 0, 0xFF, 0xFF));
+                SDL_FreeSurface(surface);
+                surface = scaled;
+            }*/
+
+            texture = SDL_CreateTextureFromSurface(renderer, surface);
             if(texture == nullptr) {
                 throw Exception("Unable to create texture", SDL_GetError());
             }
-            width = scaled->w;
-            height = scaled->h;
-            SDL_FreeSurface(scaled);
+            width = surface->w;
+            height = surface->h;
+            SDL_FreeSurface(surface);
         }
 
         Texture(const std::string &text, const Color &color, const Font &font, SDL_Renderer *renderer) {

diff --git a/SDLXX/test/Game.h b/SDLXX/test/Game.h
@@ -44,7 +44,7 @@ class Game : public Scene {
         groundBox.SetAsBox(w / SCALE, h / SCALE);
 
         b2BodyDef groundBodyDef;
-        groundBodyDef.position.Set((x + w / 2) / SCALE, (y + h / 2) / SCALE);
+        groundBodyDef.position.Set((x + w) / SCALE, (y + h) / SCALE);
         b2Body *groundBody = world->CreateBody(&groundBodyDef);
         groundBody->CreateFixture(&groundBox, 1);
         //groundBody->SetUserData(&staticBoxName);
@@ -54,14 +54,14 @@ class Game : public Scene {
         Log::log("[" + getTitle() + "] Scene created");
         window = &w;
 
-        b2Vec2 gravity(0.0f, 0.0f);
+        b2Vec2 gravity(0.0f, 9.8f);
         world = std::make_unique<b2World>(gravity);
         drawer = new Box2DDrawer(window->getSDLRenderer(), 30.f);
         drawer->SetFlags(0xFF);
         world->SetDebugDraw(drawer);
 
         map2 = new TMX_map();
-        map2->init("resources/map1.tmx");
+        map2->init("resources/map2.tmx");
         TILE_WIDTH = map2->tileWidth;
         TILE_HEIGHT = map2->tileHeight;
         MAP_HEIGHT = map2->tmx_layers[0].height * TILE_HEIGHT;
@@ -93,8 +93,8 @@ class Game : public Scene {
             } else {
                 for (std::vector<TMX_tile>::const_iterator tile = tileset->tmx_tiles.begin();
                      tile != tileset->tmx_tiles.end(); ++tile) {
-                    textures.push_back(new Texture(tile->tmx_image.source, w.getSDLRenderer(), tile->width,
-                                                   tile->height));
+                    textures.push_back(new Texture(tile->tmx_image.source, w.getSDLRenderer(), tile->tmx_image.width,
+                                                   tile->tmx_image.height));
                     textureHolders.push_back(
                             TextureHolder(textures[textures.size() - 1], {0, 0, tile->width, tile->height},
                                           tile->tmx_objectgroup.tmx_objects));
@@ -292,7 +292,7 @@ class Game : public Scene {
 
         for (b2Body *it = world->GetBodyList(); it != 0; it = it->GetNext()) {
             if (it->GetUserData() == &boxName) {
-                renderPlayer(renderer, it);
+                renderBox(renderer, it);
             } else if (it->GetUserData() == &staticBoxName) {
                 renderBox(renderer, it);
                 /*b2Vec2 position = it->GetPosition();
@@ -306,7 +306,7 @@ class Game : public Scene {
             }
         }
 
-        world->DrawDebugData();
+        //world->DrawDebugData();
         /**/
         renderer.render();
     }
@@ -328,7 +328,7 @@ class Game : public Scene {
         image->render(renderer.getSDLRenderer(), nullptr, &renderQuad, angle * DEG);
     }
 
-    void renderPlayer(Renderer &renderer, b2Body *boxBody) {
+    /*void renderPlayer(Renderer &renderer, b2Body *boxBody) {
         b2Vec2 pos = boxBody->GetPosition();
         float angle = boxBody->GetAngle();
         const b2PolygonShape *shape = (b2PolygonShape *) boxBody->GetFixtureList()->GetShape();
@@ -342,7 +342,7 @@ class Game : public Scene {
 
         SDL_Point point = {(int) (shape->m_vertices[2].x * SCALE), (int) (shape->m_vertices[2].y * SCALE)};
         image->render(renderer.getSDLRenderer(), nullptr, &renderQuad, angle * DEG, &point);
-    }
+    }*/
 
 private:
     Window *window = nullptr;

diff --git a/resources/map1.tmx b/resources/map1.tmx
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="30" height="16" tilewidth="64" tileheight="64" nextobjectid="10">
+ <tileset firstgid="1" name="tiles" tilewidth="64" tileheight="64" tilecount="40" columns="8">
+  <image source="level/tiles.png" width="512" height="320"/>
+  <tile id="2">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="0" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="3">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="0" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="4">
+   <objectgroup draworder="index">
+    <object id="4" type="border" x="0" y="0" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="9">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="49" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="10">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="0" width="64" height="15"/>
+    <object id="2" type="border" x="0" y="0" width="15" height="64"/>
+   </objectgroup>
+  </tile>
+  <tile id="11">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="0" width="64" height="15"/>
+    <object id="2" type="border" x="49" y="0" width="15" height="64"/>
+   </objectgroup>
+  </tile>
+  <tile id="12">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="49" y="0" width="15" height="64"/>
+    <object id="3" type="border" x="0" y="49" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="13">
+   <objectgroup draworder="index">
+    <object id="3" type="border" x="0" y="0" width="15" height="64"/>
+    <object id="4" type="border" x="0" y="49" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="14">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="0" y="0" width="15" height="64"/>
+   </objectgroup>
+  </tile>
+  <tile id="15">
+   <objectgroup draworder="index">
+    <object id="1" type="border" x="49" y="0" width="15" height="64"/>
+   </objectgroup>
+  </tile>
+  <tile id="16">
+   <objectgroup draworder="index">
+    <object id="1" type="box" x="0" y="2" width="64" height="60"/>
+    <object id="2" type="box" x="2" y="0" width="60" height="64"/>
+   </objectgroup>
+  </tile>
+  <tile id="17">
+   <objectgroup draworder="index">
+    <object id="1" type="box" x="0" y="7">
+     <polygon points="0,0 9,-7 55,-7 64,0 64,49 55,57 9,57 0,49"/>
+    </object>
+   </objectgroup>
+  </tile>
+  <tile id="25">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="2" y="0" width="62" height="15"/>
+    <object id="2" type="platform" x="0" y="2" width="3" height="11"/>
+   </objectgroup>
+  </tile>
+  <tile id="26">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="0" y="0" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="27">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="0" y="0" width="62" height="15"/>
+    <object id="2" type="platform" x="61" y="2" width="3" height="11"/>
+   </objectgroup>
+  </tile>
+  <tile id="31">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="0" y="0" width="20" height="11"/>
+    <object id="2" type="platform" x="0" y="10" width="17" height="5"/>
+   </objectgroup>
+  </tile>
+  <tile id="32">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="44" y="0" width="20" height="11"/>
+    <object id="2" type="platform" x="47" y="10" width="17" height="5"/>
+   </objectgroup>
+  </tile>
+  <tile id="36">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="2" y="0" width="62" height="15"/>
+    <object id="2" type="platform" x="0" y="2" width="3" height="11"/>
+   </objectgroup>
+  </tile>
+  <tile id="37">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="0" y="0" width="64" height="15"/>
+   </objectgroup>
+  </tile>
+  <tile id="38">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="0" y="0" width="62" height="15"/>
+    <object id="2" type="platform" x="61" y="2" width="3" height="11"/>
+   </objectgroup>
+  </tile>
+  <tile id="39">
+   <objectgroup draworder="index">
+    <object id="1" type="platform" x="2" y="0" width="60" height="15"/>
+    <object id="2" type="platform" x="0" y="2" width="64" height="11"/>
+   </objectgroup>
+  </tile>
+ </tileset>
+ <tileset firstgid="41" name="objects" tilewidth="64" tileheight="128" tilecount="7" columns="0">
+  <tile id="7">
+   <image width="64" height="64" source="level/barrel1.png"/>
+  </tile>
+  <tile id="8">
+   <image width="64" height="64" source="level/barrel2.png"/>
+  </tile>
+  <tile id="9">
+   <image width="64" height="64" source="level/box.png"/>
+  </tile>
+  <tile id="10">
+   <image width="64" height="128" source="level/door1.png"/>
+  </tile>
+  <tile id="11">
+   <image width="64" height="128" source="level/door2.png"/>
+  </tile>
+  <tile id="12">
+   <image width="64" height="128" source="level/door3.png"/>
+  </tile>
+  <tile id="13">
+   <image width="64" height="64" source="level/saw.png"/>
+  </tile>
+ </tileset>
+ <layer name="Background" width="30" height="16">
+  <data encoding="csv">
+11,4,5,5,4,5,5,4,5,5,4,5,5,4,5,5,4,5,5,4,5,5,4,5,5,4,5,5,4,12,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+15,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,16,
+15,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,8,9,16,
+14,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,13
+</data>
+ </layer>
+ <objectgroup name="Objects">
+  <object id="3" name="barrel_right" gid="48" x="1344" y="384" width="64" height="64"/>
+  <object id="5" name="door_left" gid="51" x="128" y="512" width="64" height="128"/>
+  <object id="6" name="door_right" gid="51" x="1728" y="512" width="64" height="128"/>
+  <object id="7" name="box_right" gid="50" x="1600" y="896" width="64" height="64"/>
+  <object id="8" name="box_left" gid="50" x="256" y="896" width="64" height="64"/>
+  <object id="9" name="barrel_left" gid="49" x="512" y="384" width="64" height="64"/>
+ </objectgroup>
+ <layer name="Platform" width="30" height="16">
+  <data encoding="csv">
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,26,27,27,22,0,0,37,39,0,0,0,0,0,0,0,0,0,0,0,0,37,39,0,0,24,27,27,28,0,
+0,0,0,0,0,0,0,0,0,0,0,40,0,0,0,0,0,0,40,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,19,20,21,0,0,0,0,37,39,0,0,0,0,19,20,21,0,0,0,0,0,0,0,
+0,0,0,0,0,0,37,38,38,39,0,0,0,0,0,0,0,0,0,0,37,38,38,39,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,26,27,1,1,27,28,0,0,0,0,0,0,0,0,0,0,0,0,
+0,37,38,39,0,0,0,0,0,0,0,0,0,29,2,2,31,0,0,0,0,0,0,0,0,0,37,38,39,0,
+0,0,0,0,0,40,0,0,37,39,0,0,0,34,35,35,36,0,0,0,37,39,0,0,40,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,37,39,0,0,40,0,0,0,0,40,0,0,0,0,0,0,40,0,0,0,0,40,0,0,37,39,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,37,39,0,0,0,0,29,31,0,0,0,0,37,39,0,0,0,0,0,0,0,0,
+0,0,37,38,38,39,0,0,0,0,0,0,37,38,35,35,38,39,0,0,0,0,0,0,37,38,38,39,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+</map>