Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed physics rotations #105

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@ public PhysicsBodyComponent() {
awake = true;
bullet = false;
density = 1;
friction = 1;
restitution = 1;
friction = 0;
restitution = 0;
filter = new Filter();
}
}
7 changes: 2 additions & 5 deletions src/com/uwsoft/editor/renderer/physics/PhysicsBodyLoader.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package com.uwsoft.editor.renderer.physics;

import com.badlogic.ashley.core.Entity;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.physics.box2d.*;
import com.uwsoft.editor.renderer.components.TransformComponent;
import com.uwsoft.editor.renderer.components.physics.PhysicsBodyComponent;
import com.uwsoft.editor.renderer.utils.TransformMathUtils;

/**
* Created by azakhary on 9/28/2014.
@@ -39,7 +37,7 @@ public static float getScale() {
return getInstance().scale;
}

public Body createBody(World world, Entity entity, PhysicsBodyComponent physicsComponent, Vector2[][] minPolygonData, TransformComponent transformComponent) {
public Body createBody(World world, PhysicsBodyComponent physicsComponent, Vector2[][] minPolygonData, TransformComponent transformComponent) {

FixtureDef fixtureDef = new FixtureDef();

@@ -56,8 +54,7 @@ public Body createBody(World world, Entity entity, PhysicsBodyComponent physicsC
}

BodyDef bodyDef = new BodyDef();
Vector2 sceneCoords = TransformMathUtils.localToSceneCoordinates(entity, new Vector2(0, 0));
bodyDef.position.set((sceneCoords.x + transformComponent.originX) * PhysicsBodyLoader.getScale() , (sceneCoords.y + transformComponent.originY)* PhysicsBodyLoader.getScale() );
bodyDef.position.set((transformComponent.x + transformComponent.originX) * PhysicsBodyLoader.getScale(), (transformComponent.y + transformComponent.originY) * PhysicsBodyLoader.getScale());
bodyDef.angle = transformComponent.rotation * MathUtils.degreesToRadians;

bodyDef.awake = physicsComponent.awake;
8 changes: 5 additions & 3 deletions src/com/uwsoft/editor/renderer/systems/LightSystem.java
Original file line number Diff line number Diff line change
@@ -42,10 +42,12 @@ protected void processEntity(Entity entity, float deltaTime) {
float relativeRotation = 0;

Entity parentEntity = parentNodeComponent.parentEntity;
TransformComponent parentTransformComponent = transformComponentMapper.get(parentEntity);
TransformComponent parentTransformComponent;

while (parentEntity != null) {
relativeX+=parentTransformComponent.x;
relativeY+=parentTransformComponent.y;
parentTransformComponent = transformComponentMapper.get(parentEntity);
relativeX+=parentTransformComponent.x;
relativeY+=parentTransformComponent.y;
relativeRotation+=parentTransformComponent.rotation;
parentNodeComponent = parentNodeComponentMapper.get(parentEntity);
if(parentNodeComponent == null){
11 changes: 3 additions & 8 deletions src/com/uwsoft/editor/renderer/systems/PhysicsSystem.java
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@
import com.uwsoft.editor.renderer.components.physics.PhysicsBodyComponent;
import com.uwsoft.editor.renderer.physics.PhysicsBodyLoader;
import com.uwsoft.editor.renderer.utils.ComponentRetriever;
import com.uwsoft.editor.renderer.utils.TransformMathUtils;

public class PhysicsSystem extends IteratingSystem {

@@ -50,12 +49,8 @@ protected void processEntity(Entity entity, float deltaTime) {

PhysicsBodyComponent physicsBodyComponent = ComponentRetriever.get(entity, PhysicsBodyComponent.class);
Body body = physicsBodyComponent.body;
transformComponent.x = 0;
transformComponent.y = 0;
transformComponent.rotation = 0;
Vector2 localCoords = TransformMathUtils.sceneToLocalCoordinates(entity, body.getPosition().cpy().scl(1 / PhysicsBodyLoader.getScale()));
transformComponent.x = localCoords.x - transformComponent.originX;
transformComponent.y = localCoords.y - transformComponent.originY;
transformComponent.x = body.getPosition().x / PhysicsBodyLoader.getScale() - transformComponent.originX;
transformComponent.y = body.getPosition().y / PhysicsBodyLoader.getScale() - transformComponent.originY;
transformComponent.rotation = body.getAngle() * MathUtils.radiansToDegrees;
}

@@ -78,7 +73,7 @@ protected void processBody(Entity entity) {
physicsBodyComponent.centerY = dimensionsComponent.height/2;

PhysicsBodyComponent bodyPropertiesComponent = ComponentRetriever.get(entity, PhysicsBodyComponent.class);
physicsBodyComponent.body = PhysicsBodyLoader.getInstance().createBody(world, entity, bodyPropertiesComponent, polygonComponent.vertices, transformComponent);
physicsBodyComponent.body = PhysicsBodyLoader.getInstance().createBody(world, bodyPropertiesComponent, polygonComponent.vertices, transformComponent);

physicsBodyComponent.body.setUserData(entity);
}
45 changes: 36 additions & 9 deletions src/com/uwsoft/editor/renderer/utils/PolygonUtils.java
Original file line number Diff line number Diff line change
@@ -177,6 +177,9 @@ public Edge(float startX, float startY, float endX, float endY) {
}

public Edge(Vector2 start, Vector2 end) {
if (start == null || end == null) {
throw new AssertionError("start and end must not be null");
}
this.start = start;
this.end = end;
}
@@ -198,18 +201,42 @@ public void reverse() {
}

@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (obj == null) return false;
if (getClass() != obj.getClass()) return false;
Edge other = (Edge)obj;
if(hashCode() == other.hashCode()) return true;
return false;
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;

Edge edge = (Edge) o;

boolean result1;
boolean result2;

if (!start.equals(edge.start)) {result1 = false;}
else {
result1 = end.equals(edge.end);
}

if (!start.equals(edge.end)) {result2 = false;}
else {
result2 = end.equals(edge.start);
}

return result1 || result2;

}

@Override
public int hashCode() {
int result = start.hashCode();
result = result + end.hashCode();
return result;
}

@Override
public int hashCode () {
return start.hashCode() + end.hashCode();
public String toString() {
return "Edge{" +
"start=" + start +
", end=" + end +
'}';
}
}