From d3b1b17aacf68b57d9acc3c6cc70f3d3ea9e7596 Mon Sep 17 00:00:00 2001 From: Makaci Michael Gabriel Date: Fri, 26 Jan 2024 11:42:56 +0100 Subject: [PATCH] Test API ship --- js/controllers/home.js | 29 ++++++-- js/controllers/systems.js | 135 ++++++++++++++++++++------------------ js/skama_code | 2 +- 3 files changed, 96 insertions(+), 70 deletions(-) diff --git a/js/controllers/home.js b/js/controllers/home.js index e872c3e..ee2ba0c 100644 --- a/js/controllers/home.js +++ b/js/controllers/home.js @@ -1,10 +1,27 @@ import menu_mod from "./menu_mod.js"; +import { My } from "../skama_code/api/agent.js"; +import { Ship } from "../skama_code/api/ship.js"; export default function home(temp_engine) { - console.log("test"); - temp_engine.after_render(menu_mod); - temp_engine.render("templates/home.html"); -} - - + console.log("test"); + temp_engine.after_render(menu_mod); + temp_engine.render("templates/home.html"); + if (My.agent) { + Ship.list((ships) => { + ships[0].orbit( + (response) => console.log(response), + (err) => console.log(err) + ); + ships[0].navigate( + "X1-TN14-A2", + (response) => { + console.log(response); + }, + (err) => { + console.log(err); + } + ); + }); + } +} diff --git a/js/controllers/systems.js b/js/controllers/systems.js index 363e924..41ea2f7 100644 --- a/js/controllers/systems.js +++ b/js/controllers/systems.js @@ -1,80 +1,89 @@ import { SystemBuilder } from "../skama_code/api/system.js"; -import menu_mod from "./menu_mod.js" -import system from "./system.js" +import menu_mod from "./menu_mod.js"; +import system from "./system.js"; -let canvas; +let canvas; let last_target; let offset = { - x: 2, - y: 2 + x: 2, + y: 2, }; let max = 100; -let w = (window.innerWidth/10)*9; -let h = (window.innerHeight/4)*3; +let w = (window.innerWidth / 10) * 9; +let h = (window.innerHeight / 4) * 3; function animate() { - canvas.renderAll(); - setTimeout(animate, 1000); + canvas.renderAll(); + setTimeout(animate, 1000); } function draw_system(system) { - let shadow = new fabric.Shadow({ - color: "white", - blur: 5, - offsetX: 0, - offsetY: 0, - }); - - fabric.Image.fromURL('/assets/systems/bluesystem.png', function(img_planet) { + let shadow = new fabric.Shadow({ + color: "white", + blur: 5, + offsetX: 0, + offsetY: 0, + }); - img_planet.set({ - selectable: false, - scaleX: 0.20, - scaleY: 0.20, - shadow: shadow, - left: system.position.x/offset.x + w/2, - top: system.position.y/offset.y+ h/2, - name: system.name, - type: system.type - }); - canvas.add(img_planet); - }); + fabric.Image.fromURL("/assets/systems/bluesystem.png", function (img_planet) { + img_planet.set({ + selectable: false, + scaleX: 0.2, + scaleY: 0.2, + shadow: shadow, + left: system.position.x / offset.x + w / 2, + top: system.position.y / offset.y + h / 2, + name: system.name, + type: system.type, + }); + canvas.add(img_planet); + }); } export function systems(temp_engine) { - temp_engine.after_render((temp_engine) => { - menu_mod(temp_engine); - canvas = new fabric.Canvas("canvas",{ - width: w, - height: h, - backgroundColor:"rgb(7, 18, 41)", - renderOnAddRemove: false, - hoverCursor :'pointer' - }); - SystemBuilder.list_all((systems) => { - systems.forEach(system => { - draw_system(system); - }); - animate(); - }); - canvas.on('mouse:up', (e) => { - if (e.target) system(e.target.name, temp_engine); - }); - $(window).on("resize", () => { - canvas.setWidth((window.innerWidth/10)*9); - canvas.setHeight((window.innerHeight/4)*3); - canvas.renderAll(); - }); - canvas.on("mouse:wheel", (opt) => { - console.log(opt.e.clientX); - let scale = 1.1; - if (opt.e.deltaY < 0) { - canvas.zoomToPoint(new fabric.Point(opt.e.clientX / canvas.getZoom(), opt.e.clienY / canvas.getZoom()), canvas.getZoom() * scale); - } else if (opt.e.deltaY > 0) { - canvas.zoomToPoint(new fabric.Point(canvas.width / 2, canvas.height / 2), canvas.getZoom() / scale); - } - }); + temp_engine.after_render((temp_engine) => { + menu_mod(temp_engine); + canvas = new fabric.Canvas("canvas", { + width: w, + height: h, + backgroundColor: "rgb(7, 18, 41)", + renderOnAddRemove: false, + hoverCursor: "pointer", + }); + const system_builder = new SystemBuilder(); + system_builder.list_all((systems) => { + systems.forEach((system) => { + draw_system(system); + }); + animate(); + }); + canvas.on("mouse:up", (e) => { + if (e.target) system(e.target.name, temp_engine); + }); + $(window).on("resize", () => { + canvas.setWidth((window.innerWidth / 10) * 9); + canvas.setHeight((window.innerHeight / 4) * 3); + canvas.renderAll(); }); - temp_engine.render("templates/systems/systems.html"); -} \ No newline at end of file + canvas.on("mouse:wheel", (opt) => { + console.log(opt.e.clientX); + let scale = 1.1; + if (opt.e.deltaY < 0) { + canvas.zoomToPoint( + new fabric.Point( + opt.e.clientX / canvas.getZoom(), + opt.e.clienY / canvas.getZoom() + ), + canvas.getZoom() * scale + ); + } else if (opt.e.deltaY > 0) { + canvas.zoomToPoint( + new fabric.Point(canvas.width / 2, canvas.height / 2), + canvas.getZoom() / scale + ); + } + }); + }); + temp_engine.render("templates/systems/systems.html"); +} diff --git a/js/skama_code b/js/skama_code index 129257e..7bbbfc5 160000 --- a/js/skama_code +++ b/js/skama_code @@ -1 +1 @@ -Subproject commit 129257efebc1f03b537b9a489d09774e8e7a3ed7 +Subproject commit 7bbbfc565e3e2555d50c4e117311d98e629998c9