Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-04-29 | 10 | -145/+358 |
|\ | | | | | | | into kinetic-animations | ||||
| * | Small refactor of QVariantAnimation::updateCurrentValue | Thierry Bastian | 2009-04-29 | 1 | -17/+7 |
| | | | | | | | | | | | | we only test the inequality of the new value compared to the previous one in case we have something conected to currentValueChanged signal. The comparison is quite heavy in QVariant. So avoiding it a good thing. | ||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-29 | 1 | -3/+3 |
| |\ | |||||
| * | | kill QStateMachine::animationsFinished(), introduce QState::polished() | Kent Hansen | 2009-04-29 | 7 | -115/+317 |
| | | | |||||
| * | | Compile against new QState::ChildMode API. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -1/+1 |
| | | | |||||
| * | | Kill gameOver signal as it was only used when you clicked the stop action | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 2 | -9/+6 |
| | | | |||||
| * | | SCXML defines an atomic state as a <state> with no children or <final>. However, | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 2 | -3/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in SCXML it makes no sense for a <parallel> tag to be atomic, hence have no children, whereas in a dynamic state machine you might set an atomic state as parallel because this should govern the behavior if the state gets children later. We decided that the most intuitive definition is that a state is atomic if it has no children, regardless of whether it has the parallel child mode. With the old definition, transitions from empty parallel states will never be taken, as illustrated by the test. | ||||
* | | | Merged local changes. | David Boddie | 2009-04-29 | 5 | -9/+13 |
| |/ |/| | |||||
* | | remove multiplication by 1 in easing curves | Thierry Bastian | 2009-04-29 | 1 | -3/+3 |
|/ | |||||
* | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-29 | 24 | -176/+406 |
|\ | | | | | | | | | Conflicts: examples/animation/sub-attaq/states.cpp | ||||
| * | compile fix for the benchmark | Thierry Bastian | 2009-04-29 | 3 | -59/+36 |
| | | | | | | | | | | QItemAnimation has disappeared and it's now better to start the animation instead of pausing it | ||||
| * | Build fix for mingw | Thierry Bastian | 2009-04-27 | 18 | -54/+52 |
| | | |||||
| * | Add an OSD to display game progress in the scene | Alexis Menard | 2009-04-24 | 11 | -65/+320 |
| | | |||||
* | | update stale doc | Kent Hansen | 2009-04-29 | 1 | -1/+1 |
| | | |||||
* | | kill QStateMachine::states() and QState::transitions() | Kent Hansen | 2009-04-29 | 5 | -37/+16 |
| | | | | | | | | Result of API review. Don't need them (for now). | ||||
* | | doc | Kent Hansen | 2009-04-29 | 1 | -1/+7 |
| | | |||||
* | | kill source/target-specific animations | Kent Hansen | 2009-04-29 | 3 | -154/+85 |
| | | | | | | | | | | Result of API review. We don't have use cases for them yet. We can add them back if valid use cases do turn up. | ||||
* | | kill dead function declaration | Kent Hansen | 2009-04-29 | 1 | -1/+0 |
| | | |||||
* | | rename QBoundEvent to QWrappedEvent and make it public | Kent Hansen | 2009-04-29 | 10 | -76/+99 |
| | | | | | | | | Result of API review. | ||||
* | | add missing QT_END_HEADER | Kent Hansen | 2009-04-29 | 1 | -0/+2 |
| | | |||||
* | | replace QState::Type with QState::childMode property | Kent Hansen | 2009-04-29 | 8 | -29/+70 |
| | | | | | | | | Result of API review. | ||||
* | | Add test that property assignments set on parallel states are actually | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -3/+40 |
| | | | | | | | | applied after entering. | ||||
* | | Adapt to recent API changes and bug fixes. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -2/+6 |
| | | |||||
* | | Remove QEXPECT_FAIL because e06c2e15 fixes this test as well. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -1/+0 |
| | | |||||
* | | Compile against new QHistoryState API. | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 1 | -2/+2 |
| | | |||||
* | | Merge the two queries for entry states to support having history states as | Eskil Abrahamsen Blomfeldt | 2009-04-29 | 2 | -71/+113 |
| | | | | | | | | the initial state. Done by No'am, integrated by me. | ||||
* | | rename a few properties and methods | Kent Hansen | 2009-04-29 | 7 | -21/+21 |
| | | | | | | | | Result of API review. | ||||
* | | modifiers --> modifiersMask | Kent Hansen | 2009-04-29 | 9 | -33/+98 |
| | | | | | | | | | | | | Result of API review. A == comparison of the modifiers is not useful. The common case is you want to test if one or more modifiers are set, i.e. a mask check. | ||||
* | | compile | Kent Hansen | 2009-04-29 | 1 | -0/+1 |
| | | |||||
* | | kill unnecessary qmake variable mods | Kent Hansen | 2009-04-29 | 1 | -3/+0 |
| | | |||||
* | | make history state constructible | Kent Hansen | 2009-04-29 | 9 | -59/+78 |
| | | | | | | | | | | | | | | | | | | | | | | Decided in API review. The intention of QHistoryState not being constructible was so that people wouldn't subclass it and reimplement onEntry()/onExit(), thinking that those functions would actually get called (which they won't). However, we recently added the entered() signal to QAbstractState, so people are going to connect to it and ask why they never get the signal for a QHistoryState. We might as well make QHistoryState constructible and just document that it doesn't make sense to subclass it. | ||||
* | | say hello (again) to QAbstract{State,Transition}::machine() | Kent Hansen | 2009-04-29 | 6 | -39/+47 |
| | | | | | | | | It's useful and it's simple for us to expose, so let's. | ||||
* | | add animationsEnabled property | Kent Hansen | 2009-04-29 | 3 | -8/+47 |
| | | |||||
* | | move assignProperty() to QState | Kent Hansen | 2009-04-29 | 9 | -56/+58 |
| | | | | | | | | Doesn't belong in the abstract base class. | ||||
* | | kill StateFinished from docs | Kent Hansen | 2009-04-29 | 1 | -1/+0 |
| | | |||||
* | | Work around an oddity in parallel states that causes all regions to exit | Eskil Abrahamsen Blomfeldt | 2009-04-28 | 1 | -4/+4 |
| | | | | | | | | | | if there is a transition from one of them (even if the target state of the transition is inside the region.) | ||||
* | | Add a test for the semantics of transitions from a region in parallel states. | Eskil Abrahamsen Blomfeldt | 2009-04-28 | 1 | -0/+47 |
| | | | | | | | | | | | | | | This test checks for the behavior I expected, but that's apparently not how it's defined in the SCXML algorithm. Currently it XFAILs, and we'll either have to fix the algorithm or the test when we get word back on what the correct semantics are. | ||||
* | | Some updates to the errorstate example. | Eskil Abrahamsen Blomfeldt | 2009-04-28 | 12 | -126/+270 |
| | | | | | | | | | | | | Added cannon firing. There are some problems left: For some reason the parallel state group does not work properly, so only one tank moves even if you add more. There also seems to be something wrong with historyState->setDefaultState(). | ||||
* | | kill StateFinished event type since it doesn't exist anymore | Kent Hansen | 2009-04-28 | 1 | -2/+1 |
| | | |||||
* | | compile after api changes | Kent Hansen | 2009-04-28 | 3 | -8/+8 |
| | | |||||
* | | replace QStateFinished{Event,Transition} by QState::finished() signal | Kent Hansen | 2009-04-27 | 10 | -423/+23 |
| | | | | | | | | | | Not worth it having two public classes when the same can be achieved by having a signal. | ||||
* | | make the entry/exit order well-defined for all combinations of states | Kent Hansen | 2009-04-27 | 1 | -4/+18 |
| | | | | | | | | | | | | Comparing pointers meant that the order could be different each run. Now the entry/exit order will be consistent, even for states that are in disjoint parts of the hierarchy. | ||||
* | | Really broken plugin for errorState. Don't try to use this yet, it doesn't | Eskil Abrahamsen Blomfeldt | 2009-04-24 | 3 | -0/+115 |
| | | | | | | | | work at all. | ||||
* | | Unfinished tank AI game. The idea is that you plug in AIs for the tanks, and | Eskil Abrahamsen Blomfeldt | 2009-04-24 | 8 | -0/+619 |
|/ | | | | | one such plugin will have a run time error, so the game server needs to use errorState for handling errors. | ||||
* | Merge branch 'kinetic-statemachine' into kinetic-animations | Kent Hansen | 2009-04-24 | 42 | -2484/+1178 |
|\ | | | | | | | | | Conflicts: examples/animation/piemenu/qgraphicspiemenu_p.h | ||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-04-24 | 1 | -4/+4 |
| |\ | |||||
| * | | Remove API for setting specific restore policies on states. We have no clear | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 9 | -133/+73 |
| | | | | | | | | | | | | | | | | | | use case for this, so it has been removed. If the requirement arises we can add it back in later. Since it no longer makes sense to have it in QAbstractState, the RestorePolicy enum has been moved to QStateMachine. | ||||
| * | | Compile. | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 1 | -2/+0 |
| | | | |||||
| * | | Remove specific RestorePolicy per state from example. The semantics for this | Eskil Abrahamsen Blomfeldt | 2009-04-23 | 3 | -15/+0 |
| | | | | | | | | | | | | | | | have changed to something which is more intuitive, so it is no longer useful for this case. | ||||
| * | | kill the stateactions api | Kent Hansen | 2009-04-22 | 36 | -1720/+148 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just didn't give us that much. Typically you just reimplement onEntry/onExit/onTransition when you want to do something. We go back to the signals-and-slots approach: states have entered() and exited() signals that you can connect to. It's still possible to have an action-based API, but then you build it on top of the core API, which is OK. Replacing 4 public classes (and one layer in the hierarchy) with 2 signals feels good. |