Skip to content

erp5
erp5
Commit a4b99d99 authored by Léo-Paul Géneau's avatar Léo-Paul Géneau 👾
Browse files
Options

erp5_officejs_drone_capture_flag: fix projection proportionality 

Fix projection by not making a square map from non square limits (width != depth).
This way rotation does not result anymore in deformed shapes (it was the case until now because proportionality was not respected between width and depth).
parent 40aad952
Show whitespace changes
Inline Side-by-side
Showing with 189 additions and 193 deletions
bt5/erp5_officejs_drone_capture_flag/PathTemplateItem/web_page_module/drone_capture_flag_logic_js.js
View file @ a4b99d99
......@@ -524,14 +524,11 @@ var MapManager = /** @class */ (function () {
_this.map_info.initial_position.longitude,
_this.map_info.initial_position.altitude
);
max = _this.map_info.width;
if (_this.map_info.depth > max) {
max = _this.map_info.depth;
}
if (_this.map_info.height > max) {
max = _this.map_info.height;
}
max = max < _this.map_info.depth ? _this.map_info.depth : max;
max = Math.max(
_this.map_info.depth,
_this.map_info.height,
_this.map_info.width
);
// Skybox
max_sky = (max * 15 < 20000) ? max * 15 : 20000; //skybox scene limit
skybox = BABYLON.MeshBuilder.CreateBox("skyBox", { size: max_sky }, scene);
......@@ -564,7 +561,7 @@ var MapManager = /** @class */ (function () {
terrain = scene.getMeshByName("terrain001");
terrain.isVisible = true;
terrain.position = BABYLON.Vector3.Zero();
terrain.scaling = new BABYLON.Vector3(depth / 50000, depth / 50000,
terrain.scaling = new BABYLON.Vector3(depth / 50000, _this.map_info.height / 50000,
width / 50000);
// Enemies
_this._enemy_list = [];
......@@ -697,12 +694,6 @@ var MapManager = /** @class */ (function () {
MapManager.prototype.latLonDistance = function (c1, c2) {
return this.mapUtils.latLonDistance(c1, c2);
};
MapManager.prototype.longitudToX = function (lon) {
return this.mapUtils.longitudToX(lon);
};
MapManager.prototype.latitudeToY = function (lat) {
return this.mapUtils.latitudeToY(lat);
};
MapManager.prototype.convertToLocalCoordinates =
function (latitude, longitude, altitude) {
return this.mapUtils.convertToLocalCoordinates(
......@@ -862,12 +853,14 @@ var GameManager = /** @class */ (function () {
GameManager.prototype._checkDroneOut = function (drone) {
if (drone.position) {
var map_limit = this._mapManager.getMapInfo().map_size / 2;
return (drone.position.z > this._mapManager.getMapInfo().height) ||
(drone.position.x < -map_limit) ||
(drone.position.x > map_limit) ||
(drone.position.y < -map_limit) ||
(drone.position.y > map_limit);
var map_info = this._mapManager.getMapInfo(),
width_limit = map_info.width / 2,
depth_limit = map_info.depth / 2;
return (drone.position.z > map_info.height) ||
(drone.position.x < -width_limit) ||
(drone.position.x > width_limit) ||
(drone.position.y < -depth_limit) ||
(drone.position.y > depth_limit);
}
};
......
bt5/erp5_officejs_drone_capture_flag/PathTemplateItem/web_page_module/drone_capture_flag_logic_js.xml
View file @ a4b99d99
......@@ -246,7 +246,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1016.21978.22579.46609</string> </value>
<value> <string>1017.22488.12960.6280</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -266,7 +266,7 @@
</tuple>
<state>
<tuple>
<float>1714742387.62</float>
<float>1718705497.6</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs_drone_capture_flag/PathTemplateItem/web_page_module/drone_capture_flag_map_utils_js.js
View file @ a4b99d99
/*jslint nomen: true, indent: 2, maxlen: 80, todo: true, unparam: true */
/******************************* MAP UTILS ************************************/
var MapUtils = /** @class */ (function () {
......@@ -7,13 +9,7 @@ var MapUtils = /** @class */ (function () {
//** CONSTRUCTOR
function MapUtils(map_param) {
var _this = this, max_width = _this.latLonDistance(
[map_param.min_lat, map_param.min_lon],
[map_param.min_lat, map_param.max_lon]),
max_depth = _this.latLonDistance(
[map_param.min_lat, map_param.min_lon],
[map_param.max_lat, map_param.min_lon]),
map_size = Math.ceil(Math.max(max_width, max_depth));
var _this = this;
_this.map_param = {};
_this.map_param.height = map_param.height;
_this.map_param.start_AMSL = map_param.start_AMSL;
......@@ -21,15 +17,19 @@ var MapUtils = /** @class */ (function () {
_this.map_param.max_lat = map_param.max_lat;
_this.map_param.min_lon = map_param.min_lon;
_this.map_param.max_lon = map_param.max_lon;
_this.map_param.depth = map_size;
_this.map_param.width = map_size;
_this.map_param.map_size = map_size;
_this.map_param.depth = _this.latLonDistance(
[map_param.min_lat, map_param.min_lon],
[map_param.max_lat, map_param.min_lon]
);
_this.map_param.width = _this.latLonDistance(
[map_param.min_lat, map_param.min_lon],
[map_param.min_lat, map_param.max_lon]
);
_this.map_info = {
"depth": _this.map_param.depth,
"width": _this.map_param.width,
"flag_distance_epsilon": map_param.flag_distance_epsilon || FLAG_EPSILON
};
_this.map_info.map_size = _this.map_param.map_size;
_this.map_info.height = _this.map_param.height;
_this.map_info.start_AMSL = _this.map_param.start_AMSL;
_this.map_info.min_x = _this.longitudToX(map_param.min_lon);
......@@ -50,10 +50,10 @@ var MapUtils = /** @class */ (function () {
return R * c;
};
MapUtils.prototype.longitudToX = function (lon) {
return (this.map_info.map_size / 360.0) * (180 + lon);
return (this.map_info.width / 360.0) * (180 + lon);
};
MapUtils.prototype.latitudeToY = function (lat) {
return (this.map_info.map_size / 180.0) * (90 - lat);
return (this.map_info.depth / 180.0) * (90 - lat);
};
MapUtils.prototype.convertToLocalCoordinates =
function (latitude, longitude, altitude) {
......@@ -61,24 +61,22 @@ var MapUtils = /** @class */ (function () {
x = this.longitudToX(longitude),
y = this.latitudeToY(latitude);
return {
x: ((x - map_info.min_x) / (map_info.max_x - map_info.min_x)) *
1000 - map_info.width / 2,
y: ((y - map_info.min_y) / (map_info.max_y - map_info.min_y)) *
1000 - map_info.depth / 2,
x: (((x - map_info.min_x) / (map_info.max_x - map_info.min_x)) - 0.5)
* map_info.width,
y: (((y - map_info.min_y) / (map_info.max_y - map_info.min_y)) - 0.5)
* map_info.depth,
z: altitude
};
};
MapUtils.prototype.convertToGeoCoordinates = function (x, y, z) {
var lon = x + this.map_info.width / 2,
lat = y + this.map_info.depth / 2;
lon = lon / 1000;
var lon = (x / this.map_info.width) + 0.5,
lat = (y / this.map_info.depth) + 0.5;
lon = lon * (this.map_info.max_x - this.map_info.min_x) +
this.map_info.min_x;
lon = lon / (this.map_info.map_size / 360.0) - 180;
lat = lat / 1000;
lon = lon / (this.map_info.width / 360.0) - 180;
lat = lat * (this.map_info.max_y - this.map_info.min_y) +
this.map_info.min_y;
lat = 90 - lat / (this.map_info.map_size / 180.0);
lat = 90 - lat / (this.map_info.depth / 180.0);
return {
latitude: lat,
longitude: lon,
......@@ -127,11 +125,11 @@ var MapUtils = /** @class */ (function () {
function fillObstacleList(list, min_x, min_y, max_x, max_y) {
var i, el, result_list = [];
for (i = 0; i < list.length; i += 1) {
el = {"position":
{"x": 0, "y": 0, "z": 0},
"scale":
{"x": 0, "y": 0, "z": 0},
"type": list[i].type};
el = {
"position": {"x": 0, "y": 0, "z": 0},
"scale": {"x": 0, "y": 0, "z": 0},
"type": list[i].type
};
if (list[i].rotation) {
el.rotation = {"x": list[i].rotation.x, "y": list[i].rotation.y,
"z": list[i].rotation.z};
......@@ -149,14 +147,18 @@ var MapUtils = /** @class */ (function () {
return result_list;
}
return {
"flag_list": fillFlagList(template.flag_list, min_x, min_y, max_x, max_y),
"obstacle_list": fillObstacleList(template.obstacle_list, min_x, min_y, max_x, max_y),
"enemy_list": fillEnemyList(template.enemy_list, min_x, min_y, max_x, max_y)
"flag_list":
fillFlagList(template.flag_list, min_x, min_y, max_x, max_y),
"obstacle_list":
fillObstacleList(template.obstacle_list, min_x, min_y, max_x, max_y),
"enemy_list":
fillEnemyList(template.enemy_list, min_x, min_y, max_x, max_y)
};
}
// 4x4 grid
var GRID = 4, i, j, map_size = this.map_info.map_size, initial_block,
x1, y1, x2, y2, block_result, index, block_size = map_size / GRID,
var GRID = 4, i, j, max_width = this.map_info.width,
max_depth = this.map_info.depth, initial_block, x1, y1, x2, y2,
block_result, index, block_size = Math.max(max_width, max_depth) / GRID,
result_map,
BLOCK_TEMPLATE_LIST = [{
"flag_list": [{"position":
......@@ -250,32 +252,37 @@ var MapUtils = /** @class */ (function () {
x = Math.floor(seed.quick() * GRID);
y = Math.floor(seed.quick() * GRID);
//ensure intial block is in the edge of map
} while (x !== 0 && x !== GRID-1 && y !== 0 && y !== GRID-1);
} while (x !== 0 && x !== GRID - 1 && y !== 0 && y !== GRID - 1);
return {x: x, y: y};
}
initial_block = getInitialBlock(GRID);
function checkConditions(json_map, GRID) {
if (!json_map) return false;
var f, flag, g, n_mountains = 0;
if (!json_map) {
return false;
}
// set ~20% of the blocks with flags
if (json_map.flag_list.length !== Math.round(GRID * GRID * 0.2)) return false;
if (json_map.flag_list.length !== Math.round(GRID * GRID * 0.2)) {
return false;
}
// limit n_mountains
if (json_map.obstacle_list.length > 3) {
var i, n_mountains = 0;
for (i = 0; i < json_map.obstacle_list.length; i += 1) {
if (json_map.obstacle_list[i].type === "mountain") {
for (g = 0; g < json_map.obstacle_list.length; g += 1) {
if (json_map.obstacle_list[g].type === "mountain") {
n_mountains += 1;
if (n_mountains > 3) {
return false;
}
json_map.obstacle_list[i].type = "box";
json_map.obstacle_list[g].type = "box";
}
}
}
var f;
// at least one flag in the oposite side of drones initial position
for (f = 0; f < json_map.flag_list.length; f += 1) {
if ((json_map.flag_list[f].position.x * json_map.initial_position.x) < 0 ||
(json_map.flag_list[f].position.y * json_map.initial_position.y) < 0) {
flag = json_map.flag_list[f];
if ((flag.position.x * json_map.initial_position.x) < 0 ||
(flag.position.y * json_map.initial_position.y) < 0) {
return true;
}
}
......@@ -284,25 +291,30 @@ var MapUtils = /** @class */ (function () {
do {
result_map = {
"flag_list": [],
"initial_position": null,
"obstacle_list": [],
"enemy_list": []
};
for (i = 0; i < GRID; i += 1) {
for (j = 0; j < GRID; j += 1) {
index = Math.floor(seed.quick() * BLOCK_TEMPLATE_LIST.length);
x1 = block_size * i - map_size / 2;
y1 = block_size * j - map_size / 2;
x2 = block_size * i + block_size - map_size / 2;
y2 = block_size * j + block_size - map_size / 2;
x1 = block_size * i - max_width / 2;
y1 = block_size * j - max_depth / 2;
x2 = block_size * i + block_size - max_width / 2;
y2 = block_size * j + block_size - max_depth / 2;
if (initial_block.x === i && initial_block.y === j) {
result_map.initial_position = {x: normalize(50, x1, x2),
y: normalize(50, y1, y2),
z: 15 };
} else {
block_result = fillTemplate(BLOCK_TEMPLATE_LIST[index], x1, y1, x2, y2);
result_map.flag_list = result_map.flag_list.concat(block_result.flag_list);
result_map.obstacle_list = result_map.obstacle_list.concat(block_result.obstacle_list);
result_map.enemy_list = result_map.enemy_list.concat(block_result.enemy_list);
block_result =
fillTemplate(BLOCK_TEMPLATE_LIST[index], x1, y1, x2, y2);
result_map.flag_list =
result_map.flag_list.concat(block_result.flag_list);
result_map.obstacle_list =
result_map.obstacle_list.concat(block_result.obstacle_list);
result_map.enemy_list =
result_map.enemy_list.concat(block_result.enemy_list);
}
}
}
......@@ -316,7 +328,7 @@ var MapUtils = /** @class */ (function () {
MapUtils.prototype.randomize = function (seed) {
//TODO randomize start_ASML, map height, depth and width?
var _this = this, flag_list, obstacle_list, enemy_list,
geo_flag_info, geo_obstacle, geo_enemy, coordinates,
geo_flag_info, geo_obstacle, geo_enemy,
random_seed = new Math.seedrandom(seed),
randomized_map = _this.randomizeByBlockTemplates(random_seed);
obstacle_list = randomized_map.obstacle_list;
......@@ -346,7 +358,7 @@ var MapUtils = /** @class */ (function () {
_this.map_info.flag_list.push(geo_flag_info);
});
obstacle_list.forEach(function (obstacle_info, index) {
geo_obstacle = {};
geo_obstacle = {position: null};
Object.assign(geo_obstacle, obstacle_info);
geo_obstacle.position = _this.convertToGeoCoordinates(
obstacle_info.position.x,
......@@ -356,7 +368,7 @@ var MapUtils = /** @class */ (function () {
_this.map_info.obstacle_list.push(geo_obstacle);
});
enemy_list.forEach(function (enemy_info, index) {
geo_enemy = {};
geo_enemy = {position: null};
Object.assign(geo_enemy, enemy_info);
geo_enemy.position = _this.convertToGeoCoordinates(
enemy_info.position.x,
......
bt5/erp5_officejs_drone_capture_flag/PathTemplateItem/web_page_module/drone_capture_flag_map_utils_js.xml
View file @ a4b99d99
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1011.57448.22674.29627</string> </value>
<value> <string>1017.22488.12960.6280</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1697557365.44</float>
<float>1718708011.02</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_logic_js.js
View file @ a4b99d99
......@@ -434,14 +434,11 @@ var MapManager = /** @class */ (function () {
var _this = this, max_sky, skybox, skyboxMat, largeGroundMat,
largeGroundBottom, width, depth, terrain, max;
this.setMapInfo(GAMEPARAMETERS.map, GAMEPARAMETERS.initialPosition);
max = _this.map_info.width;
if (_this.map_info.depth > max) {
max = _this.map_info.depth;
}
if (_this.map_info.height > max) {
max = _this.map_info.height;
}
max = max < _this.map_info.depth ? _this.map_info.depth : max;
max = Math.max(
_this.map_info.depth,
_this.map_info.height,
_this.map_info.width
);
// Skybox
max_sky = (max * 10 < 20000) ? max * 10 : 20000;
skybox = BABYLON.Mesh.CreateBox("skyBox", max_sky, scene);
......@@ -475,20 +472,16 @@ var MapManager = /** @class */ (function () {
terrain = scene.getMeshByName("terrain001");
terrain.isVisible = true;
terrain.position = BABYLON.Vector3.Zero();
terrain.scaling = new BABYLON.Vector3(depth / 50000, depth / 50000,
terrain.scaling = new BABYLON.Vector3(depth / 50000, _this.map_info.height / 50000,
width / 50000);
}
MapManager.prototype.setMapInfo = function (map_dict, initial_position) {
var max_width = this.latLonDistance([map_dict.min_lat, map_dict.min_lon],
[map_dict.min_lat, map_dict.max_lon]),
max_height = this.latLonDistance([map_dict.min_lat, map_dict.min_lon],
[map_dict.max_lat, map_dict.min_lon]),
map_size = Math.ceil(Math.max(max_width, max_height));
this.map_info = {
"depth": map_size,
"depth": this.latLonDistance([map_dict.min_lat, map_dict.min_lon],
[map_dict.max_lat, map_dict.min_lon]),
"height": map_dict.height,
"width": map_size,
"map_size": map_size,
"width": this.latLonDistance([map_dict.min_lat, map_dict.min_lon],
[map_dict.min_lat, map_dict.max_lon]),
"start_AMSL": map_dict.start_AMSL
};
this.map_info.min_x = this.longitudToX(map_dict.min_lon);
......@@ -505,10 +498,10 @@ var MapManager = /** @class */ (function () {
return this.map_info;
};
MapManager.prototype.longitudToX = function (lon) {
return (this.map_info.map_size / 360.0) * (180 + lon);
return (this.map_info.width / 360.0) * (180 + lon);
};
MapManager.prototype.latitudeToY = function (lat) {
return (this.map_info.map_size / 180.0) * (90 - lat);
return (this.map_info.depth / 180.0) * (90 - lat);
};
MapManager.prototype.latLonDistance = function (c1, c2) {
var R = 6371e3,
......@@ -528,24 +521,22 @@ var MapManager = /** @class */ (function () {
x = this.longitudToX(longitude),
y = this.latitudeToY(latitude);
return {
x: ((x - map_info.min_x) / (map_info.max_x - map_info.min_x))
* 1000 - map_info.width / 2,
y: ((y - map_info.min_y) / (map_info.max_y - map_info.min_y))
* 1000 - map_info.depth / 2,
x: (((x - map_info.min_x) / (map_info.max_x - map_info.min_x)) - 0.5)
* map_info.width,
y: (((y - map_info.min_y) / (map_info.max_y - map_info.min_y)) - 0.5)
* map_info.depth,
z: altitude
};
};
MapManager.prototype.convertToGeoCoordinates = function (x, y, z) {
var lon = x + this.map_info.width / 2,
lat = y + this.map_info.depth / 2;
lon = lon / 1000;
var lon = (x / this.map_info.width) + 0.5,
lat = (y / this.map_info.depth) + 0.5;
lon = lon * (this.map_info.max_x - this.map_info.min_x) +
this.map_info.min_x;
lon = lon / (this.map_info.map_size / 360.0) - 180;
lat = lat / 1000;
lon = lon / (this.map_info.width / 360.0) - 180;
lat = lat * (this.map_info.max_y - this.map_info.min_y) +
this.map_info.min_y;
lat = 90 - lat / (this.map_info.map_size / 180.0);
lat = 90 - lat / (this.map_info.depth / 180.0);
return {
latitude: lat,
longitude: lon,
......
bt5/erp5_officejs_drone_simulator/PathTemplateItem/web_page_module/drone_simulator_logic_js.xml
View file @ a4b99d99
......@@ -240,7 +240,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>1016.21987.28184.16844</string> </value>
<value> <string>1017.22507.46137.47957</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1714742619.34</float>
<float>1718706020.19</float>
<string>UTC</string>
</tuple>
</state>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7