mlow/asteroids
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add angularVelocity to VelocityComponent

Browse Source 
Use it to control player rotation.
This commit is contained in:
Matt Low 2020-01-28 23:03:45 +04:00
parent 3918f8c1f5
commit 3ffb274e8d
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/me/asteroids/components/VelocityComponent.java
View File

@ -6,6 +6,7 @@ import com.me.common.ecs.Component;
public class VelocityComponent implements Component { public class VelocityComponent implements Component {
public Vector2 velocity; public Vector2 velocity;
public float angularVelocity;
public float maxVelocity = Float.MAX_VALUE; public float maxVelocity = Float.MAX_VALUE;

11
core/src/com/me/asteroids/systems/MovementSystem.java
View File

@ -1,6 +1,8 @@
package com.me.asteroids.systems; package com.me.asteroids.systems;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.me.asteroids.Utils;
import com.me.asteroids.components.AccelerationComponent; import com.me.asteroids.components.AccelerationComponent;
import com.me.asteroids.components.model.Model; import com.me.asteroids.components.model.Model;
import com.me.asteroids.components.ModelComponent; import com.me.asteroids.components.ModelComponent;
@ -35,19 +37,24 @@ public class MovementSystem extends EntitySystem {
VelocityComponent velocityComponent = velocityMapper.get(entity); VelocityComponent velocityComponent = velocityMapper.get(entity);
Vector2 velocity = velocityComponent.velocity; Vector2 velocity = velocityComponent.velocity;
float maxVelocity = velocityComponent.maxVelocity;
Vector2 position = positionComponent.position;
AccelerationComponent accelComponent = accelMapper.get(entity); AccelerationComponent accelComponent = accelMapper.get(entity);
if (accelComponent != null && !accelComponent.acceleration.isZero()) { if (accelComponent != null && !accelComponent.acceleration.isZero()) {
velocity.add(tmp.set(accelComponent.acceleration).scl(dt)); velocity.add(tmp.set(accelComponent.acceleration).scl(dt));
} }
float maxVelocity = velocityComponent.maxVelocity;
Vector2 position = positionComponent.position;
if (!velocity.isZero()) { if (!velocity.isZero()) {
velocity.clamp(0, maxVelocity); velocity.clamp(0, maxVelocity);
position.add(tmp.set(velocity).scl(dt)); position.add(tmp.set(velocity).scl(dt));
} }
float angularVelocity = velocityComponent.angularVelocity;
if (!MathUtils.isZero(angularVelocity)) {
positionComponent.rotation = Utils.wrapAngle(positionComponent.rotation + (angularVelocity * dt));
}
ModelComponent modelComponent = modelMapper.get(entity); ModelComponent modelComponent = modelMapper.get(entity);
if (modelComponent != null) { if (modelComponent != null) {
Model model = modelComponent.model; Model model = modelComponent.model;

14
core/src/com/me/asteroids/systems/PlayerInputSystem.java
View File

@ -41,12 +41,14 @@ public class PlayerInputSystem extends EntitySystem {
VelocityComponent velocityComponent = velocityMapper.get(entity); VelocityComponent velocityComponent = velocityMapper.get(entity);
AccelerationComponent accelComponent = accelMapper.get(entity); AccelerationComponent accelComponent = accelMapper.get(entity);
if (Gdx.input.isKeyPressed(Input.Keys.D)) { boolean isLeftPressed = Gdx.input.isKeyPressed(Input.Keys.A);
positionComponent.rotation = Utils.rotate(positionComponent.rotation, -300 * dt); boolean isRightPressed = Gdx.input.isKeyPressed(Input.Keys.D);
} if (isLeftPressed && !isRightPressed) {
velocityComponent.angularVelocity = 300;
if (Gdx.input.isKeyPressed(Input.Keys.A)) { } else if (isRightPressed && !isLeftPressed) {
positionComponent.rotation = Utils.rotate(positionComponent.rotation, 300 * dt); velocityComponent.angularVelocity = -300;
} else {
velocityComponent.angularVelocity = 0;
} }
Vector2 acceleration = accelComponent.acceleration; Vector2 acceleration = accelComponent.acceleration;