Skip to content

Commit ac65e0d

Browse files
committed
Implemented base editing of controls
1 parent 57dd5c2 commit ac65e0d

File tree

10 files changed

+302
-32
lines changed

10 files changed

+302
-32
lines changed

resources/messages/messages.properties

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ ModelNodeTreeActionEmitterCreateInfluencerSize=Size interpolation
180180
ModelNodeTreeActionEmitterCreateInfluencerSprite=Sprite animation
181181
ModelNodeTreeActionCreateLayer=New layer
182182
ModelNodeTreeActionAddUserData=Add user data
183+
ModelNodeTreeActionAddControl=Control
184+
ModelNodeTreeActionAddControlRigidBody=Rigid body
185+
ModelNodeTreeActionAddControlMotion=Motion
186+
ModelNodeTreeActionAddControlCharacter=Character
183187
184188
ModelPropertyCullHint=Cull Hint
185189
ModelPropertyShadowMode=Shadow mode
@@ -211,6 +215,37 @@ ModelPropertyTriangleCount=Triangles
211215
ModelPropertyLevel=Level
212216
ModelPropertyLayer=Layer
213217
218+
ControlPropertyEnabled=Enabled
219+
ControlPropertyHardwareSkinningPreferred=Hardware skinning
220+
ControlPropertyViewDirection=View direction
221+
ControlPropertyWalkDirection=Walk direction
222+
ControlPropertyFallSpeed=Fall speed
223+
ControlPropertyGravity=Gravity
224+
ControlPropertyJumpSpeed=Jump speed
225+
ControlPropertyMaxSlope=Max slope
226+
ControlPropertyApplyPhysicsLocal=Apply physics local
227+
ControlPropertyUseViewDirection=Use view direction
228+
ControlPropertyKinematicSpatial=Kinematic spatial
229+
ControlPropertyKinematic=Kinematic
230+
ControlPropertyAngularVelocity=Angular velocity
231+
ControlPropertyLinearFactor=Linear factor
232+
ControlPropertyAngularDamping=Angular damping
233+
ControlPropertyAngularFactor=Angular factor
234+
ControlPropertyFriction=Friction
235+
ControlPropertyLinearDamping=Linear damping
236+
ControlPropertyMass=Mass
237+
ControlPropertyRestitution=Restitution
238+
ControlPropertyCurrentValue=Current value
239+
ControlPropertyCurrentWayPoint=Current way point
240+
ControlPropertyDirectionType=Direction type
241+
ControlPropertyDirection=Direction
242+
ControlPropertyRotation=Rotation
243+
ControlPropertyAngularSleepingThreshold=Angular sleeping threshold
244+
ControlPropertyLoopMode=Loop mode
245+
ControlPropertyInitialDuration=Initial duration
246+
ControlPropertySpeed=Speed
247+
ControlPropertyTime=Time
248+
214249
ParticleEmitterTestMode=Test emitter
215250
ParticleEmitterEnabled=Enabled
216251
ParticleEmitterRandomPoint=Random point

