git repos / saland

commit 10ca4b89

Poul Sander · 2019-04-15 18:44
10ca4b89595b822958d3d6bd4f180d7aa484de72 patch · browse files
parent c08345341e9b5f376ff4bec3cb77029c18ed0609 

Objects are only blocking if they have type == "blocking"

Changed files

M data/maps/sample1.tmx before
M src/saland/model/World.cpp before
diff --git a/data/maps/sample1.tmx b/data/maps/sample1.tmx index 2711679..9537802 100644 --- a/data/maps/sample1.tmx +++ b/data/maps/sample1.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="11">
+<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="32" tileheight="32" infinite="0" nextlayerid="5" nextobjectid="12">
<tileset firstgid="1" source="terrain.tsx"/>
<tileset firstgid="1025" name="city_outside" tilewidth="32" tileheight="32" tilecount="432" columns="24">
<image source="../textures/city_outside.png" width="768" height="576"/>
@@ -11,7 +11,7 @@
</layer>
<layer id="2" name="ground_2" width="100" height="100">
<data encoding="base64" compression="zlib">
- eJztmztvE0EURseh4Q0JUEIBDY8ECIgSJKDgFSBJTZAgBaEj1AgJKAgFzxpo7UgohIgy5A8QkQL4FTikAHrulfey15Nd74y9u0mY70if7F2vYmuO7p2ZtWNMa6YqxjynvKtkXAhKgX0swUfpfKXx/kb5bo07+/gJH6Xzi8b7N+Wj5YR9LMJH6bCP413GnKD8sXwswEfpSH0k+UC/Kp8d5GFnlF1d8fnVtL46TTmTkrMr+LnKpJ35Y5AylJLhNj8Hu9hHuZmSvSYMJ+34uEOZUZlW6Tf+TrJcSEY9/+5aROaPecrWruzrGfYxbpJ9fKDc9fwMN0y2i5B81D3nEF0f4mA8Cnx0Rh/VxDPy8N6jRqQ+pEb4cdrEjorwwR/rkeffXavIPRPX+ybsQ2pCHmei5+ylCB8h1IYgNeLq4wWlx8S1oXtVN+WV5/trH1wH60y4tSH4zuvs5GVCfF0wD0zsYDQ6fqgSmgvGt2fljdRIKPuMLKRnLXquffNC1wicNPCdR/JGzyMhzd+taGd/mBd2jYR03yqNdueRjXTtpiibO6gte+0buhe9P8zyoR3U6fhQpZEfpn03sray17wh968px/36wUrsIC3ipl0vIa95Bb3WalUjLj60l076WOi41IiPDzjpDPlepNV367aPz3TuUiXOvEl3soU9U7bBjxMu931tH72U7ZRuSk8luX7Y2QA99lEO89rawIkrshepp9RIko+jlH7KsRQfvVFtLJmGDzhxJ2u/nuRjkDJEGW7hQ2pDh52gf2Uj80hSz7pozRF632HvSbJ82F7gJhn5vVxajdhOspLlw3YDJ81Iz2r1/To7SVtPdeIDTpKRe1pZ+3UXL74+4GQ5ss5y/Z1WKy/s4zL3QOPn5Ah8/EN61oJDjWiS5hbZD7KTKx5e4KMZ+Z2vy31fTSsnTFatfDENb1fho4lOvs9NctKrxldqJSnwkI6eR9pxou9tDWCcO0avfdPuoYByWenfoYDlyNzuu94CxSA1Uq/gf91WC67f6YLykPso8FEM5yjnKRccr+caecr7NswfHSNjL2EHtyhjlP3G3QnIBxn7ahR2cIAySalFxz614sM1ygjlesK5kYTXQkB8yPhXo2NJLXqtCC/3KHOUkyYedz43G0VeC8nLY8oG0xh37YEdVE3sSJ7n6UXG/pOJndg+5tTroXjhGpk0sQN5PqaOa9bx7Rze9zVlj2mMN48/j/kpE3uYM81utLf/GakRu0/pfqXrROaZPGpEOxEvevyTzt/P4X1XO+JE+pK40HPKpDrHx3nUCMNO3piGF+lfOrpW+DgEHwz3rbS6mFSRa/JeD0ut6HlDfMyq5yH5kDlEasKeN7QTPpdXjQi6f2kv8sheQvMxph61j1rCa3n7YHSdiAPds0LzIb3KrhVxUlPXFOGD0XOK7lu7KW8Les/VBvuQvqTHvmod63VxUT4E8SIJxQWj94Z6HWX74KynTFCerMgnDQd2MuEQeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARfIXqGm/kQ==
+ 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
</data>
</layer>
<layer id="3" name="blocking" width="100" height="100">
@@ -20,7 +20,7 @@
</data>
</layer>
<objectgroup id="4" name="object1">
- <object id="5" name="theName" type="myType" x="737" y="667" width="320" height="257"/>
+ <object id="5" name="theName" type="blocking" x="737" y="667" width="320" height="257"/>
<object id="6" name="theEclipse" type="theType" x="712" y="281" width="298" height="140">
<ellipse/>
</object>
@@ -29,5 +29,10 @@
</object>
<object id="9" name="Player" type="playerStart" x="477" y="359"/>
<object id="10" x="-245" y="-80"/>
+ <object id="11" name="text_basic_sign" type="text" x="1194" y="464" width="71" height="67">
+ <properties>
+ <property name="text" value="This is a text on a sign"/>
+ </properties>
+ </object>
</objectgroup>
</map>
diff --git a/src/saland/model/World.cpp b/src/saland/model/World.cpp index 44f4dc9..57f78c4 100644 --- a/src/saland/model/World.cpp +++ b/src/saland/model/World.cpp
@@ -104,7 +104,7 @@ void World::init_physics(std::shared_ptr<b2World>& world) {
if (item.isEllipse) {
continue;
}
- if (item.x > 0 && item.y > 0 && item.width > 0 && item.height > 0) {
+ if (item.x > 0 && item.y > 0 && item.width > 0 && item.height > 0 && item.type == "blocking") {
b2Body* bodyAdded = AddStaticRect(physicsWorld.get(), item.x, item.y, item.width, item.height);
managed_bodies.push_back(bodyAdded);
}