Skip to content

Commit

Permalink
rename toRunupBehavior to toTakeoffBehavior
Browse files Browse the repository at this point in the history
  • Loading branch information
@oguzeroglu
oguzeroglu committed Aug 1, 2020
1 parent 30ae2bf commit 61de1fb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions js/steering/Steerable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Steerable.prototype.unsetHideTargetEntity = function(){
this.hideTargetEntity = null;
}

Steerable.prototype.jump = function(toRunupBehavior, jumpDescriptor){
Steerable.prototype.jump = function(toTakeoffBehavior, jumpDescriptor){

var result = jumpDescriptor.solveQuadraticEquation(this);
if (!result){
Expand All @@ -173,7 +173,7 @@ Steerable.prototype.jump = function(toRunupBehavior, jumpDescriptor){
this.unsetHideTargetEntity();

this.setTargetPosition(jumpDescriptor.takeoffPosition);
this.setBehavior(toRunupBehavior);
this.setBehavior(toTakeoffBehavior);

this.jumpDescriptor = jumpDescriptor;

Expand Down
30 changes: 15 additions & 15 deletions test/steering/SteerableTest.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ describe("Steerable", function(){
var world = new Kompute.World(1000, 1000, 1000, 10);
world.insertEntity(entity);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(100, 200, 300),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -427,9 +427,9 @@ describe("Steerable", function(){

entity.jumpTime = 999;

var result = entity.jump(toRunupBehavior, jumpDescriptor);
var result = entity.jump(toTakeoffBehavior, jumpDescriptor);

expect(entity.behavior).to.equal(toRunupBehavior);
expect(entity.behavior).to.equal(toTakeoffBehavior);
expect(entity.hasTargetEntity).to.eql(false);
expect(entity.hasHideTargetEntity).to.eql(false);
expect(entity.hasTargetPosition).to.eql(true);
Expand All @@ -452,7 +452,7 @@ describe("Steerable", function(){

world.setGravity(-900);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(100, 200, 300),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -461,7 +461,7 @@ describe("Steerable", function(){

jumpDescriptor.setCache(entity, { vx: 100, vz: -100, time: (1/60) * 5 });

entity.jump(toRunupBehavior, jumpDescriptor);
entity.jump(toTakeoffBehavior, jumpDescriptor);

entity.isJumpTakenOff = true;

Expand All @@ -488,7 +488,7 @@ describe("Steerable", function(){

world.setGravity(-1000);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(100, 200, 300),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -497,7 +497,7 @@ describe("Steerable", function(){

Kompute.logger.enable();

var result = entity.jump(toRunupBehavior, jumpDescriptor);
var result = entity.jump(toTakeoffBehavior, jumpDescriptor);

expect(result).to.eql(false);
expect(entity.isJumpInitiated).to.eql(false);
Expand All @@ -512,7 +512,7 @@ describe("Steerable", function(){
var world = new Kompute.World(1000, 1000, 1000, 10);
world.insertEntity(entity);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(10, 10, 10),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -527,7 +527,7 @@ describe("Steerable", function(){
Kompute.logger.enable();

entity.linearAcceleration.set(0, 0, 0);
entity.jump(toRunupBehavior, jumpDescriptor);
entity.jump(toTakeoffBehavior, jumpDescriptor);
entity.update();

expect(called).to.eql(true);
Expand All @@ -543,7 +543,7 @@ describe("Steerable", function(){
var world = new Kompute.World(1000, 1000, 1000, 10);
world.insertEntity(entity);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(500, 500, 500),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -556,7 +556,7 @@ describe("Steerable", function(){
};

entity.linearAcceleration.set(0, 0, 0);
entity.jump(toRunupBehavior, jumpDescriptor);
entity.jump(toTakeoffBehavior, jumpDescriptor);
entity.update();

expect(called).to.eql(false);
Expand All @@ -570,7 +570,7 @@ describe("Steerable", function(){
var world = new Kompute.World(1000, 1000, 1000, 10);
world.insertEntity(entity);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(10, 10, 10),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -583,7 +583,7 @@ describe("Steerable", function(){
};

entity.linearAcceleration.set(0, 0, 0);
entity.jump(toRunupBehavior, jumpDescriptor);
entity.jump(toTakeoffBehavior, jumpDescriptor);
entity.isJumpReady = true;
entity.update();

Expand All @@ -598,7 +598,7 @@ describe("Steerable", function(){
var world = new Kompute.World(1000, 1000, 1000, 10);
world.insertEntity(entity);

var toRunupBehavior = new MockSteeringBehavior();
var toTakeoffBehavior = new MockSteeringBehavior();
var jumpDescriptor = new Kompute.JumpDescriptor({
takeoffPosition: new Kompute.Vector3D(10, 10, 10),
landingPosition: new Kompute.Vector3D(400, 500, 600),
Expand All @@ -611,7 +611,7 @@ describe("Steerable", function(){
};

entity.linearAcceleration.set(0, 0, 0);
entity.jump(toRunupBehavior, jumpDescriptor);
entity.jump(toTakeoffBehavior, jumpDescriptor);
entity.isJumpTakenOff = true;
entity.update();

Expand Down

0 comments on commit 61de1fb

Please sign in to comment.