resources/messages/messages_ru.properties

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ ModelNodeTreeActionEmitterCreateInfluencerSize=Интерполяция разм
180180
ModelNodeTreeActionEmitterCreateInfluencerSprite=Спрайтовая анимация
181181
ModelNodeTreeActionCreateLayer=Новый слой
182182
ModelNodeTreeActionAddUserData=Добавить польз. данные
183+
ModelNodeTreeActionAddControl=Контрол
184+
ModelNodeTreeActionAddControlRigidBody=Твердое тело
185+
ModelNodeTreeActionAddControlMotion=Движение
186+
ModelNodeTreeActionAddControlCharacter=Персонаж
183187
184188
ModelPropertyCullHint=Cull Hint
185189
ModelPropertyShadowMode=Режим теней
@@ -211,6 +215,37 @@ ModelPropertyTriangleCount=Треугольник(ов)
211215
ModelPropertyLevel=Уровень
212216
ModelPropertyLayer=Слой
213217
218+
ControlPropertyEnabled=Включен
219+
ControlPropertyHardwareSkinningPreferred=Аппаратный скиннинг
220+
ControlPropertyViewDirection=Направление просмотра
221+
ControlPropertyWalkDirection=Направление движения
222+
ControlPropertyFallSpeed=Скорость падения
223+
ControlPropertyGravity=Гравитация
224+
ControlPropertyJumpSpeed=Скорость прыжка
225+
ControlPropertyMaxSlope=Макс. наклон
226+
ControlPropertyApplyPhysicsLocal=Местная физика
227+
ControlPropertyUseViewDirection=Исп. напр. просмотра
228+
ControlPropertyKinematicSpatial=Канематический spatial
229+
ControlPropertyKinematic=Канематический
230+
ControlPropertyAngularVelocity=Угловая скорость
231+
ControlPropertyLinearFactor=Линейный коэффициент
232+
ControlPropertyAngularDamping=Угловое демпфирование
233+
ControlPropertyAngularFactor=Угловой коэффициент
234+
ControlPropertyFriction=Трение
235+
ControlPropertyLinearDamping=Линейное демпфирование
236+
ControlPropertyMass=Масса
237+
ControlPropertyRestitution=Реституция
238+
ControlPropertyCurrentValue=Текущее значенние
239+
ControlPropertyCurrentWayPoint=Текущая точка пути
240+
ControlPropertyDirectionType=Тип направления
241+
ControlPropertyDirection=Направление
242+
ControlPropertyRotation=Разворот
243+
ControlPropertyAngularSleepingThreshold=Угловой порог сна
244+
ControlPropertyLoopMode=Режим цикла
245+
ControlPropertyInitialDuration=Нач. продолжительность
246+
ControlPropertySpeed=Скорость
247+
ControlPropertyTime=Время
248+
214249
ParticleEmitterTestMode=Тест источника
215250
ParticleEmitterEnabled=Включен
216251
ParticleEmitterRandomPoint=Случ точка

