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.

Sign up for GitHub

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

Jump to bottom

Revert "Shape Collision data ordering" #44

Closed
wants to merge 1 commit into from
Closed

Revert "Shape Collision data ordering" #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions echo/Shape.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,11 @@ class Shape #if cog implements cog.IComponent #end {

public function collides(s:Shape):Null<CollisionData> return null;

function collide_rect(r:Rect, flip:Bool = false):Null<CollisionData> return null;
function collide_rect(r:Rect):Null<CollisionData> return null;

function collide_circle(c:Circle, flip:Bool = false):Null<CollisionData> return null;
function collide_circle(c:Circle):Null<CollisionData> return null;

function collide_polygon(p:Polygon, flip:Bool = false):Null<CollisionData> return null;
function collide_polygon(p:Polygon):Null<CollisionData> return null;

function toString() {
var s = switch (type) {
Expand Down
11 changes: 4 additions & 7 deletions echo/shape/Circle.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,13 @@ class Circle extends Shape implements Poolable {
return false;
}

// collision calculated as s against this. So flip result
override inline function collides(s:Shape):Null<CollisionData> return s.collide_circle(this, true);
override inline function collides(s:Shape):Null<CollisionData> return s.collide_circle(this);

// collision calculated as r against this. So invert flip value
override inline function collide_rect(r:Rect, flip:Bool = false):Null<CollisionData> return r.rect_and_circle(this, !flip);
override inline function collide_rect(r:Rect):Null<CollisionData> return r.rect_and_circle(this, true);

// collision calculated as c against this. So invert flip value
override inline function collide_circle(c:Circle, flip:Bool = false):Null<CollisionData> return c.circle_and_circle(this, !flip);
override inline function collide_circle(c:Circle):Null<CollisionData> return c.circle_and_circle(this);

override inline function collide_polygon(p:Polygon, flip:Bool = false):Null<CollisionData> return this.circle_and_polygon(p, flip);
override inline function collide_polygon(p:Polygon):Null<CollisionData> return this.circle_and_polygon(p, true);

// getters
inline function get_radius():Float return local_radius * scale_x;
Expand Down
13 changes: 5 additions & 8 deletions echo/shape/Polygon.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import echo.shape.*;
import echo.util.AABB;
import echo.util.Poolable;

using echo.math.Vector2;
using echo.util.SAT;
using echo.math.Vector2;

class Polygon extends Shape implements Poolable {
/**
Expand Down Expand Up @@ -197,16 +197,13 @@ class Polygon extends Shape implements Poolable {
return false;
}

// collision calculated as s against this. So flip result
override inline function collides(s:Shape):Null<CollisionData> return s.collide_polygon(this, true);
override inline function collides(s:Shape):Null<CollisionData> return s.collide_polygon(this);

// collision calculated as r against this. So invert flip value
override inline function collide_rect(r:Rect, flip:Bool = false):Null<CollisionData> return r.rect_and_polygon(this, !flip);
override inline function collide_rect(r:Rect):Null<CollisionData> return r.rect_and_polygon(this, true);

// collision calculated as c against this. So invert flip value
override inline function collide_circle(c:Circle, flip:Bool = false):Null<CollisionData> return c.circle_and_polygon(this, !flip);
override inline function collide_circle(c:Circle):Null<CollisionData> return c.circle_and_polygon(this);

override inline function collide_polygon(p:Polygon, flip:Bool = false):Null<CollisionData> return this.polygon_and_polygon(p, flip);
override inline function collide_polygon(p:Polygon):Null<CollisionData> return p.polygon_and_polygon(this, true);

override inline function get_top():Float {
if (count == 0 || vertices[0] == null) return y;
Expand Down
15 changes: 7 additions & 8 deletions echo/shape/Rect.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package echo.shape;

import echo.data.Data;
import echo.math.Vector2;
import echo.shape.*;
import echo.util.AABB;
import echo.shape.*;
import echo.util.Poolable;
import echo.data.Data;
import echo.math.Vector2;

using echo.util.SAT;

Expand Down Expand Up @@ -174,14 +174,13 @@ class Rect extends Shape implements Poolable {
return false;
}

// collision calculated as s against this. So flip result
override inline function collides(s:Shape):Null<CollisionData> return s.collide_rect(this, true);
override inline function collides(s:Shape):Null<CollisionData> return s.collide_rect(this);

override inline function collide_rect(r:Rect, flip:Bool = false):Null<CollisionData> return this.rect_and_rect(r, flip);
override inline function collide_rect(r:Rect):Null<CollisionData> return r.rect_and_rect(this);

override inline function collide_circle(c:Circle, flip:Bool = false):Null<CollisionData> return this.rect_and_circle(c, flip);
override inline function collide_circle(c:Circle):Null<CollisionData> return this.rect_and_circle(c);

override inline function collide_polygon(p:Polygon, flip:Bool = false):Null<CollisionData> return this.rect_and_polygon(p, flip);
override inline function collide_polygon(p:Polygon):Null<CollisionData> return this.rect_and_polygon(p);

override function set_parent(?body:Body) {
super.set_parent(body);
Expand Down