andras/decla-red
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

Fix issues

Browse source
This commit is contained in:
schmelczerandras 2020-11-09 10:33:20 +01:00
parent 7cf33b9f1a
commit a4bab29d84
7 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

12
backend/src/objects/circle-physical.ts
View file

@ -1,5 +1,11 @@
import { vec2 } from 'gl-matrix';
import { Circle, CommandReceiver, GameObject, serializesTo } from 'shared';
import {
Circle,
CommandExecutors,
CommandReceiver,
GameObject,
serializesTo,
} from 'shared';
import { BoundingBox } from '../physics/bounding-boxes/bounding-box';
import { BoundingBoxBase } from '../physics/bounding-boxes/bounding-box-base';
import { moveCircle } from '../physics/functions/move-circle';
@ -17,6 +23,10 @@ export class CirclePhysical extends CommandReceiver implements Circle, DynamicPh
private _boundingBox: BoundingBox;
protected commandExecutors: CommandExecutors = {
[ReactToCollisionCommand.type]: this.onCollision.bind(this),
};
constructor(
private _center: vec2,
private _radius: number,

2
backend/src/objects/planet-physical.ts
View file

@ -153,7 +153,7 @@ export class PlanetPhysical extends PlanetBase implements StaticPhysical {
public getForce(position: vec2): vec2 {
const diff = vec2.subtract(vec2.create(), this.center, position);
const dist = Math.max(0, vec2.length(diff) - 600);
const dist = Math.max(0, vec2.length(diff) - this.radius);
vec2.normalize(diff, diff);
const scale = clamp(
settings.maxGravityQ * ((settings.maxGravityDistance / dist) ** 1.5 - 1),