Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #82 from thecodingmachine/fix/webrtc

Browse source 
Fix webrtc
This commit is contained in:
David Négrier 2020-05-08 16:14:49 +02:00 • committed by GitHub
commit 25b7fc5e36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 837 additions and 814 deletions
Download patch file Download diff file Expand all files Collapse all files

1142
front/dist/maps/map.json vendored
View file

File diff suppressed because it is too large Load diff

478
front/dist/maps/office_1.tsx vendored
View file

@ -1,254 +1,224 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.3.3" name="office_1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="tilesets_deviant_milkian_1.png" width="512" height="512"/>
<tile id="7">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="12">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="13">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="14">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="15">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="23">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="28">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="29">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="30">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="31">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="39">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="44">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="45">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="48">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="49">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="50">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="51">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="52">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="56">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="57">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="64">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="65">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="66">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="67">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="68">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="72">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="73">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="84">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="152">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="153">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="154">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="155">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="156">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="157">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="161">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="162">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="168">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="169">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="170">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="171">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="172">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="173">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="177">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="178">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="184">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="185">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="186">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="196">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="198">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="214">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
</tileset>
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.2" tiledversion="1.3.3" name="office_1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="tilesets_deviant_milkian_1.png" width="512" height="512"/>
<tile id="7">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="14">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="15">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="23">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="28">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="29">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="30">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="31">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="39">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="48">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="49">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="50">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="51">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="52">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="64">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="65">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="66">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="67">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="68">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="72">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="73">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="84">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="152">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="153">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="154">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="155">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="156">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="157">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="161">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="162">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="168">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="169">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="170">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="171">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="172">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="173">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="177">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="178">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="184">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="185">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="186">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="196">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="198">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
<tile id="214">
<properties>
<property name="collides" type="bool" value="true"/>
</properties>
</tile>
</tileset>

7
front/src/Phaser/Game/GameScene.ts
View file

@ -89,7 +89,12 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
this.Layers = new Array<Phaser.Tilemaps.StaticTilemapLayer>();
let depth = -2;
this.map.layers.forEach((layer) => {
if (layer.type === 'tilelayer') {
if (layer.type === 'tilelayer' && layer.name === "override") {
let tab : Array<any> = (layer.properties as any);
let propertiesDepth = tab.find((props : any) => props.name === "depth");
this.addLayer( this.Map.createStaticLayer(layer.name, this.Terrains, 0, 0).setDepth(propertiesDepth ? propertiesDepth.value : 2) );
}
else if (layer.type === 'tilelayer') {
this.addLayer( this.Map.createStaticLayer(layer.name, this.Terrains, 0, 0).setDepth(depth) );
} else if (layer.type === 'objectgroup' && layer.name === 'floorLayer') {
depth = -1;