[cocos2d/cocos2d-swift] 089597: CCEffectUtils - Add debug function for printing GL...

[GitHub]

Branch: refs/heads/develop
Home: https://github.com/cocos2d/cocos2d-swift
Commit: 0895976ab988a9e59d77c8ab8dc7e57e1dd41702
https://github.com/cocos2d/cocos2d-swift/commit/0895976ab988a9e59d77c8ab8dc7e57e1dd41702
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-24 (Wed, 24 Sep 2014)

Changed paths:
M cocos2d/CCEffectUtils.h
M cocos2d/CCEffectUtils.m

Log Message:
-----------
CCEffectUtils - Add debug function for printing GLKMatrix4 matrices


Commit: 06d85206ca205fe2d4d1e30573d07beead9a5643
https://github.com/cocos2d/cocos2d-swift/commit/06d85206ca205fe2d4d1e30573d07beead9a5643
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-25 (Thu, 25 Sep 2014)

Changed paths:
M CCRendererGLSupport.m
M Chipmunk7-ios.xcodeproj/project.pbxproj
M UnitTests/CCRendererTests.m
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/project.pbxproj
M cocos2d-osx.xcodeproj/xcshareddata/xcschemes/kazmath.xcscheme
M cocos2d-tests-android/Headless.xcodeproj/project.pbxproj
M cocos2d-tests-android/Headless/src/main/AndroidManifest.xml
M cocos2d-tests-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/ios/AppDelegate.m
M cocos2d-ui-tests/tests/CCRendererTest.m
A cocos2d-ui-tests/tests/TestShaders.metal
M cocos2d-ui/CCTextField.h
M cocos2d-ui/Platform/CCPlatformTextField.m
M cocos2d/CCCache.h
M cocos2d/CCClippingNode.m
M cocos2d/CCConfiguration.h
M cocos2d/CCConfiguration.m
M cocos2d/CCDirector.m
M cocos2d/CCDirector_Private.h
M cocos2d/CCDrawNode.m
M cocos2d/CCEffectDropShadow.h
M cocos2d/CCEffectNode.m
M cocos2d/CCLabelBMFont.m
M cocos2d/CCMotionStreak.m
M cocos2d/CCNoARC.m
M cocos2d/CCNode.m
M cocos2d/CCRenderDispatch.h
M cocos2d/CCRenderTexture.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h
M cocos2d/CCRenderer.h
M cocos2d/CCRenderer.m
A cocos2d/CCRendererBasicTypes.h
A cocos2d/CCRendererBasicTypes.m
A cocos2d/CCRendererBasicTypes_Private.h
A cocos2d/CCRendererSharedTypes.h
A cocos2d/CCRenderer_Private.h
R cocos2d/CCRenderer_private.h
M cocos2d/CCResponderManager.h
M cocos2d/CCShader.h
M cocos2d/CCShader.m
M cocos2d/CCShader_Private.h
M cocos2d/CCSprite.m
M cocos2d/CCTexture.h
M cocos2d/CCTexture.m
M cocos2d/CCTextureCache.m
M cocos2d/CCTexturePVR.m
M cocos2d/CCTouch.h
A cocos2d/NSValue+CCRenderer.h
A cocos2d/NSValue+CCRenderer.m
M cocos2d/Platforms/Android/CCDirectorAndroid.m
M cocos2d/Platforms/Android/CCGLView.h
M cocos2d/Platforms/Android/CCGLView.m
M cocos2d/Platforms/CCDirectorView.h
M cocos2d/Platforms/CCGL.h
M cocos2d/Platforms/Mac/CCDirectorMac.m
M cocos2d/Platforms/Mac/CCGLView.h
M cocos2d/Platforms/Mac/CCGLView.m
M cocos2d/Platforms/iOS/CCAppDelegate.m
M cocos2d/Platforms/iOS/CCDirectorIOS.m
R cocos2d/Platforms/iOS/CCES2Renderer.h
R cocos2d/Platforms/iOS/CCES2Renderer.m
R cocos2d/Platforms/iOS/CCESRenderer.h
M cocos2d/Platforms/iOS/CCGLView.h
M cocos2d/Platforms/iOS/CCGLView.m
M cocos2d/Platforms/iOS/CCMetalSupport.m
M cocos2d/Platforms/iOS/CCMetalSupport_Private.h
M cocos2d/Platforms/iOS/CCMetalView.h
M cocos2d/Platforms/iOS/CCMetalView.m
M cocos2d/Platforms/iOS/CCShaders.metal
M cocos2d/Support/NSAttributedString+CCAdditions.m
M cocos2d/cocos2d.h

Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop


Commit: d399c227d7eaacb09e0bac6e2023bdd0a6a83093
https://github.com/cocos2d/cocos2d-swift/commit/d399c227d7eaacb09e0bac6e2023bdd0a6a83093
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)

Changed paths:
M cocos2d-ios.xcodeproj/project.pbxproj
M cocos2d-ui-tests/tests/CCEffectsTest.m
M cocos2d-ui/CCBReader/CCBReader.m
M cocos2d/CCEffectBloom.m
M cocos2d/CCEffectBlur.h
M cocos2d/CCEffectBlur.m

Log Message:
-----------
Merge remote-tracking branch 'upstream/develop' into develop


Commit: ec06df364c01ee53ccf3b632feb5f8f2abcf3431
https://github.com/cocos2d/cocos2d-swift/commit/ec06df364c01ee53ccf3b632feb5f8f2abcf3431
Author: Thayer J Andrews <tha...@apportable.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)

Changed paths:
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectUtils.h
M cocos2d/CCEffectUtils.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h

Log Message:
-----------
CCEffects - Fixes for environment mapping effects and CCRenderTexture

The previous method of finding the transform from an effect to its environment via the
root of the scene did not work when the node and environment were children of a
CCRenderTexture or when they were being manually rendered to a CCRendertTexture
(with direct calls to begin / visit / end). Instead find the transform from the node to its environment
via their closest common ancestor.

This approach is compatible with CCRenderTexture so long as that common ancestor
is a descendant of the render texture (either explicitly via the node graph or implicitly via the
rendering of a node subtree via manual begin / visit / end). If instead the render texture
is a descendant of the common ancestor then there is no way to always find a valid
transform from the node to its environment.


Commit: ce2594181d7bfd2fc6e541766b3a485207b4a573
https://github.com/cocos2d/cocos2d-swift/commit/ce2594181d7bfd2fc6e541766b3a485207b4a573
Author: Viktor Lidholt <viktor...@gmail.com>
Date: 2014-09-26 (Fri, 26 Sep 2014)

Changed paths:
M cocos2d/CCEffectGlass.m
M cocos2d/CCEffectReflection.m
M cocos2d/CCEffectRefraction.m
M cocos2d/CCEffectRenderer.m
M cocos2d/CCEffectUtils.h
M cocos2d/CCEffectUtils.m
M cocos2d/CCEffect_Private.h
M cocos2d/CCRenderTexture.m
M cocos2d/CCRenderTexture_Private.h

Log Message:
-----------
Merge pull request #997 from thayerandrews/develop

CCEffects - Fixes for environment mapping effects and CCRenderTexture


Compare: https://github.com/cocos2d/cocos2d-swift/compare/9c93263f9171...ce2594181d7b