src/com/ss/editor/Messages.java

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,10 @@ public class Messages {
197197
public static final String MODEL_NODE_TREE_ACTION_EMITTER_CREATE_INFLUENCER_SPRITE;
198198
public static final String MODEL_NODE_TREE_ACTION_CREATE_LAYER;
199199
public static final String MODEL_NODE_TREE_ACTION_ADD_USER_DATA;
200+
public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL;
201+
public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_RIGID_BODY;
202+
public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_NOTION;
203+
public static final String MODEL_NODE_TREE_ACTION_ADD_CONTROL_CHARACTER;
200204

201205
public static final String MODEL_PROPERTY_CULL_HINT;
202206
public static final String MODEL_PROPERTY_SHADOW_MODE;
@@ -228,6 +232,37 @@ public class Messages {
228232
public static final String MODEL_PROPERTY_LEVEL;
229233
public static final String MODEL_PROPERTY_LAYER;
230234

235+
public static final String CONTROL_PROPERTY_ENABLED;
236+
public static final String CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED;
237+
public static final String CONTROL_PROPERTY_VIEW_DIRECTION;
238+
public static final String CONTROL_PROPERTY_WALK_DIRECTION;
239+
public static final String CONTROL_PROPERTY_FALL_SPEED;
240+
public static final String CONTROL_PROPERTY_GRAVITY;
241+
public static final String CONTROL_PROPERTY_JUMP_SPEED;
242+
public static final String CONTROL_PROPERTY_MAX_SLOPE;
243+
public static final String CONTROL_PROPERTY_APPLY_PHYSICS_LOCAL;
244+
public static final String CONTROL_PROPERTY_USE_VIEW_DIRECTION;
245+
public static final String CONTROL_PROPERTY_KINEMATIC_SPATIAL;
246+
public static final String CONTROL_PROPERTY_KINEMATIC;
247+
public static final String CONTROL_PROPERTY_ANGULAR_VELOCITY;
248+
public static final String CONTROL_PROPERTY_LINEAR_FACTOR;
249+
public static final String CONTROL_PROPERTY_ANGULAR_DAMPING;
250+
public static final String CONTROL_PROPERTY_ANGULAR_FACTOR;
251+
public static final String CONTROL_PROPERTY_FRICTION;
252+
public static final String CONTROL_PROPERTY_LINEAR_DAMPING;
253+
public static final String CONTROL_PROPERTY_MASS;
254+
public static final String CONTROL_PROPERTY_RESTITUTION;
255+
public static final String CONTROL_PROPERTY_CURRENT_VALUE;
256+
public static final String CONTROL_PROPERTY_CURRENT_WAY_POINT;
257+
public static final String CONTROL_PROPERTY_DIRECTION_TYPE;
258+
public static final String CONTROL_PROPERTY_DIRECTION;
259+
public static final String CONTROL_PROPERTY_ROTATION;
260+
public static final String CONTROL_PROPERTY_ANGULAR_SLEEPING_THRESHOLD;
261+
public static final String CONTROL_PROPERTY_LOOP_MODE;
262+
public static final String CONTROL_PROPERTY_INITIAL_DURATION;
263+
public static final String CONTROL_PROPERTY_SPEED;
264+
public static final String CONTROL_PROPERTY_TIME;
265+
231266
public static final String PARTICLE_EMITTER_TEST_MODE;
232267
public static final String PARTICLE_EMITTER_ENABLED;
233268
public static final String PARTICLE_EMITTER_RANDOM_POINT;
@@ -592,6 +627,10 @@ public class Messages {
592627
MODEL_NODE_TREE_ACTION_EMITTER_CREATE_INFLUENCER_SPRITE = bundle.getString("ModelNodeTreeActionEmitterCreateInfluencerSprite");
593628
MODEL_NODE_TREE_ACTION_CREATE_LAYER = bundle.getString("ModelNodeTreeActionCreateLayer");
594629
MODEL_NODE_TREE_ACTION_ADD_USER_DATA = bundle.getString("ModelNodeTreeActionAddUserData");
630+
MODEL_NODE_TREE_ACTION_ADD_CONTROL = bundle.getString("ModelNodeTreeActionAddControl");
631+
MODEL_NODE_TREE_ACTION_ADD_CONTROL_RIGID_BODY = bundle.getString("ModelNodeTreeActionAddControlRigidBody");
632+
MODEL_NODE_TREE_ACTION_ADD_CONTROL_NOTION = bundle.getString("ModelNodeTreeActionAddControlMotion");
633+
MODEL_NODE_TREE_ACTION_ADD_CONTROL_CHARACTER = bundle.getString("ModelNodeTreeActionAddControlCharacter");
595634

596635
MODEL_PROPERTY_CULL_HINT = bundle.getString("ModelPropertyCullHint");
597636
MODEL_PROPERTY_SHADOW_MODE = bundle.getString("ModelPropertyShadowMode");
@@ -623,6 +662,37 @@ public class Messages {
623662
MODEL_PROPERTY_LEVEL = bundle.getString("ModelPropertyLevel");
624663
MODEL_PROPERTY_LAYER = bundle.getString("ModelPropertyLayer");
625664

665+
CONTROL_PROPERTY_ENABLED = bundle.getString("ControlPropertyEnabled");
666+
CONTROL_PROPERTY_HARDWARE_SKINNING_PREFERRED = bundle.getString("ControlPropertyHardwareSkinningPreferred");
667+
CONTROL_PROPERTY_VIEW_DIRECTION = bundle.getString("ControlPropertyViewDirection");
668+
CONTROL_PROPERTY_WALK_DIRECTION = bundle.getString("ControlPropertyWalkDirection");
669+
CONTROL_PROPERTY_FALL_SPEED = bundle.getString("ControlPropertyFallSpeed");
670+
CONTROL_PROPERTY_GRAVITY = bundle.getString("ControlPropertyGravity");
671+
CONTROL_PROPERTY_JUMP_SPEED = bundle.getString("ControlPropertyJumpSpeed");
672+
CONTROL_PROPERTY_MAX_SLOPE = bundle.getString("ControlPropertyMaxSlope");
673+
CONTROL_PROPERTY_APPLY_PHYSICS_LOCAL = bundle.getString("ControlPropertyApplyPhysicsLocal");
674+
CONTROL_PROPERTY_USE_VIEW_DIRECTION = bundle.getString("ControlPropertyUseViewDirection");
675+
CONTROL_PROPERTY_KINEMATIC_SPATIAL = bundle.getString("ControlPropertyKinematicSpatial");
676+
CONTROL_PROPERTY_KINEMATIC = bundle.getString("ControlPropertyKinematic");
677+
CONTROL_PROPERTY_ANGULAR_VELOCITY = bundle.getString("ControlPropertyAngularVelocity");
678+
CONTROL_PROPERTY_LINEAR_FACTOR = bundle.getString("ControlPropertyLinearFactor");
679+
CONTROL_PROPERTY_ANGULAR_DAMPING = bundle.getString("ControlPropertyAngularDamping");
680+
CONTROL_PROPERTY_ANGULAR_FACTOR = bundle.getString("ControlPropertyAngularFactor");
681+
CONTROL_PROPERTY_FRICTION = bundle.getString("ControlPropertyFriction");
682+
CONTROL_PROPERTY_LINEAR_DAMPING = bundle.getString("ControlPropertyLinearDamping");
683+
CONTROL_PROPERTY_MASS = bundle.getString("ControlPropertyMass");
684+
CONTROL_PROPERTY_RESTITUTION = bundle.getString("ControlPropertyRestitution");
685+
CONTROL_PROPERTY_CURRENT_VALUE = bundle.getString("ControlPropertyCurrentValue");
686+
CONTROL_PROPERTY_CURRENT_WAY_POINT = bundle.getString("ControlPropertyCurrentWayPoint");
687+
CONTROL_PROPERTY_DIRECTION_TYPE = bundle.getString("ControlPropertyDirectionType");
688+
CONTROL_PROPERTY_DIRECTION = bundle.getString("ControlPropertyDirection");
689+
CONTROL_PROPERTY_ROTATION = bundle.getString("ControlPropertyRotation");
690+
CONTROL_PROPERTY_ANGULAR_SLEEPING_THRESHOLD = bundle.getString("ControlPropertyAngularSleepingThreshold");
691+
CONTROL_PROPERTY_LOOP_MODE = bundle.getString("ControlPropertyLoopMode");
692+
CONTROL_PROPERTY_INITIAL_DURATION = bundle.getString("ControlPropertyInitialDuration");
693+
CONTROL_PROPERTY_SPEED = bundle.getString("ControlPropertySpeed");
694+
CONTROL_PROPERTY_TIME = bundle.getString("ControlPropertyTime");
695+
626696
PARTICLE_EMITTER_TEST_MODE = bundle.getString("ParticleEmitterTestMode");
627697
PARTICLE_EMITTER_ENABLED = bundle.getString("ParticleEmitterEnabled");
628698
PARTICLE_EMITTER_RANDOM_POINT = bundle.getString("ParticleEmitterRandomPoint");

src/com/ss/editor/ui/control/model/node/spatial/SpatialModelNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected Menu createCreationMenu(@NotNull final AbstractNodeTree<?> nodeTree) {
6565

6666
final Menu menu = new Menu(Messages.MODEL_NODE_TREE_ACTION_CREATE, new ImageView(Icons.ADD_18));
6767

68-
final Menu createControlsMenu = new Menu("Control", new ImageView(Icons.ADD_18));
68+
final Menu createControlsMenu = new Menu(Messages.MODEL_NODE_TREE_ACTION_ADD_CONTROL, new ImageView(Icons.ADD_18));
6969
createControlsMenu.getItems().addAll(new CreateRigidBodyControlAction(nodeTree, this),
7070
new CreateMotionControlAction(nodeTree, this),
7171
new CreateCharacterAction(nodeTree, this));

0 commit comments

Comments
 (0)