Commit 116fec10 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

parents aec38d28 1049884e
Pipeline #83837 failed with stages
in 101 minutes and 11 seconds
......@@ -43,6 +43,8 @@ VadereSimulator/testResources/**/*.legacy
#model test output
VadereModelTests/**/output
VadereModelTests/*_private
VadereModelCalibration/**/output
VadereModelTests/**/legacy
VadereUtils/output/**
......
......@@ -259,7 +259,16 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"teleporter" : {
"shift" : {
"x" : -40.0,
"y" : 0.0
},
"position" : {
"x" : 42.0,
"y" : 0.0
}
},
"attributesCar" : null
},
"eventInfos" : [ ]
......
......@@ -259,7 +259,16 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"teleporter" : {
"shift" : {
"x" : -40.0,
"y" : 0.0
},
"position" : {
"x" : 42.0,
"y" : 0.0
}
},
"attributesCar" : null
},
"eventInfos" : [ ]
......
......@@ -436,6 +436,16 @@
"groupIds": "scenario.&3.&2.[&1].&0",
"type": "scenario.&3.&2.[&1].&0"
}
},
"teleporter" : {
"shift" : {
"x" : "scenario.&3.&2.&1.&0",
"y" : "scenario.&3.&2.&1.&0"
},
"position" : {
"x" : "scenario.&3.&2.&1.&0",
"y" : "scenario.&3.&2.&1.&0"
}
}
}
}
......@@ -494,7 +504,8 @@
"maximumSpeed": "3.0",
"acceleration": "2.0"
},
"attributesCar": null
"attributesCar": null,
"teleporter" : null
}
}
}
......
......@@ -442,6 +442,16 @@
"groupIds": "scenario.&3.&2.[&1].&0",
"type": "scenario.&3.&2.[&1].&0"
}
},
"teleporter" : {
"shift" : {
"x" : "scenario.&3.&2.&1.&0",
"y" : "scenario.&3.&2.&1.&0"
},
"position" : {
"x" : "scenario.&3.&2.&1.&0",
"y" : "scenario.&3.&2.&1.&0"
}
}
}
}
......@@ -500,7 +510,8 @@
"maximumSpeed": "3.0",
"acceleration": "2.0"
},
"attributesCar": null
"attributesCar": null,
"teleporter" : null
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment