Next #111
Merged
Next #111
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Clipping fix in SpriteBatch. Added ability to override margin, padding from .form file. Fixed signed/unsigned mismatches and floating-point ambiguity causing wrapping issues in Font. Refactoring bounds calculations in Control::update(). Using new bounds to draw controls more efficiently.
…into next-ablake Conflicts: gameplay/gameplay.vcxproj.filters gameplay/src/Control.cpp gameplay/src/Control.h gameplay/src/FlowLayout.cpp gameplay/src/FlowLayout.h gameplay/src/Label.h gameplay/src/Slider.h gameplay/src/TextBox.h
Removes numerous calls to dirty() [which in turns calls transformChanged() on itself, and it's children] from Transform::setAnimationPropertyValue() when animating ANIMATE_ROTATE_TRANSLATE or ANIMATE_SCALE_ROTATE_TRANSLATE. Quaternion friends Transform to give access to static void Quaternion::slerp(float q1x, float q1y, float q1z, float q1w, float q2x, float q2y, float q2z, float q2w, float t, float* dstx, float* dsty, float* dstz, float* dstw). This saves the creation of a Quaternion every time Transform::setAnimationPropertyValue() is called when animating ANIMATE_ROTATE, ANIMATE_ROTATE_TRANSLATE or ANIMATE_SCALE_ROTATE_TRANSLATE. Removes unnecessary friending of class AnimationController by class AnimationTarget.
…into next-kcunney
…into next-kcunney
Frustum culling in ParticleEmitter. First steps towards optimizing forms. Note to self: There are unfinished changes in this commit. Don't push this yet!
…into next-ablake
- static void suspendTransformChanged(); - static void resumeTransformChanged(); - static bool isTransformChangedSuspended(); This provides a global mechanism for suspending calls to transformChanged(). Animation Optimization. Significantly reduces the number of calls to transformChanged() during an AnimationController::update() call. Calls Transform::suspendTransformChanged() before processing animations. This suspends all calls to transformChanged(). Calls Transform::resumeTransformChanged() after processing animations. This calls all the transformChanged() events after all animations are processed. This reduces the calls to transformChanged() (and on any children) every time there is a change to a Transform's scale, rotation or translation, which would happen quite frequently when animating a character.
Animation Optimization - Reduces the number of calls of transformChanged() during processing of animations.
Minor bug fix.
…9b3e70f3dcab) Fixes bug when resuming transform changed events where the flag, _suspendTransformChanged, was being unset too early. This resulted in child nodes calling Transform::transformChanged() more than once when resuming transform changed events.
…into next-kcunney
Animation Optimization (goes with commit: 6a6f3f1)
Minor fix to readme
Removed Platform::getOrientationAngle
…into next-dgough
…into next-setaylor
…mes have a scene ID with length zero.
…dirty. Some code style changes (indentation). Minor update to the particles sample.
…into next-ablake Conflicts: gameplay/src/AbsoluteLayout.cpp gameplay/src/Container.cpp gameplay/src/Control.cpp gameplay/src/FlowLayout.cpp gameplay/src/Form.cpp gameplay/src/Frustum.cpp gameplay/src/Label.cpp gameplay/src/Layout.cpp gameplay/src/TextBox.cpp gameplay/src/Theme.cpp gameplay/src/VerticalLayout.cpp
…into next-setaylor
Next setaylor
Fixes for BlackBerry Simulator
Adds AL_CHECK and AL_LAST_ERROR macros (similar to the GL macros).
Fixes bug where from-by animations were not be created properly. By-values should be converted to to-values before creating an animation curve for the values.
Fixes Issue #402.
…d projection matrix. Added Font::Text class so that static text labels can be cached -- vertex and index data need not be re-computed every frame. Added SpriteBatch::addSprite methods for use by Font::createText() or anything else that wants to cache SpriteVertex objects. Moved code shared between several Font methods into Font::getMeasurementInfo().
…into next-ablake
…into next-setaylor
Replaced tabs with spaces in some source files.
Fixed leak of RenderTarget in Form
Moving framerate in the particles sample; trying a different font size.
…into next-ablake
…into next-setaylor
Fixed compiler warnings for Font changes.
Next setaylor
seanpaultaylor
added a commit
that referenced
this pull request
May 11, 2012
seanpaultaylor
added a commit
that referenced
this pull request
May 2, 2013
seanpaultaylor
added a commit
that referenced
this pull request
May 2, 2013
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.