niklas/cc-haxe
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

made GPS a static class

Browse Source
This commit is contained in:
Djeeberjr
2023-07-30 15:42:02 +02:00
parent 97c906e013
commit 5a9d463192
6 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/GPS.hx
View File

@@ -16,13 +16,13 @@ class GPS extends CLIAppBase {
var pos: Pos3 = new Vec3<Float>(x, y, z);
kernel.gps.GPS.instance.setManualPosition(pos);
kernel.gps.GPS.setManualPosition(pos);
return true;
},"<x> <y> <z>");
registerSyncSubcommand("status",(args)->{
var pos = kernel.gps.GPS.instance.getPosition();
var pos = kernel.gps.GPS.getPosition();
if (pos != null) {
handle.writeLine('Position x:${pos.x} y:${pos.y} z:${pos.z}');
} else {
@@ -30,7 +30,7 @@ class GPS extends CLIAppBase {
return true;
}
var acc = kernel.gps.GPS.instance.getAccuracy();
var acc = kernel.gps.GPS.getAccuracy();
if (acc == 1){
handle.writeLine("Accuracy: Low");
} else if (acc == 2){
@@ -50,7 +50,7 @@ class GPS extends CLIAppBase {
});
registerAsyncSubcommand("locate",(args)->{
return kernel.gps.GPS.instance.locate().map((pos)->{
return kernel.gps.GPS.locate().map((pos)->{
if (pos != null) {
handle.writeLine('Position x:${pos.x} y:${pos.y} z:${pos.z}');
} else {

6
src/bin/pathfinder/PFClient.hx
View File

@@ -35,14 +35,14 @@ class PFClient implements Process {
}
private function render() {
var acc = kernel.gps.GPS.instance.getAccuracy();
var pos: Pos3 = kernel.gps.GPS.instance.getPosition() ?? {x: 0, y: 0, z: 0};
var acc = kernel.gps.GPS.getAccuracy();
var pos: Pos3 = kernel.gps.GPS.getPosition() ?? {x: 0, y: 0, z: 0};
var childre: Array<UIElement> = [
new TextElement('Acc: ${acc}'),
new TextElement('Pos: X:${pos.x} Y:${pos.y} Z:${pos.z}'),
new TextElement('UPDATE', { style: {bgColor: Gray}, uiEvents: {onClick: () -> {
kernel.gps.GPS.instance.locate().handle((pos) ->{
kernel.gps.GPS.locate().handle((pos) ->{
this.requestRender();
});
}}}),