latchup/rc3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: latchup:95a12398e1c35def83cb2438e55ba00814a9f0b2
Branches Tags
latchup:master
...
compare: latchup:cd9ca9500f1b16a6e7e9ce0dd0021b3604c4db0e
Branches Tags
latchup:master

2 Commits
95a12398e1 ... cd9ca9500f

Author SHA1 Message Date
Stephan Messlinger
cd9ca9500f Fix Exitroom cellar/01 2021-02-16 04:22:04 +01:00
Stephan Messlinger
d7a22d84f2 Notes from talk 2021-02-16 00:57:28 +01:00
17 changed files with 74 additions and 105 deletions
Show Stats Expand all files Collapse all files

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
engine
scratch
maps/binary_kitchen
maps/rc3-Continent
maps/world-map-starterkit

2
maps/ir/cellar.json
View File

@ -157,7 +157,7 @@
{ {
"name":"exitUrl", "name":"exitUrl",
"type":"string", "type":"string",
"value":"cellar\/01\/01.json#start" "value":"cellar\/01\/01.php#start"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

4
maps/ir/cellar/01/.htaccess
View File

@ -4,7 +4,5 @@
RewriteEngine On RewriteEngine On
# replace name.number.php --> name.php # replace name.number.php --> name.php
#RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
# replace name.number.php --> uncache.php?taget=name
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1

2
maps/ir/cellar/01/01.json
View File

@ -229,7 +229,7 @@
{ {
"name":"playAudio", "name":"playAudio",
"type":"string", "type":"string",
"value":"switch.mp3" "value":"switch.php"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

6
maps/ir/cellar/01/01.php
View File

@ -28,7 +28,11 @@ file_put_contents("$sub"."/01_closed.json", $data);
$data = file_get_contents("01.json"); $data = file_get_contents("01.json");
$data = str_replace("01.php#", "$sub"."/"."01.php#", $data); $data = str_replace("01.php#", "$sub"."/"."01.php#", $data);
header("Expires: 0"); // Patch php filenames with timestamps to defeat cache
// destination.php --> destination.number.php
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php", ".".$tstamp.".php", $data);
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

2
maps/ir/cellar/01/01_closed.json
View File

@ -229,7 +229,7 @@
{ {
"name":"playAudio", "name":"playAudio",
"type":"string", "type":"string",
"value":"switch.mp3" "value":"switch.php"
}], }],
"type":"tilelayer", "type":"tilelayer",
"visible":true, "visible":true,

6
maps/ir/cellar/01/01_sub.php
View File

@ -7,7 +7,11 @@ $switch = $state["switch"];
# Load open/closed level depending on switch # Load open/closed level depending on switch
$data = file_get_contents( $switch ? "01.json" : "01_closed.json"); $data = file_get_contents( $switch ? "01.json" : "01_closed.json");
header("Expires: 0"); // Patch php filenames with timestamps to defeat cache
// destination.php --> destination.number.php
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php", ".".$tstamp.".php", $data);
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

5
maps/ir/cellar/01/switch.php
View File

@ -2,5 +2,10 @@
$state = json_decode(file_get_contents("state.json"), true); $state = json_decode(file_get_contents("state.json"), true);
$state["switch"] = 1; $state["switch"] = 1;
file_put_contents("state.json", json_encode($state)); file_put_contents("state.json", json_encode($state));
# Load current level and patch exits to target the copy
$data = file_get_contents("switch.mp3");
header('Content-type: audio/mpeg');
echo($data);
exit; exit;
?> ?>

8
maps/ir/cellar/01/testcookie.php
View File

@ -1,8 +0,0 @@
<?php
if (isset($_COOKIE["TestCookie"]))
echo "TestCookie=".$_COOKIE["TestCookie"];
$cookieval = "cookie_".time();
setcookie("TestCookie", $cookieval, time()+3600*24);
exit;
?>

39
maps/ir/cellar/01/uncache.php
View File

@ -1,39 +0,0 @@
<?php
// Workadventure cache destroyer
// URL rewrite rule calls us with the original filename in URL paramter "target"
if (!isset($_GET['target'])) {
echo("No target");
exit;
}
$target = $_GET["target"];
if (file_exists($target.".php"))
{
// If a PHP file target.php exists:
// Run that file and capture its output
ob_start();
include $target.".php";
ob_end_flush();
}
else
{
// If no PHP file target.php exists:
// Load contents from target.json
if (!file_exists($target.".json"))
{
echo($target.".json"." not found.");
exit;
}
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
}
// Replace map exit names with timestamps:
// destination.php#start --> destination.number.php#start
$tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json');
echo($data);
exit;
?>

4
maps/ir/gmaze/.htaccess
View File

@ -4,7 +4,5 @@
RewriteEngine On RewriteEngine On
# replace name.number.php --> name.php # replace name.number.php --> name.php
#RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
# replace name.number.php --> uncache.php?taget=name
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1

1
maps/ir/gmaze/gmaze.php
View File

@ -8,7 +8,6 @@ exec("python genmaze.py ".$name);
$data = file_get_contents($name); $data = file_get_contents($name);
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

1
maps/ir/gmaze/left_old.php → maps/ir/gmaze/left.php
View File

@ -3,7 +3,6 @@ $tstamp = round(microtime(true)*100); // 0.01 sec resolution
$data = file_get_contents('left.json'); $data = file_get_contents('left.json');
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

1
maps/ir/gmaze/right_old.php → maps/ir/gmaze/right.php
View File

@ -2,7 +2,6 @@
$data = file_get_contents('right.json'); $data = file_get_contents('right.json');
$tstamp = round(microtime(true)*100); # 0.01 sec resolution $tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;

18
maps/ir/gmaze/uncache.php
View File

@ -2,37 +2,37 @@
// Workadventure cache destroyer // Workadventure cache destroyer
// URL rewrite rule calls us with the original filename in URL paramter "target" // URL rewrite rule calls us with the original filename in URL paramter "target"
if (!isset($_GET['target'])) { if (!isset($_GET['target'])) {
echo("No target"); echo("No target");
exit; exit;
} }
$target = $_GET["target"]; $target = $_GET["target"];
if (file_exists($target.".php")) if (file_exists($target.".php")) {
{
// If a PHP file target.php exists: // If a PHP file target.php exists:
// Run that file and capture its output // Run that file and capture its output
ob_start(); ob_start();
include $target.".php"; include $target.".php";
ob_end_flush(); ob_end_flush();
} }
else else {
{
// If no PHP file target.php exists: // If no PHP file target.php exists:
// Load contents from target.json // Load contents from target.json
if (!file_exists($target.".json")) if (file_exists($target.".json"))
{ $data = file_get_contents($target.".json");
else {
echo($target.".json"." not found."); echo($target.".json"." not found.");
exit; exit;
} }
} }
// Replace map exit names with timestamps: // Replace map exit names with timestamps:
// destination.php#start --> destination.number.php#start // destination.php#start --> destination.number.php#start
$tstamp = round(microtime(true)*100); # 0.01 sec resolution $tstamp = round(microtime(true)*100); # 0.01 sec resolution
$data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching $data = str_replace(".php#", ".".$tstamp.".php#", $data); // Patch php-exits to prevent caching
header("Expires: 0");
header('Content-type: application/json'); header('Content-type: application/json');
echo($data); echo($data);
exit; exit;
?> ?>

52
maps/ir/ir.tiled-session
View File

@ -3,13 +3,12 @@
"height": 4300, "height": 4300,
"width": 2 "width": 2
}, },
"activeFile": "cellar/01/01.json", "activeFile": "garden.json",
"expandedProjectPaths": [ "expandedProjectPaths": [
"cellar/01", "randmaze",
"tiles", "tiles",
".", ".",
"cellar", "cellar/01"
"randmaze"
], ],
"file.lastUsedOpenFilter": "Alle Dateien (*)", "file.lastUsedOpenFilter": "Alle Dateien (*)",
"fileStates": { "fileStates": {
@ -87,10 +86,10 @@
}, },
"cellar.json": { "cellar.json": {
"scale": 1.5, "scale": 1.5,
"selectedLayer": 3, "selectedLayer": 9,
"viewCenter": { "viewCenter": {
"x": 3478.333333333333, "x": 3826.333333333333,
"y": 176.3333333333333 "y": 127.66666666666669
} }
}, },
"cellar.json#cija": { "cellar.json#cija": {
@ -101,7 +100,7 @@
}, },
"cellar/01/01.json": { "cellar/01/01.json": {
"scale": 1, "scale": 1,
"selectedLayer": 0, "selectedLayer": 10,
"viewCenter": { "viewCenter": {
"x": 553.5, "x": 553.5,
"y": 550.5 "y": 550.5
@ -112,9 +111,9 @@
}, },
"cellar/01/01_closed.json": { "cellar/01/01_closed.json": {
"scale": 0.8465435606060606, "scale": 0.8465435606060606,
"selectedLayer": 0, "selectedLayer": 12,
"viewCenter": { "viewCenter": {
"x": 528.6201689132502, "x": 527.4388947927736,
"y": 401.0425639017842 "y": 401.0425639017842
} }
}, },
@ -145,10 +144,10 @@
}, },
"garden.json": { "garden.json": {
"scale": 0.5, "scale": 0.5,
"selectedLayer": 10, "selectedLayer": 18,
"viewCenter": { "viewCenter": {
"x": 497, "x": 453,
"y": 1023 "y": 1021
} }
}, },
"garden.json#cija": { "garden.json#cija": {
@ -191,7 +190,7 @@
"selectedLayer": 6, "selectedLayer": 6,
"viewCenter": { "viewCenter": {
"x": 511.0390289839908, "x": 511.0390289839908,
"y": 527.0607931359214 "y": 527.61326776185
} }
}, },
"gmaze/gmaze.json#cija": { "gmaze/gmaze.json#cija": {
@ -246,8 +245,8 @@
"scale": 1.5, "scale": 1.5,
"selectedLayer": 6, "selectedLayer": 6,
"viewCenter": { "viewCenter": {
"x": 207.66666666666663, "x": 207.66666666666666,
"y": 208 "y": 208.3333333333333
} }
}, },
"gmaze/right.json#cija": { "gmaze/right.json#cija": {
@ -433,11 +432,11 @@
"scaleInDock": 1 "scaleInDock": 1
}, },
"lobby.json": { "lobby.json": {
"scale": 0.75, "scale": 0.33,
"selectedLayer": 9, "selectedLayer": 10,
"viewCenter": { "viewCenter": {
"x": 911.3333333333334, "x": 1022.7272727272727,
"y": 434 "y": 512.121212121212
} }
}, },
"lobby.json#mapUtilities": { "lobby.json#mapUtilities": {
@ -782,7 +781,7 @@
"selectedLayer": 8, "selectedLayer": 8,
"viewCenter": { "viewCenter": {
"x": 287.5, "x": 287.5,
"y": 287.5 "y": 288
} }
}, },
"warp.json#ir_logo_set": { "warp.json#ir_logo_set": {
@ -864,23 +863,24 @@
"warp.json", "warp.json",
"cellar/01/01.json", "cellar/01/01.json",
"tiles/mapUtilities.json", "tiles/mapUtilities.json",
"cellar/01/01_closed.json" "cellar/01/01_closed.json",
"tiles/cija.json"
], ],
"project": "ir.tiled-project", "project": "ir.tiled-project",
"property.type": "string", "property.type": "string",
"recentFiles": [ "recentFiles": [
"cellar.json", "cellar.json",
"lobby.json", "lobby.json",
"garden.json", "tiles/cija.json",
"warp.json",
"cellar/01/01_closed.json", "cellar/01/01_closed.json",
"tiles/mapUtilities.json", "tiles/mapUtilities.json",
"cellar/01/01.json", "cellar/01/01.json",
"warp.json",
"garden.json",
"cellar/01/02_open.json", "cellar/01/02_open.json",
"cellar/01/02_closed.json", "cellar/01/02_closed.json",
"gmaze/gmaze.json", "gmaze/gmaze.json",
"tiles/warntape.json", "tiles/warntape.json"
"gmaze/gmaze__template.json"
], ],
"tileset.lastUsedFormat": "json" "tileset.lastUsedFormat": "json"
} }

