Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Implemented CollisionSystem
Browse files Browse the repository at this point in the history
  • Loading branch information
@eth0net
eth0net committed Feb 17, 2021
1 parent aa0b2c8 commit 50f1252
Show file tree
Hide file tree
Showing 8 changed files with 134 additions and 193 deletions.
2 changes: 1 addition & 1 deletion assets/tilemaps/fantasy1-min.tmx
View file

Large diffs are not rendered by default.

35 changes: 33 additions & 2 deletions assets/tilemaps/fantasy1.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="4">
<map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="32" tileheight="32" infinite="0" nextlayerid="18" nextobjectid="29">
<editorsettings>
<export target="fantasy1-min.tmx" format="tmx"/>
</editorsettings>
Expand All @@ -19,7 +19,38 @@
</layer>
<layer id="11" name="Trees" width="50" height="50">
<data encoding="base64" compression="zlib">
eJzt0TEKgDAUBNH/c/+LaqcnMBY2QTuLWZiBsGKV8HpUjXk6fAl3+GOf77Orjs7b1WOf/9La+t0jLT1Y6cFKD1Z6sNKDlR6s9GClBys9WOnBSg9WerDSg5UerPRgpQcrPVjpwUoPVnqw0oPVl8f9vrRdPdKXcIc/9gLmWKzz
eJztxUENADAIBLDDv9qhABmMpP004Uddyat7AwAAAAAAAAAAbBngCSuU
</data>
</layer>
<layer id="14" name="Trees Upper" width="50" height="50">
<data encoding="base64" compression="zlib">
eJzt0TEKgDAUBNFs7n9R7fQEamETsRACzocZkLX84aW31s8vxZdww4y9/6s2eqz5+6LvLXl67AXfsUUPUnqw0oOVHqz0YKUHKz1Y6cFKD1Z6sNKDlR6s9GClBys9WOnBSg9WerDSg5UerPRg9eZxva/ajh7Vl3DDjD0ALV+BYA==
</data>
</layer>
<objectgroup id="13" name="Collision">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<object id="17" name="Top" x="0" y="0">
<polygon points="32,64 1568,64 1568,86 32,86"/>
</object>
<object id="19" name="Left" x="0" y="64">
<polygon points="67.5,0 32,0 32,1504 67.5,1504"/>
</object>
<object id="20" name="Right" x="1536" y="64">
<polygon points="-3.5,0 32,0 32,1504 -3.5,1504"/>
</object>
<object id="21" name="Bottom" x="0" y="1536">
<polygon points="64,0 1536,0 1536,32 64,32"/>
</object>
<object id="26" name="Water1" x="768" y="640">
<polygon points="0,0 96,0 96,288 0,288"/>
</object>
<object id="27" name="Water2" x="704" y="672">
<polygon points="0,0 224,0 224,224 0,224"/>
</object>
<object id="28" name="Water3" x="672" y="736">
<polygon points="0,0 288,0 288,96 0,96"/>
</object>
</objectgroup>
</map>
28 changes: 0 additions & 28 deletions assets/tilesets/BaseChip.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.4" tiledversion="1.4.3" name="BaseChip" tilewidth="32" tileheight="32" tilecount="1064" columns="8">
<image source="BaseChip.png" width="256" height="4256"/>
<tile id="8">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
</tile>
<tile id="9">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
</tile>
<tile id="16">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="3" x="32" y="30.0435">
<polyline points="0,0 -2.08696,-0.0434783 -4.95652,-1 -5.95652,-2.13043 -6,-4.95652 -3.04348,-5.08696 -3,-7.91304 0.0434783,-8"/>
</object>
</objectgroup>
</tile>
<tile id="17">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="3" x="0" y="22">
<polyline points="0,0 3,0.0434783 3.04348,2.95652 6.08696,3 6.08696,5.91304 5.13043,7 2,8.04348 -0.0434783,8.08696"/>
</object>
</objectgroup>
</tile>
<tile id="24">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="1" x="31.913" y="29.913">
<polyline points="0,0 -2.08696,-0.0434783 -4.95652,-1 -5.95652,-2.13043 -6,-4.95652 -3.04348,-5.08696 -3,-7.91304 0.0434783,-8"/>
</object>
</objectgroup>
</tile>
<tile id="25">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="2" x="-4.44089e-16" y="21.9565">
<polyline points="0,0 3,0.0434783 3.04348,2.95652 6.08696,3 6.08696,5.91304 5.13043,7 2,8.04348 -0.0434783,8.08696"/>
</object>
</objectgroup>
</tile>
<tile id="32">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="2" x="-0.130435" y="21.8696">
<polyline points="0,0 3,0.0434783 3.04348,2.95652 6.08696,3 6.08696,5.91304 5.13043,7 2,8.04348 -0.0434783,8.08696"/>
</object>
</objectgroup>
</tile>
<tile id="33">
<properties>
<property name="Collision" type="bool" value="true"/>
</properties>
<objectgroup draworder="index" id="2">
<object id="2" x="31.9565" y="29.9565">
<polyline points="0,0 -2.08696,-0.0434783 -4.95652,-1 -5.95652,-2.13043 -6,-4.95652 -3.04348,-5.08696 -3,-7.91304 0.0434783,-8"/>
Expand Down
34 changes: 17 additions & 17 deletions assets/tilesets/Grass1.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.4" tiledversion="1.4.3" name="Grass1" tilewidth="32" tileheight="32" tilecount="48" columns="8">
<image source="Grass1.png" width="256" height="192" />
<terraintypes>
<terrain name="Grass1" tile="14" />
</terraintypes>
<tile id="5" terrain=",,,0" />
<tile id="6" terrain=",,0,0" />
<tile id="7" terrain=",,0," />
<tile id="13" terrain=",0,,0" />
<tile id="14" terrain="0,0,0,0" />
<tile id="15" terrain="0,,0," />
<tile id="21" terrain=",0,," />
<tile id="22" terrain="0,0,," />
<tile id="23" terrain="0,,," />
<tile id="28" terrain="0,0,0," />
<tile id="29" terrain="0,0,,0" />
<tile id="36" terrain="0,,0,0" />
<tile id="37" terrain=",0,0,0" />
<image source="Grass1.png" width="256" height="192"/>
<terraintypes>
<terrain name="Grass1" tile="14"/>
</terraintypes>
<tile id="5" terrain=",,,0"/>
<tile id="6" terrain=",,0,0"/>
<tile id="7" terrain=",,0,"/>
<tile id="13" terrain=",0,,0"/>
<tile id="14" terrain="0,0,0,0"/>
<tile id="15" terrain="0,,0,"/>
<tile id="21" terrain=",0,,"/>
<tile id="22" terrain="0,0,,"/>
<tile id="23" terrain="0,,,"/>
<tile id="28" terrain="0,0,0,"/>
<tile id="29" terrain="0,0,,0"/>
<tile id="36" terrain="0,,0,0"/>
<tile id="37" terrain=",0,0,0"/>
</tileset>
Loading

0 comments on commit 50f1252

Please sign in to comment.