gitea-mirror/KSP-MGA-Planner
1
0
Fork 0
mirror of https://github.com/Krafpy/KSP-MGA-Planner.git synced 2025-12-12 07:40:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added new sprites.

Browse Source
This commit is contained in:
Krafpy
2022-07-13 22:59:36 +02:00
parent 08f5d824d0
commit b8ca14519e
10 changed files with 160 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/config.yml
View File

@@ -64,4 +64,4 @@ workers:
trajectoryDraw:
samplePoints: 2500 # number sample points for each tarjectory arc draw
maneuvreArrowSize: 0.08 # size of the arrow sprites for maneuvers
spritesSize: 0.08 # size of the sprites for maneuvers, encounters, escapes

2
dist/main/main.js vendored
View File

@@ -19,7 +19,7 @@ async function main() {
await system.fillSceneObjects(scene, canvas);
const controls = new CameraController(camera, canvas, system, config);
controls.targetBody = system.sun;
Trajectory.preloadArrowMaterial();
Trajectory.preloadSpriteMaterials();
initEditor(controls, system, config, canvas);
const loop = () => {
requestAnimationFrame(loop);

99
dist/main/solvers/trajectory.js vendored
View File

@@ -6,8 +6,9 @@ export class Trajectory {
this.steps = steps;
this.system = system;
this.config = config;
this._orbitObjects = [];
this._spriteObjects = [];
this.orbits = [];
this._objects = [];
this._maneuvres = [];
this._flybys = [];
for (const { orbitElts, attractorId } of this.steps) {
@@ -16,14 +17,19 @@ export class Trajectory {
this.orbits.push(orbit);
}
}
static preloadArrowMaterial() {
static preloadSpriteMaterials() {
const textureLoader = new THREE.TextureLoader();
const loaded = (texture) => {
this.arrowMaterial = new THREE.SpriteMaterial({
map: texture
});
const loaded = (name) => {
return (texture) => {
const material = new THREE.SpriteMaterial({
map: texture
});
this.sprites.set(name, material);
};
};
textureLoader.load("sprites/arrow-512.png", loaded);
textureLoader.load("sprites/encounter.png", loaded("encounter"));
textureLoader.load("sprites/escape.png", loaded("escape"));
textureLoader.load("sprites/maneuver.png", loaded("maneuver"));
}
draw(resolution) {
this._createTrajectoryArcs(resolution);
@@ -32,6 +38,7 @@ export class Trajectory {
this._calculateFlybyDetails();
}
_createTrajectoryArcs(resolution) {
this._orbitObjects = [];
const { arcLineWidth } = this.config.orbit;
const { samplePoints } = this.config.trajectoryDraw;
const { scale } = this.config.rendering;
@@ -47,22 +54,55 @@ export class Trajectory {
});
const group = this.system.objectsOfBody(orbit.attractor.id);
group.add(orbitLine);
this._objects.push(orbitLine);
this._orbitObjects.push(orbitLine);
hue = (hue + 30) % 360;
}
}
_createManeuvreSprites() {
const { maneuvreArrowSize } = this.config.trajectoryDraw;
this._spriteObjects = [];
for (let i = 0; i < this.steps.length; i++) {
this._spriteObjects.push([]);
}
const { spritesSize } = this.config.trajectoryDraw;
const { scale } = this.config.rendering;
for (const step of this.steps) {
if (step.maneuvre) {
const group = this.system.objectsOfBody(step.attractorId);
const sprite = createSprite(Trajectory.arrowMaterial, 0xFFFFFF, false, maneuvreArrowSize);
const { x, y, z } = step.maneuvre.position;
sprite.position.set(x, y, z);
sprite.position.multiplyScalar(scale);
group.add(sprite);
this._objects.push(sprite);
const encounterSprite = Trajectory.sprites.get("encounter");
const escapeSprite = Trajectory.sprites.get("escape");
const maneuverSprite = Trajectory.sprites.get("maneuver");
const addSprite = (i, sprite, pos, group) => {
sprite.position.set(pos.x, pos.y, pos.z);
sprite.position.multiplyScalar(scale);
group.add(sprite);
this._spriteObjects[i].push(sprite);
};
for (let i = 0; i < this.steps.length; i++) {
const step = this.steps[i];
const orbit = this.orbits[i];
const { maneuvre, flyby } = step;
const group = this.system.objectsOfBody(step.attractorId);
if (maneuvre) {
const sprite = createSprite(maneuverSprite, 0xFFFFFF, false, spritesSize);
const { x, y, z } = maneuvre.position;
const pos = new THREE.Vector3(x, y, z);
addSprite(i, sprite, pos, group);
const { type } = maneuvre.context;
if (type == "ejection") {
const sprite = createSprite(escapeSprite, 0xFFFFFF, false, spritesSize);
const pos = orbit.positionFromTrueAnomaly(step.drawAngles.end);
addSprite(i, sprite, pos, group);
}
}
else if (flyby) {
const sprite1 = createSprite(encounterSprite, 0xFFFFFF, false, spritesSize);
const sprite2 = createSprite(escapeSprite, 0xFFFFFF, false, spritesSize);
const pos1 = orbit.positionFromTrueAnomaly(step.drawAngles.begin);
const pos2 = orbit.positionFromTrueAnomaly(step.drawAngles.end);
addSprite(i, sprite1, pos1, group);
addSprite(i, sprite2, pos2, group);
}
else if (i == this.steps.length - 2) {
const sprite = createSprite(encounterSprite, 0xFFFFFF, false, spritesSize);
const pos = orbit.positionFromTrueAnomaly(step.drawAngles.begin);
addSprite(i, sprite, pos, group);
}
}
}
@@ -204,13 +244,13 @@ export class Trajectory {
}
_displayStepsUpTo(index) {
for (let i = 0; i < this.steps.length; i++) {
const orbitLine = this._objects[i];
orbitLine.visible = i <= index;
}
const spritesStart = this.steps.length;
for (let i = 0; i < this._maneuvres.length; i++) {
const visible = this._objects[this._maneuvres[i].stepIndex].visible;
this._objects[spritesStart + i].visible = visible;
const orbitLine = this._orbitObjects[i];
const sprites = this._spriteObjects[i];
const visible = i <= index;
orbitLine.visible = visible;
for (const sprite of sprites) {
sprite.visible = visible;
}
}
}
get _totalDeltaV() {
@@ -224,9 +264,16 @@ export class Trajectory {
return total;
}
remove() {
for (const object of this._objects) {
for (const object of this._orbitObjects) {
if (object.parent)
object.parent.remove(object);
}
for (const sprites of this._spriteObjects) {
for (const sprite of sprites) {
if (sprite.parent)
sprite.parent.remove(sprite);
}
}
}
}
Trajectory.sprites = new Map();

BIN
sprites/arrow-512.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
sprites/encounter.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
sprites/escape.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
sprites/maneuver.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

2
src/main/main.ts
View File

@@ -32,7 +32,7 @@ async function main(){
const controls = new CameraController(camera, canvas, system, config);
controls.targetBody = system.sun;
Trajectory.preloadArrowMaterial();
Trajectory.preloadSpriteMaterials();
initEditor(controls, system, config, canvas);

113
src/main/solvers/trajectory.ts
View File

@@ -8,14 +8,16 @@ import { KSPTime } from "../utilities/time.js";
import { CameraController } from "../objects/camera.js";
export class Trajectory {
static sprites = new Map<string, THREE.SpriteMaterial>();
private _orbitObjects: THREE.Object3D[] = [];
private _spriteObjects: THREE.Sprite[][] = [];
public readonly orbits: Orbit[] = [];
private readonly _objects: THREE.Object3D[] = [];
private readonly _maneuvres: ManeuvreDetails[] = [];
private readonly _flybys: FlybyDetails[] = [];
static arrowMaterial: THREE.SpriteMaterial;
constructor(public readonly steps: TrajectoryStep[], public readonly system: SolarSystem, public readonly config: Config) {
for(const {orbitElts, attractorId} of this.steps) {
const attractor = this.system.bodyFromId(attractorId);
@@ -24,15 +26,21 @@ export class Trajectory {
}
}
public static preloadArrowMaterial() {
public static preloadSpriteMaterials(){
const textureLoader = new THREE.TextureLoader();
const loaded = (texture: THREE.Texture) => {
this.arrowMaterial = new THREE.SpriteMaterial({
map: texture
});
}
textureLoader.load("sprites/arrow-512.png", loaded);
}
const loaded = (name: string) => {
return (texture: THREE.Texture) => {
const material = new THREE.SpriteMaterial({
map: texture
});
this.sprites.set(name, material);
};
};
textureLoader.load("sprites/encounter.png", loaded("encounter"));
textureLoader.load("sprites/escape.png", loaded("escape"));
textureLoader.load("sprites/maneuver.png", loaded("maneuver"));
}
public draw(resolution: {width: number, height: number}){
this._createTrajectoryArcs(resolution);
@@ -42,6 +50,8 @@ export class Trajectory {
}
private _createTrajectoryArcs(resolution: {width: number, height: number}){
this._orbitObjects = [];
const {arcLineWidth} = this.config.orbit;
const {samplePoints} = this.config.trajectoryDraw;
const {scale} = this.config.rendering;
@@ -58,24 +68,62 @@ export class Trajectory {
});
const group = this.system.objectsOfBody(orbit.attractor.id);
group.add(orbitLine);
this._objects.push(orbitLine);
this._orbitObjects.push(orbitLine);
hue = (hue + 30) % 360;
}
}
private _createManeuvreSprites(){
const {maneuvreArrowSize} = this.config.trajectoryDraw;
this._spriteObjects = [];
for(let i = 0; i < this.steps.length; i++){
this._spriteObjects.push([]);
}
const {spritesSize} = this.config.trajectoryDraw;
const {scale} = this.config.rendering;
for(const step of this.steps){
if(step.maneuvre){
const group = this.system.objectsOfBody(step.attractorId);
const sprite = createSprite(Trajectory.arrowMaterial, 0xFFFFFF, false, maneuvreArrowSize);
const {x, y, z} = step.maneuvre.position;
sprite.position.set(x, y, z);
sprite.position.multiplyScalar(scale);
group.add(sprite);
this._objects.push(sprite);
const encounterSprite = <THREE.SpriteMaterial>Trajectory.sprites.get("encounter");
const escapeSprite = <THREE.SpriteMaterial>Trajectory.sprites.get("escape");
const maneuverSprite = <THREE.SpriteMaterial>Trajectory.sprites.get("maneuver");
const addSprite = (i: number, sprite: THREE.Sprite, pos: THREE.Vector3, group: THREE.Group) => {
sprite.position.set(pos.x, pos.y, pos.z);
sprite.position.multiplyScalar(scale);
group.add(sprite);
this._spriteObjects[i].push(sprite);
};
for(let i = 0; i < this.steps.length; i++){
const step = this.steps[i];
const orbit = this.orbits[i];
const {maneuvre, flyby} = step;
const group = this.system.objectsOfBody(step.attractorId);
if(maneuvre){
const sprite = createSprite(maneuverSprite, 0xFFFFFF, false, spritesSize);
const {x, y, z} = maneuvre.position;
const pos = new THREE.Vector3(x, y, z);
addSprite(i, sprite, pos, group);
const {type} = maneuvre.context;
if(type == "ejection"){
const sprite = createSprite(escapeSprite, 0xFFFFFF, false, spritesSize);
const pos = orbit.positionFromTrueAnomaly(step.drawAngles.end);
addSprite(i, sprite, pos, group);
}
} else if(flyby){
const sprite1 = createSprite(encounterSprite, 0xFFFFFF, false, spritesSize);
const sprite2 = createSprite(escapeSprite, 0xFFFFFF, false, spritesSize);
const pos1 = orbit.positionFromTrueAnomaly(step.drawAngles.begin);
const pos2 = orbit.positionFromTrueAnomaly(step.drawAngles.end);
addSprite(i, sprite1, pos1, group);
addSprite(i, sprite2, pos2, group);
} else if(i == this.steps.length - 2){
const sprite = createSprite(encounterSprite, 0xFFFFFF, false, spritesSize);
const pos = orbit.positionFromTrueAnomaly(step.drawAngles.begin);
addSprite(i, sprite, pos, group);
}
}
}
@@ -256,13 +304,13 @@ export class Trajectory {
private _displayStepsUpTo(index: number){
for(let i = 0; i < this.steps.length; i++){
const orbitLine = this._objects[i];
orbitLine.visible = i <= index;
}
const spritesStart = this.steps.length;
for(let i = 0; i < this._maneuvres.length; i++){
const visible = this._objects[this._maneuvres[i].stepIndex].visible;
this._objects[spritesStart + i].visible = visible;
const orbitLine = this._orbitObjects[i];
const sprites = this._spriteObjects[i];
const visible = i <= index;
orbitLine.visible = visible;
for(const sprite of sprites){
sprite.visible = visible;
}
}
}
@@ -278,8 +326,13 @@ export class Trajectory {
}
public remove() {
for(const object of this._objects) {
for(const object of this._orbitObjects) {
if(object.parent) object.parent.remove(object);
}
for(const sprites of this._spriteObjects) {
for(const sprite of sprites){
if(sprite.parent) sprite.parent.remove(sprite);
}
}
}
}

2
src/types.d.ts vendored
View File

@@ -52,7 +52,7 @@ interface OrbitSettings {
interface TrajectoryDrawSettings {
readonly samplePoints: number;
readonly maneuvreArrowSize: number;
readonly spritesSize: number;
}
interface CameraSettings {