Commit Graph

433 Commits

Author SHA1 Message Date
Pedro J. Estébanez 83df74a17d Fix/improve AnimationPlayer blending logic 2016-09-12 04:33:40 +02:00
sanikoyes cccea7e0b4 Tween: fix non-repeat interpolate_callback does not delete after call triggered 2016-08-31 10:27:20 +08:00
Juan Linietsky 223ca1363c Merge pull request #5352 from m4nu3lf/master
AnimationTreePlayer filters improved
2016-07-10 13:40:56 -03:00
Rémi Verschelde da034f324a Revert "Added toggle for loop interpolation based on adolson's code"
This reverts commits 8884b8f519
bd5c8f2aa0
and 5cb31f6d5b.

<reduz> Akien, I understand the need for the second loop mode, but I think
the current UI is pretty confusing. I think this should be changed for an
enum, both there and in the animation.. otherwise we should revert it
[...]
<reduz> alternatively this could be added per track, which I think should
make it a little less confusing

Reopens #959..
2016-06-26 23:45:18 +02:00
m4nu3lf cfa11777c0 AnimationTreePlayer filters improved
Now the AnimationTreePlayer filters for Blend2 and OneShot nodes
behave as expected, that is the main animation is not affected by
the secondary animation if the track is filterd out for arbitarily
complex trees.
2016-06-22 19:34:12 +01:00
George Marques 5cb31f6d5b
Replace 'or'/'and' keywords
Some compilers do not like this.
2016-06-19 12:36:50 -03:00
Rémi Verschelde 3520902194 Merge pull request #4724 from Cybolic/optional-loop-interpolation
Added toggle for loop interpolation based on adolson's code
2016-06-19 12:30:22 +02:00
Juan Linietsky 7c20c386c5 -Added trigger mode to tracks, useful for properties that work as triggers, such as playing a sample, an animation, etc.
-Better interpolation of discrete tracks, fixes #4417
2016-06-19 01:43:02 -03:00
Rémi Verschelde b7dbf9207a Drop empty files that are not used anywhere
Part of #5272
2016-06-18 19:46:30 +02:00
Rémi Verschelde a7fc04626a Add missing license headers in our source files (#5255)
Also removes a couple wrong Godot headers from third-party source files.
2016-06-18 14:46:12 +02:00
m4nu3lf 048f5a6b75 TimeSeek node in AnimationTreePlayer now propagates filters 2016-06-10 23:23:09 +01:00
Hubert Jarosz 33403d91f7
remove trailing whitespace 2016-05-21 15:29:25 +02:00
Christian Dannie Storgaard 8884b8f519 Added toggle for loop interpolation based on adolson's code 2016-05-20 13:13:32 +03:00
Paulb23 488495852b Fixed animation player auto-queue duplication and undo/redo 2016-05-07 17:27:52 +01:00
Josh Grams bd95e18ae4 AnimationTree: add filters to Animation nodes. 2016-04-26 06:49:06 -04:00
Josh Grams 2272824ee2 AnimationTree: set value track property per frame, not per track. 2016-04-24 04:39:32 -04:00
Jakub Grzesik fd9b82a082 animation_started signal to AnimationPlayer 2016-04-14 17:19:20 +02:00
Rémi Verschelde 20f62dd958 Merge pull request #4308 from JoshuaGrams/atp-resources
AnimationTreePlayer: fix discrete value tracks.
2016-04-14 12:39:08 +02:00
Josh Grams ee59b2053f AnimationTreePlayer: fix discrete value tracks.
Discrete value tracks don't update every frame (only when a new key is
reached).  So we can't use the actual property value as an accumulator:
it will end up being zero most of the time.
2016-04-12 11:54:17 -04:00
Rémi Verschelde 08aaff21f3 Merge pull request #4286 from JoshuaGrams/atp-resources
AnimationTreePlayer: allow animating resource properties.
2016-04-12 13:18:47 +02:00
Rémi Verschelde 29ed58eab6 Merge pull request #4284 from JoshuaGrams/atp-process-mode
AnimationTreePlayer: constructor now sets processing mode.
2016-04-12 08:56:48 +02:00
Josh Grams aabb0d9cbc AnimationTreePlayer: allow animating resource properties.
e.g. Particles2D config and param values.
2016-04-11 20:10:35 -04:00
Josh Grams ed497cb153 AnimationTreePlayer: constructor now sets processing mode. 2016-04-11 11:54:32 -04:00
Rémi Verschelde 7d1b4567b0 Merge pull request #4155 from JoshuaGrams/anim_tree_switched
AnimationTreePlayer: Various processing improvements
2016-04-11 13:02:21 +02:00
sanikoyes da28a2f062 Fix crash when tween control object previous freed 2016-04-07 15:45:16 +08:00
Josh Grams 4f6b2152e2 AnimationTreePlayer (transition_node_set_current): fix by removing copy-paste duplication. 2016-04-06 15:09:00 -04:00
Josh Grams 1b95dca6bd AnimationTreePlayer (set_active, reset, constructor): seek all animations to start. 2016-04-06 15:07:58 -04:00
Josh Grams 5d6b58fea6 AnimationTreePlayer (_process_node): more robust oneshot termination condition. 2016-04-06 15:06:42 -04:00
Josh Grams 0a9c8a9f36 AnimationTreePlayer (_process_node:TIMESEEK): allow auto-advance with 0 xfade. 2016-03-31 12:12:05 -04:00
Josh Grams 7fe28d4168 AnimationTreePlayer (_process_node:TIMESEEK): give p_seek precedence over tsn->seek_pos. 2016-03-31 10:06:38 -04:00
Josh Grams 8920ab0fbf * AnimationTreePlayer (_process_node): remove `switched` argument.
The _process_node function (which recurses through the blend tree
generating blend values and the active animation list) had an argument
named `switched` which would loop an animation back to the beginning if
it had reached the end (regardless of whether or not it was supposed to
be a looping animation).

