synched with trunk at revision 30597
[blender.git] / source / blender / editors / space_logic / logic_window.c
index 98422ec..7983584 100644 (file)
@@ -713,6 +713,8 @@ static char *actuator_name(int type)
                return "State";
        case ACT_ARMATURE:
                return "Armature";
+       case ACT_STEERING:
+               return "Steering";
        }
        return "unknown";
 }
@@ -2905,7 +2907,6 @@ static short draw_actuatorbuttons(Object *ob, bActuator *act, uiBlock *block, sh
                uiEmboss((float)xco, (float)yco-ysize, (float)xco+width, (float)yco, 1); 
                  yco-= ysize; 
                  break; 
-
         default:
                ysize= 4;
 
@@ -4329,6 +4330,31 @@ static void draw_actuator_visibility(uiLayout *layout, PointerRNA *ptr)
        uiItemR(row, ptr, "children", 0, NULL, 0);
 }
 
+static void draw_actuator_steering(uiLayout *layout, PointerRNA *ptr)
+{
+       uiLayout *row;
+
+       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "target", 0, NULL, 0);
+       uiItemR(layout, ptr, "navmesh", 0, NULL, 0);    
+
+       row = uiLayoutRow(layout, 0);
+       uiItemR(row, ptr, "distance", 0, NULL, 0);
+       uiItemR(row, ptr, "velocity", 0, NULL, 0);
+       row = uiLayoutRow(layout, 0);
+       uiItemR(row, ptr, "acceleration", 0, NULL, 0);
+       uiItemR(row, ptr, "turnspeed", 0, NULL, 0);
+       row = uiLayoutRow(layout, 0);
+       uiItemR(row, ptr, "selfterminated", 0, NULL, 0);
+       if (RNA_enum_get(ptr, "mode")==ACT_STEERING_PATHFOLLOWING)
+       {
+               uiItemR(row, ptr, "updateperiod", 0, NULL, 0);  
+               row = uiLayoutRow(layout, 0);
+       }
+       uiItemR(row, ptr, "enablevisualization", 0, NULL, 0);   
+}
+
+
 void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
 {
        uiLayout *box;
@@ -4393,6 +4419,8 @@ void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
                case ACT_VISIBILITY:
                        draw_actuator_visibility(box, ptr);
                        break;
+               case ACT_STEERING:
+                       draw_actuator_steering(box, ptr);
        }
 }