Merge branch 'develop'

Rubentxu · Jan 17, 2015 · 2b619f1 · 2b619f1
2 parents addd814 + d55a8ab
commit 2b619f1
Show file tree

Hide file tree

Showing 79 changed files with 2,366 additions and 587 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,6 +10,13 @@ allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
+    idea {
+        module {
+            downloadJavadoc = true
+            downloadSources = true
+        }
+    }
+
     repositories {
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }

diff --git a/functional-tests/src/main/java/com/indignado/functional/test/base/LogicBricksTest.java b/functional-tests/src/main/java/com/indignado/functional/test/base/LogicBricksTest.java
@@ -29,17 +29,17 @@ public abstract class LogicBricksTest implements ApplicationListener {
     public void create() {
         Settings.debug = true;
         Settings.debugLevel = Logger.DEBUG;
-        Settings.drawABBs = true;
+        Settings.drawABBs = false;
         Settings.drawBodies = true;
         Settings.drawJoints = true;
         Settings.drawContacts = true;
         Settings.drawVelocities = true;
         Settings.drawStage = true;
         //Settings.debugEntity = "Player";
         Settings.debugTags.add("StateComponent");
-        Settings.debugTags.add("EffectActuatorSystem");
+        Settings.debugTags.add("RadarSensorSystem");
         //Settings.debugTags.add("DelaySensorSystem");
-       // Settings.debugTags.add("MotionActuatorSystem");
+        // Settings.debugTags.add("MotionActuatorSystem");
         //Settings.debugTags.add("EntityBuilder");
 
         batch = new SpriteBatch();

diff --git a/...-tests/src/main/java/com/indignado/functional/test/levels/flyingDart/FlyingDartLevel.java b/...-tests/src/main/java/com/indignado/functional/test/levels/flyingDart/FlyingDartLevel.java
@@ -1,7 +1,6 @@
 package com.indignado.functional.test.levels.flyingDart;
 
 import com.badlogic.ashley.core.Entity;
-import com.badlogic.ashley.core.PooledEngine;
 import com.indignado.functional.test.levels.base.entities.Ground;
 import com.indignado.functional.test.levels.base.entities.Wall;
 import com.indignado.functional.test.levels.flyingDart.entities.Dart;

diff --git a/...ts/src/main/java/com/indignado/functional/test/levels/flyingDart/MousePositionScript.java b/...ts/src/main/java/com/indignado/functional/test/levels/flyingDart/MousePositionScript.java
@@ -12,7 +12,6 @@
 import com.indignado.logicbricks.core.actuators.InstanceEntityActuator;
 import com.indignado.logicbricks.core.controllers.ScriptController;
 import com.indignado.logicbricks.core.sensors.AlwaysSensor;
-import com.indignado.logicbricks.core.sensors.DelaySensor;
 import com.indignado.logicbricks.core.sensors.MouseSensor;
 import com.indignado.logicbricks.core.sensors.Sensor;
 import com.indignado.logicbricks.utils.Log;

diff --git a/...al-tests/src/main/java/com/indignado/functional/test/levels/flyingDart/entities/Dart.java b/...al-tests/src/main/java/com/indignado/functional/test/levels/flyingDart/entities/Dart.java
@@ -8,10 +8,10 @@
 import com.badlogic.gdx.physics.box2d.Body;
 import com.badlogic.gdx.physics.box2d.BodyDef;
 import com.indignado.logicbricks.components.*;
-import com.indignado.logicbricks.components.data.Property;
-import com.indignado.logicbricks.components.data.TextureView;
 import com.indignado.logicbricks.core.EntityFactory;
 import com.indignado.logicbricks.core.World;
+import com.indignado.logicbricks.core.data.Property;
+import com.indignado.logicbricks.core.data.TextureView;
 import com.indignado.logicbricks.utils.builders.BodyBuilder;
 import com.indignado.logicbricks.utils.builders.EntityBuilder;
 import com.indignado.logicbricks.utils.builders.FixtureDefBuilder;

diff --git a/...s/src/main/java/com/indignado/functional/test/levels/flyingDart/entities/TriggerDart.java b/...s/src/main/java/com/indignado/functional/test/levels/flyingDart/entities/TriggerDart.java
@@ -11,21 +11,17 @@
 import com.indignado.logicbricks.core.EntityFactory;
 import com.indignado.logicbricks.core.World;
 import com.indignado.logicbricks.core.actuators.InstanceEntityActuator;
-import com.indignado.logicbricks.core.controllers.ConditionalController;
 import com.indignado.logicbricks.core.controllers.ScriptController;
 import com.indignado.logicbricks.core.sensors.AlwaysSensor;
-import com.indignado.logicbricks.core.sensors.DelaySensor;
 import com.indignado.logicbricks.core.sensors.MouseSensor;
 import com.indignado.logicbricks.core.sensors.Sensor;
 import com.indignado.logicbricks.utils.builders.BodyBuilder;
 import com.indignado.logicbricks.utils.builders.BricksUtils;
 import com.indignado.logicbricks.utils.builders.EntityBuilder;
 import com.indignado.logicbricks.utils.builders.FixtureDefBuilder;
 import com.indignado.logicbricks.utils.builders.actuators.InstanceEntityActuatorBuilder;
-import com.indignado.logicbricks.utils.builders.controllers.ConditionalControllerBuilder;
 import com.indignado.logicbricks.utils.builders.controllers.ScriptControllerBuilder;
 import com.indignado.logicbricks.utils.builders.sensors.AlwaysSensorBuilder;
-import com.indignado.logicbricks.utils.builders.sensors.DelaySensorBuilder;
 import com.indignado.logicbricks.utils.builders.sensors.MouseSensorBuilder;
 
 /**

diff --git a/...ain/java/com/indignado/functional/test/levels/simpleplatform/entities/PlayerPlatform.java b/...ain/java/com/indignado/functional/test/levels/simpleplatform/entities/PlayerPlatform.java
@@ -2,7 +2,6 @@
 
 import com.badlogic.ashley.core.Entity;
 import com.badlogic.gdx.Input;
-import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.Animation;
 import com.badlogic.gdx.graphics.g2d.ParticleEffect;
@@ -13,13 +12,13 @@
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.IntMap;
 import com.indignado.logicbricks.components.*;
-import com.indignado.logicbricks.components.data.AnimationView;
-import com.indignado.logicbricks.components.data.ParticleEffectView;
-import com.indignado.logicbricks.components.data.Property;
 import com.indignado.logicbricks.core.EntityFactory;
 import com.indignado.logicbricks.core.World;
 import com.indignado.logicbricks.core.actuators.*;
 import com.indignado.logicbricks.core.controllers.ConditionalController;
+import com.indignado.logicbricks.core.data.AnimationView;
+import com.indignado.logicbricks.core.data.ParticleEffectView;
+import com.indignado.logicbricks.core.data.Property;
 import com.indignado.logicbricks.core.sensors.*;
 import com.indignado.logicbricks.utils.builders.BricksUtils;
 import com.indignado.logicbricks.utils.builders.EntityBuilder;
@@ -139,7 +138,6 @@ public Entity createEntity() {
                 .connectToSensor(alwaysSensorCamera)
                 .connectToActuator(cameraActuator);
 
-
         // Collision Sensor ----------------------------------------------------------------
         CollisionSensor collisionSensorGround = BricksUtils.getBuilder(CollisionSensorBuilder.class)
                 .setTargetName("Ground")
@@ -206,7 +204,7 @@ public Entity createEntity() {
                 .setName("controllerChangeStateWalking")
                 .getBrick();
 
-        StateActuator stateActuatorWalking =  BricksUtils.getBuilder(StateActuatorBuilder.class)
+        StateActuator stateActuatorWalking = BricksUtils.getBuilder(StateActuatorBuilder.class)
                 .setChangeState(stateComponent.getState("Walking"))
                 .setName("stateActuatorWalking")
                 .getBrick();
@@ -241,7 +239,7 @@ public Entity createEntity() {
         /* State Jump/Fall to Change State Idle ----------------------------------------------------------------
            ---------------------------------------------------------------------------------- */
         DelaySensor delaySensorContactGround = BricksUtils.getBuilder(DelaySensorBuilder.class)
-                .setDelay(1f)
+                .setDelay(0.4f)
                 .setDuration(3f)
                 .setPulse(Sensor.Pulse.PM_TRUE)
                 .getBrick();
@@ -251,14 +249,14 @@ public Entity createEntity() {
                 .setName("controllerGround2")
                 .getBrick();
 
-        StateActuator stateActuatorIdle2 =  BricksUtils.getBuilder(StateActuatorBuilder.class)
+        StateActuator stateActuatorIdle2 = BricksUtils.getBuilder(StateActuatorBuilder.class)
                 .setChangeState(stateComponent.getState("Idle"))
                 .setName("stateActuatorIdle2")
                 .getBrick();
 
 
-        entityBuilder.addController(controllerGround2, "Jump","Fall")
-                .connectToSensors(collisionSensorGround,delaySensorContactGround)
+        entityBuilder.addController(controllerGround2, "Jump", "Fall")
+                .connectToSensors(collisionSensorGround, delaySensorContactGround)
                 .connectToActuator(stateActuatorIdle2);
 
         /* State Idle ----------------------------------------------------------------
@@ -275,7 +273,7 @@ public Entity createEntity() {
                 .getBrick();
 
         EditRigidBodyActuator editRigidBodyActuatorIdle = BricksUtils.getBuilder(EditRigidBodyActuatorBuilder.class)
-                .setFriction(10)
+                .setFriction(100)
                 .setTargetRigidBody(bodyPlayer)
                 .setName("editRigidBodyActuatorIdle")
                 .getBrick();
@@ -285,9 +283,15 @@ public Entity createEntity() {
                 .setActive(false)
                 .getBrick();
 
+        MotionActuator motionActuatorIdle = BricksUtils.getBuilder(MotionActuatorBuilder.class)
+                .setVelocity(new Vector2(0, 0))
+                .setLimitVelocityX(7)
+                .setName("motionActuatorWalkingRight")
+                .getBrick();
+
         entityBuilder.addController(controllerIdle, "Idle")
                 .connectToSensor(alwaysSensorIdle)
-                .connectToActuators(editRigidBodyActuatorIdle,pauseIdleEffectActuator);
+                .connectToActuators(editRigidBodyActuatorIdle, pauseIdleEffectActuator, motionActuatorIdle);
 
 
          /* State Walking ----------------------------------------------------------------
@@ -316,7 +320,7 @@ public Entity createEntity() {
 
         entityBuilder.addController(controllerWalking, "Walking")
                 .connectToSensor(alwaysSensorWalking)
-                .connectToActuators(editRigidBodyActuatorWalking,activeEffectActuator);
+                .connectToActuators(editRigidBodyActuatorWalking, activeEffectActuator);
 
         //  ** Walking Right **
         KeyboardSensor keyboardSensorImpulseRight = BricksUtils.getBuilder(KeyboardSensorBuilder.class)
@@ -388,8 +392,7 @@ public Entity createEntity() {
                 .getBrick();
 
         MotionActuator motionActuatorJump = BricksUtils.getBuilder(MotionActuatorBuilder.class)
-                .setImpulse(new Vector2(0, 7))
-                .setLimitVelocityX(7)
+                .setImpulse(new Vector2(0, 8))
                 .setName("motionActuatorJump")
                 .getBrick();
 
@@ -400,7 +403,7 @@ public Entity createEntity() {
 
         entityBuilder.addController(controllerImpulseJump, "Jump")
                 .connectToSensor(alwaysSensorImpulseJump)
-                .connectToActuators(motionActuatorJump,pauseJumpEffectActuator);
+                .connectToActuators(motionActuatorJump, pauseJumpEffectActuator);
 
         return entityBuilder.getEntity();