23
rc3_notes.md
View File

@ -162,21 +162,14 @@
* Workaround: Dynamische einamalige Dateinamen für Maps * Workaround: Dynamische einamalige Dateinamen für Maps
* Nachteil: Jeder Spieler bekommt eine andere Map, kein Multiplayer mehr * Nachteil: Jeder Spieler bekommt eine andere Map, kein Multiplayer mehr
* Funktioniert nur für Maps, nicht für Audio-Events * Funktioniert nur für Maps, nicht für Audio-Events
* Implementierung A: * Implementierung:
(1) Wenn eine Karte map.php aufgerufen wird: (1) Wenn eine Karte map.php aufgerufen wird:
* Lade map.json * Lade map.json
* Ersetze alle Exit-URLs der Form dest.php#start --> dest.timestamp.php#start * Ersetze alle Exit-URLs der Form dest.php#start --> dest.timestamp.php#start
(dest.json wird so gelassen, damit man wieder in Multiplayer-Maps zurück kann). (dest.json wird so gelassen, damit man wieder in Multiplayer-Maps zurück kann).
(2) URL-Rewrite rule via .htaccess: Entferne timestamp (2) URL-Rewrite rule via .htaccess: Entferne timestamp
RewriteRule ^(.+)\.\d+\.php$ $1.php RewriteRule ^(.+)\.\d+\.php$ $1.php
* Implementierung B (timestamp-patching ausgelagert in eigenes file):
(1) URL-Rewrite: Entferne timestamp und übergebe Mapnamen an uncache.php via URL-Parameter
RewriteRule ^(.+)\.\d+\.php$ uncache.php?target=$1
(2) In uncache.php:
* Wenn es target.php gibt, dann rufe diese auf und fange ihren output ab.
* sonst lade target.json
* Patch Exit-URLS mit timestamp.
* Cache deaktivieren Engineseitig: * Cache deaktivieren Engineseitig:
* Karten beim betreten neu laden * Karten beim betreten neu laden
@ -228,4 +221,16 @@
Für lokale Tests: Domains in /etc/hosts bzw. C:/windows/system32/drivers/etc/hosts eintragen Für lokale Tests: Domains in /etc/hosts bzw. C:/windows/system32/drivers/etc/hosts eintragen
https://xn--han-7ka.de/s/b3SKomnirgisMc9
https://play.workadventu.re/_/global/devlol-systems.pages.devlol.org/vspace-workadv/vspace.json
Du kannst dich gern mit mir vernetzen alexander@m4h.network bzw. alexander.stellmach@ose-germany.de
https://nemo.jstsmthrgk.eu/files/rc3graph.svg
https://play.workadventu.re/_/global/simondueckert.github.io/nuedigital/map.json
https://miro.com/app/board/o9J_laWLPI8=/
https://gitlab.com/fediventure/workadventure/-/tree/feature/federation/
https://gitlab.com/fediventure/fediventure/-/issues/2
https://git.devlol.org/devlol-systems/vspace-workadv/-/blob/master/.gitlab-ci.yml
https://obs.ninja/?view=8iiMHZa
https://github.com/tehwalris/vertiled
https://miro.com/app/board/o9J_laWLPI8=/