Blender Git Commit Log
Git Commits -> Revision 5372def
Revision 5372def by Benoit Bolsee (master) June 22, 2008, 14:23 (GMT) |
BGE patch: add state engine support in the logic bricks. This patch introduces a simple state engine system with the logic bricks. This system features full backward compatibility, multiple active states, multiple state transitions, automatic disabling of sensor and actuators, full GUI support and selective display of sensors and actuators. Note: Python API is available but not documented yet. It will be added asap. State internals =============== The state system is object based. The current state mask is stored in the object as a 32 bit value; each bit set in the mask is an active state. The controllers have a state mask too but only one bit can be set: a controller belongs to a single state. The game engine will only execute controllers that belong to active states. Sensors and actuators don't have a state mask but are effectively attached to states via their links to the controllers. Sensors and actuators can be connected to more than one state. When a controller becomes inactive because of a state change, its links to sensors and actuators are temporarily broken (until the state becomes active again). If an actuator gets isolated, i.e all the links to controllers are broken, it is automatically disabled. If a sensor gets isolated, the game engine will stop calling it to save CPU. It will also reset the sensor internal state so that it can react as if the game just started when it gets reconnected to an active controller. For example, an Always sensor in no pulse mode that is connected to a single state (i.e connected to one or more controllers of a single state) will generate a pulse each time the state becomes active. This feature is not available on all sensors, see the notes below. GUI === This system system is fully configurable through the GUI: the object state mask is visible under the object bar in the controller's colum as an array of buttons just like the 3D view layer mask. Click on a state bit to only display the controllers of that state. You can select more than one state with SHIFT-click. The All button sets all the bits so that you can see all the controllers of the object. The Ini button sets the state mask back to the object default state. You can change the default state of object by first selecting the desired state mask and storing using the menu under the State button. If you define a default state mask, it will be loaded into the object state make when you load the blend file or when you run the game under the blenderplayer. However, when you run the game under Blender, the current selected state mask will be used as the startup state for the object. This allows you to test specific state during the game design. The controller display the state they belong to with a new button in the controller header. When you add a new controller, it is added by default in the lowest enabled state. You can change the controller state by clicking on the button and selecting another state. If more than one state is enabled in the object state mask, controllers are grouped by state for more readibility. The new Sta button in the sensor and actuator column header allows you to display only the sensors and actuators that are linked to visible controllers. A new state actuator is available to modify the state during the game. It defines a bit mask and the operation to apply on the current object state mask: Cpy: the bit mask is copied to the object state mask. Add: the bits that set in the bit mask will be turned on in the object state mask. Sub: the bits that set in the bit mask will be turned off in the object state mask. Inv: the bits that set in the bit mask will be inverted in the objecyy state mask. Notes ===== - Although states have no name, a simply convention consists in using the name of the first controller of the state as the state name. The GUI will support that convention by displaying as a hint the name of the first controller of the state when you move the mouse over a state bit of the object state mask or of the state actuator bit mask. - Each object has a state mask and each object can have a state engine but if several objects are part of a logical group, it is recommended to put the state engine only in the main object and to link the controllers of that object to the sensors and actuators of the different objects. - When loading an old blend file, the state mask of all objects and controllers are initialized to 1 so that all the controllers belong to this single state. This ensures backward compatibility with existing game. - When the state actuator is activated at the same time as other actuators, these actuators are guaranteed to execute before being eventually disabled due to the state change. This is useful for example to send a message or update a property at the time of changing the state. - Sensors that depend on underlying resource won't reset fully when they are isolated. By the time they are acticated again, they will behave as follow: * keyboard sensor: keys already pressed won't be detected. The keyboard sensor is only sensitive to new key press. * collision sensor: objects already colliding won't be detected. Only new collisions are detected. * near and radar sensor: same as collision sensor. |
Commit Details:
Full Hash: 5372def2b069699809cf9439381b03364137adb5
SVN Revision: 15306
Parent Commit: 1ee7a20
Lines Changed: +1112, -192
2 Added Paths:
/source/gameengine/Ketsji/KX_StateActuator.cpp (+207, -0) (View)
/source/gameengine/Ketsji/KX_StateActuator.h (+83, -0) (View)
/source/gameengine/Ketsji/KX_StateActuator.h (+83, -0) (View)
47 Modified Paths:
/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj (+6, -0) (Diff)
/source/blender/blenkernel/intern/sca.c (+3, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+12, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -0) (Diff)
/source/blender/include/BIF_butspace.h (+2, -0) (Diff)
/source/blender/include/BIF_interface.h (+1, -0) (Diff)
/source/blender/include/butspace.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_controller_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+5, -1) (Diff)
/source/blender/makesdna/DNA_sensor_types.h (+1, -0) (Diff)
/source/blender/src/buttons_logic.c (+479, -147) (Diff)
/source/blender/src/interface.c (+4, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+8, -0) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+14, -1) (Diff)
/source/gameengine/Converter/KX_ConvertControllers.cpp (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp (+5, -2) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysSensor.h (+2, -0) (Diff)
/source/gameengine/GameLogic/SCA_IActuator.cpp (+10, -0) (Diff)
/source/gameengine/GameLogic/SCA_IActuator.h (+7, -0) (Diff)
/source/gameengine/GameLogic/SCA_IController.cpp (+92, -5) (Diff)
/source/gameengine/GameLogic/SCA_IController.h (+4, -0) (Diff)
/source/gameengine/GameLogic/SCA_IObject.cpp (+12, -1) (Diff)
/source/gameengine/GameLogic/SCA_IObject.h (+17, -2) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+22, -1) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+10, -0) (Diff)
/source/gameengine/GameLogic/SCA_JoystickSensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_JoystickSensor.h (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp (+9, -2) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardSensor.h (+2, -0) (Diff)
/source/gameengine/GameLogic/SCA_LogicManager.cpp (+19, -1) (Diff)
/source/gameengine/GameLogic/SCA_MouseSensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_MouseSensor.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_PropertySensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_PropertySensor.h (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_RandomSensor.cpp (+8, -8) (Diff)
/source/gameengine/GameLogic/SCA_RandomSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp (+6, -1) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp (+4, -1) (Diff)
/source/gameengine/Ketsji/KX_MouseFocusSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.cpp (+8, -6) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+0, -2) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.cpp (+9, -5) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/sca.c (+3, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+12, -0) (Diff)
/source/blender/blenloader/intern/writefile.c (+3, -0) (Diff)
/source/blender/include/BIF_butspace.h (+2, -0) (Diff)
/source/blender/include/BIF_interface.h (+1, -0) (Diff)
/source/blender/include/butspace.h (+4, -0) (Diff)
/source/blender/makesdna/DNA_actuator_types.h (+8, -0) (Diff)
/source/blender/makesdna/DNA_controller_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+5, -1) (Diff)
/source/blender/makesdna/DNA_sensor_types.h (+1, -0) (Diff)
/source/blender/src/buttons_logic.c (+479, -147) (Diff)
/source/blender/src/interface.c (+4, -0) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+8, -0) (Diff)
/source/gameengine/Converter/KX_ConvertActuators.cpp (+14, -1) (Diff)
/source/gameengine/Converter/KX_ConvertControllers.cpp (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp (+5, -2) (Diff)
/source/gameengine/GameLogic/SCA_AlwaysSensor.h (+2, -0) (Diff)
/source/gameengine/GameLogic/SCA_IActuator.cpp (+10, -0) (Diff)
/source/gameengine/GameLogic/SCA_IActuator.h (+7, -0) (Diff)
/source/gameengine/GameLogic/SCA_IController.cpp (+92, -5) (Diff)
/source/gameengine/GameLogic/SCA_IController.h (+4, -0) (Diff)
/source/gameengine/GameLogic/SCA_IObject.cpp (+12, -1) (Diff)
/source/gameengine/GameLogic/SCA_IObject.h (+17, -2) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.cpp (+22, -1) (Diff)
/source/gameengine/GameLogic/SCA_ISensor.h (+10, -0) (Diff)
/source/gameengine/GameLogic/SCA_JoystickSensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_JoystickSensor.h (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp (+9, -2) (Diff)
/source/gameengine/GameLogic/SCA_KeyboardSensor.h (+2, -0) (Diff)
/source/gameengine/GameLogic/SCA_LogicManager.cpp (+19, -1) (Diff)
/source/gameengine/GameLogic/SCA_MouseSensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_MouseSensor.h (+1, -1) (Diff)
/source/gameengine/GameLogic/SCA_PropertySensor.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_PropertySensor.h (+1, -0) (Diff)
/source/gameengine/GameLogic/SCA_RandomSensor.cpp (+8, -8) (Diff)
/source/gameengine/GameLogic/SCA_RandomSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp (+6, -1) (Diff)
/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp (+4, -1) (Diff)
/source/gameengine/Ketsji/KX_MouseFocusSensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.cpp (+8, -6) (Diff)
/source/gameengine/Ketsji/KX_RaySensor.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+0, -2) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.cpp (+9, -5) (Diff)
/source/gameengine/Ketsji/KX_TouchSensor.h (+1, -0) (Diff)