This argument was only used in four places: two of them were overridden
by a seek-to-zero, and I believe the other two are bugs.

In OneShot, it was used to reset the oneshot animation to the beginning
when fired. But this would fail if the oneshot node was fired before it
had completed its previous run. While this *could* be a valid way for
oneshot to work (firing does nothing if it's already running), the code
currently resets the fade-in, so I believe that it is intended to reset.
I replaced this usage with seek-to-0.

In Transition, it was used on the previous (fading out) animation when
seeking the Transition node, which I believe is incorrect: why would you
want to loop a non-looping animation instead of simply fading out from
the end? Also it will never happen unless you seek the Transition node
twice during one cross-fade.

The other two uses are in Transition and _process_animation, where it is
used along with a seek-to-zero which overrides it.
2016-03-27 07:19:05 -04:00
Rémi Verschelde 6ef3c3b645 Merge pull request #3980 from JoshuaGrams/timescale-remainder
TimeScale node: scale return value (time remaining).
2016-03-09 20:17:13 +01:00
Josh Grams 65b7791263 TimeScale node: return +inf remaining for 0 scale. 2016-03-09 06:57:28 -05:00
Hubert Jarosz 4a4f247914
remove trailing whitespace 2016-03-09 00:00:52 +01:00
Josh Grams 2fa200ff53 AnimationTreePlayer: distinguish value tracks.
If the node had a 3D Transform, the transform would always get written,
even if the tracks on that node were supposed to be value tracks.
2016-03-08 17:23:32 -05:00
Josh Grams 2e1b1234a3 TimeScale node: scale return value (time remaining). 2016-03-07 17:21:07 -05:00
Rémi Verschelde 46bfcd3507 Merge pull request #3858 from JoshuaGrams/blend3
AnimationTreePlayer (Blend3): process all inputs.
2016-03-01 14:02:11 +01:00
Josh Grams 391ce81c5e AnimationTreePlayer: blend value tracks (closes #2299)
Variant:
- zero() sets a Variant to the appropriate type of zero value
- blend() blends part of one Variant on top of another.
2016-03-01 07:37:36 -05:00
Josh Grams b79351aa45 AnimationTreePlayer (Blend3): process all inputs.
Always call _process_node on all three inputs so that looped animations
don't get out of sync.
2016-02-28 06:55:53 -05:00
Juan Linietsky db43e94175 -Made some icon data types smaller so they take up less space
-Fixed sample import plugin, makes samples sound strange in smp when limited hz
2016-02-11 00:01:35 -03:00
Juan Linietsky 11933811ee store animation names in alphabetical order, fixes #3423 2016-02-01 00:31:13 -03:00
George Marques 5be9ff7b67 Update copyright to 2016 in headers 2016-01-01 11:50:53 -02:00
Juan Linietsky f65eb470ae -fix function calls in animationtree, closes #2789 2015-12-16 08:34:57 -03:00
Sergey Lapin 8eff61ca87 This fixes long standing animation bug
When AnimationTreePlayer switches to new animation it never
seeks it to 0 which leads to problems with non-looping animations being
played just once.

This patch is direct approach fixing this problem.
It handles most common cases of occurance.

Closes #2199
2015-12-10 16:39:57 +03:00
Juan Linietsky 200b7bb87c -Display on animation editor which keys are invalid and which tracks are unresolved
-Added a tool to clean up unresolved tracks and unused keys
2015-12-05 14:18:22 -03:00
Juan Linietsky 0c3386b2ed Merge pull request #2707 from akien-mga/master
Cosmetic fixes to SCons buildsystem
2015-11-18 19:43:28 -03:00
Saracen e011bcf162 Experimental retooling of AnimationTreePlayer to allow manual advancement. 2015-11-02 17:06:28 +00:00
Rémi Verschelde 399b1b0474 Cosmetic fixes to SCons buildsystem
- Removed trailing spaces
- Made sure all indentation is done using tabs (fixes #39)
- Potentially fixed an identation issue for openssl check
2015-11-01 20:53:26 +01:00
Juan Linietsky 0fb7b5aa0c HTML5 exporter Improvements
-Better template handling
-Voice support
-Stream support
2015-09-10 00:10:54 -03:00
Juan Linietsky 95047562d7 Several performance improvements, mainly in loading and instancing scenes and resources.
A general speedup should be apparent, with even more peformance increase when compiling optimized.

WARNING: Tested and it seems to work, but if something breaks, please report.
2015-06-29 00:29:49 -03:00
Juan Linietsky 954256268a Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
	demos/2d/motion/engine.cfg
2015-06-06 11:09:00 -03:00
Juan Linietsky 0e1510214a small fixes 2015-06-01 23:35:23 -03:00
Juan Linietsky f36e7dcb40 improved animation editor
-same-value link keys
-new layout
-forward, backwards playback
-integrated curve/property editor
-auto increment sprite frame after insert
-copy & paste animation resoucres
2015-05-25 01:47:02 -03:00
Juan Linietsky e323cc0505 -Rename unexisting by nonexistant, closes #1940
-Added function to retrieve list of actions fron InputMap
2015-05-18 10:20:54 -03:00
ehriche fe13c728fd added notes to resolve undefined behavior of calculations in tweening
interpolators in future.
2015-05-06 00:51:49 +02:00
sanikoyes 6d0914dfc5 Spine: add feature to insert/remove interpolates while updating 2015-05-05 11:12:17 +08:00
Juan Linietsky 4804462ee0 -Fixes from source code analyzizer, closes #1768 2015-05-01 10:44:08 -03:00
Juan Linietsky 82cbee2d2d -added set_master_player binding, fixes #1477 2015-04-27 00:23:16 -03:00
Juan Linietsky fdaa2920eb Updated copyright year in all headers 2015-04-18 14:38:54 -03:00
sanikoyes b260bfab63 Add call deferred support for Tween 2015-01-07 19:46:01 +08:00
Juan Linietsky 0378e1109b -fixed NODE_OUT error in animtreeplayer #1078
-fixed randon button when editing menubutton #1079
2015-01-02 12:52:51 -03:00
sanikoyes 64f77aa8f3 1.Change interpolate_callback:p_times_in_sec argument before p_callback argument(more readable)
2.NodePath replace to instance_ID(can control object doe's not in scene tree)
3.Change interpolate types from Node to Object, can control more types(etc script class object)
4.Add pending_update counter, avoid insert/remove interpolates-list while traversal it
2014-12-19 17:13:20 +08:00
Juan Linietsky bcf27feb98 New Code Completion
-=-=-=-=-=-=-=-=-=-

-Massive improvement to code completion
-Argument hinting for functions

If you manage to out-smart the code-completion in a situation where completion
should be possible to guess, let me know.

 Please enter the commit message for your changes. Lines starting
2014-12-16 22:31:57 -03:00
Juan Linietsky e361e8539c -Ability to ask for documents/pictures/etc system dirs.
-Fixes to animationplayer
-fixes to collada importer
2014-12-02 14:02:41 -03:00
Brandon DeRosier 4b76b2caf5 Fix AnimationTreePlayer.node_get_input_source typo
- Changed node_get_input_sourcre to node_get_input_source
2014-11-11 13:15:19 -05:00
Juan Linietsky 0dbedd18fc SceneMainLoop -> SceneTree
-=-=-=-=-=-=-=-=-=-=-=-=-=-

*YOUR SOURCE MIGHT NOT WORK*
For mor information on fix:
https://github.com/okamstudio/godot/wiki/devel_scene_tree

Other stuff:
-Shower of bullets demo
-Fixes all around
2014-11-05 21:20:42 -03:00
Juan Linietsky e82dc40205 -Much improvement to baked light baker
-Fixed many bugs in stretch mode
-Fixes to camera project and unproject as consequence of the above
-added setget to script (documented in script doc)
-more fixes to collada exporter for blender
2014-10-27 22:54:32 -03:00
Juan Linietsky b24fe3dd20 Huge Amount of BugFix
-=-=-=-=-=-=-=-=-=-=-

-Fixes to Collada Exporter (avoid crash situtions)
-Fixed to Collada Importer (Fixed Animation Optimizer Bugs)
-Fixes to RigidBody/RigidBody2D body_enter/body_exit, was buggy
-Fixed ability for RigidBody/RigidBody2D to get contacts reported and bodyin/out in Kinematic mode.
-Added proper trigger support for 3D Physics shapes
-Changed proper value for Z-Offset in OmniLight
-Fixed spot attenuation bug in SpotLight
-Fixed some 3D and 2D spatial soudn bugs related to distance attenuation.
-Fixed bugs in EventPlayer (channels were muted by default)
-Fix in ButtonGroup (get nodes in group are now returned in order)
-Fixed Linear->SRGB Conversion, previous algo sucked, new algo works OK
-Changed SRGB->Linear conversion to use hardware if supported, improves texture quality a lot
-Fixed options for Y-Fov and X-Fov in camera, should be more intuitive.
-Fixed bugs related to viewports and transparency

Huge Amount of New Stuff:
-=-=-=-=-=-=-=-==-=-=-=-

-Ability to manually advance an AnimationPlayer that is inactive (with advance() function)
-More work in WinRT platform
-Added XY normalmap support, imports on this format by default. Reduces normlmap size and enables much nice compression using LATC
-Added Anisotropic filter support to textures, can be specified on import
-Added support for Non-Square, Isometric and Hexagonal tilemaps in TileMap.
-Added Isometric Dungeon demo.
-Added simple hexagonal map demo.
-Added Truck-Town demo. Shows how most types of joints and vehicles are used. Please somebody make a nicer town, this one is too hardcore.
-Added an Object-Picking API to both RigidBody and Area! (and relevant demo)
2014-10-03 00:10:51 -03:00
Juan Linietsky fa004d5c0f Small Fixes
-----------

-Added Ability for centering on top left for centercontainer
-Added ability to bind more than 5 parameters (must include an extra file)
2014-09-17 11:53:29 -03:00
sanikoyes 64413191a9 tween:
1、add follow/targeting support
2、update demo
2014-08-25 13:36:56 +08:00
sanikoyes 3a93143e52 Fix tween seek, add tell function 2014-08-22 14:25:41 +08:00
sanikoyes 344420f67c Replace object to NodePath
Add time callback support
Update demo
2014-08-22 11:24:53 +08:00
sanikoyes d7eb4550b0 Fix reset 2014-08-21 15:51:18 +08:00
sanikoyes 5668cec030 Add tween delay support
Add tween get_runtime function
Update demo for tween delay sample
2014-08-21 15:34:16 +08:00
sanikoyes 1c0ac4ee45 Add missing bind, fix bind argument description 2014-08-20 18:33:17 +08:00
sanikoyes 87faf1c046 Add tween seek/repeat support
Add tween demo
2014-08-20 16:39:28 +08:00
sanikoyes b51da466e9 Add remove/remove_all for tween 2014-08-20 12:19:22 +08:00
sanikoyes f75b8a81d2 Add tween support for godot 2014-08-20 12:01:41 +08:00
Juan Linietsky 2ee4ac183b Little Bits
-=-=-=-=-=-

-Fixed small bugs all around
-Added ability to show/hide entire sections of the spatial (3D) tree
-WIP new vehicle (not ready yet) based on Bullet
2014-08-14 10:31:38 -03:00
Theo Hallenius 9aa278c590 Timeseek works like this 2014-07-07 22:54:34 +02:00
Juan Linietsky b324ff7ea5 A bit of everything:
-IMA-ADPCM support for samples, this means that sound effects can be compressed and use 4 timess less RAM.
-New 3D import workflow based on Wavefront OBJ. Import single objects as mesh resources instead of full scenes. Many people prefers to work this way. Just like the rest of the imported resources, these are updated in realtime if modified externally.
-Mesh resources now support naming surfaces. This helps reimporting to identify which user-created materials must be kept.
-Several fixes and improvements to SurfaceTool.
-Anti Aliasing added to WorldEnvironment effects (using FXAA)
-2D Physics bodies (RigidBody, KinematicBody, etc), Raycasts, Tilemap, etc support collision layers. This makes easy to group which objects collide against which.
-2D Trigger shapes can now also trigger collision reporting in other 2D bodies (it used to be in Area2D before)
-Viewport render target textures can now be filtered.
-Few fixes in GDscript make it easier to work with static functions and class members.
-Several and many bugfixes.
2014-05-14 01:22:15 -03:00
Juan Linietsky 58cda02a38 -fixed export templates not loading/exporting on Windows
-fixed TouchScreenButton with stretch2d
-fixed(?) OSX crash on startup (test!!)
-compilation fixes on windows
-CollisionPolygon editor works again
-find buttons en find dialog
-TileMap editor cleanup (removed "error", made nicer)
-viewport flicker fixed
-make .scn default extension for saving scenes
-export the rest of the network classes to gdscript
2014-02-13 18:03:28 -03:00
Juan Linietsky 0b806ee0fc GODOT IS OPEN SOURCE 2014-02-09 22:10:30 -03:00