Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/renderer
History
j-jorge 6bbf01537d Allow to unbind asynchronous texture loading callback with a custom key. (#17206) 
* Allow to unbind asynchronous texture loading callback with a custom key.

In order to unbind the callback passed to
`cocos2d::TextureCache::addImageAsync(path, callback)`, one has to
call `cocos2d::TextureCache::unbindImageAsync(path)`. In the cases
where the loading of the same texture is requested from several sources
simultaneously, then none of the source can unbind its own callback
unambiguously.

This commit adds an overload of the `addImageAsync` function taking an extra
argument identifying the callback, thus allowing to unbind it unambiguously
in cases where the loading of path is requested by several sources
simultaneously.

* Add a test case for TextureCache::addImageAsync with a custom key.
 		2017-02-04 09:38:54 +08:00
..
CCBatchCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCBatchCommand.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCCustomCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCCustomCommand.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCFrameBuffer.cpp Squashed commit of the following: 2016-06-15 11:33:25 -07:00
CCFrameBuffer.h Squashed commit of the following: 2016-06-15 11:33:25 -07:00
CCGLProgram.cpp No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
CCGLProgram.h Support MultiView matrix array (#16723) 2016-10-28 09:33:31 +08:00
CCGLProgramCache.cpp No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
CCGLProgramCache.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCGLProgramState.cpp Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
CCGLProgramState.h Add ETC1 builtin alpha support. (#16118) 2016-07-25 17:31:54 +08:00
CCGLProgramStateCache.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCGLProgramStateCache.h issue #12078: added renderer group and removed core and support group. 2015-06-01 13:43:56 +08:00
CCGroupCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCGroupCommand.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCMaterial.cpp Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
CCMaterial.h merge cocos 2015-09-10 10:44:09 +08:00
CCMeshCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCMeshCommand.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCPass.cpp Fix possible memory leak when pass initialization fails 2016-06-16 04:52:38 +09:00
CCPass.h Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
CCPrimitive.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCPrimitive.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCPrimitiveCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCPrimitiveCommand.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCQuadCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCQuadCommand.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCRenderCommand.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCRenderCommand.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCRenderCommandPool.h Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. (#16716) 2016-10-27 15:10:24 +08:00
CCRenderState.cpp fix: release texture in RenderState (#16396) 2016-08-19 00:22:57 -07:00
CCRenderState.h fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
CCRenderer.cpp Fix typos in local variables (#17236) 2017-01-20 09:58:29 +08:00
CCRenderer.h use GLsizei to avoid overflow (#16962) 2016-12-06 23:05:56 -08:00
CCTechnique.cpp fix clone 2015-09-11 15:08:59 +08:00
CCTechnique.h Adds better sample 2015-05-13 17:39:39 -07:00
CCTexture2D.cpp No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
CCTexture2D.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCTextureAtlas.cpp No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
CCTextureAtlas.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCTextureCache.cpp Allow to unbind asynchronous texture loading callback with a custom key. (#17206) 2017-02-04 09:38:54 +08:00
CCTextureCache.h Allow to unbind asynchronous texture loading callback with a custom key. (#17206) 2017-02-04 09:38:54 +08:00
CCTextureCube.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
CCTextureCube.h Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
CCTrianglesCommand.cpp fix: TriangleCommands with custom uniforms can be batched (#16329) 2016-08-07 14:51:02 -07:00
CCTrianglesCommand.h Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
CCVertexAttribBinding.cpp resets bindBuffer after using it (#16342) 2016-08-11 08:32:09 -07:00
CCVertexAttribBinding.h Add 3 missing class export 2015-11-27 14:58:18 +08:00
CCVertexIndexBuffer.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCVertexIndexBuffer.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCVertexIndexData.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CCVertexIndexData.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
CMakeLists.txt Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
ccGLStateCache.cpp No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
ccGLStateCache.h merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
ccShader_3D_Color.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_ColorNormal.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_ColorNormalTex.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_ColorTex.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_Particle.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_Particle.vert More: Uses c++11 multi-line string literal (#16803) 2016-11-04 09:36:26 +08:00
ccShader_3D_PositionNormalTex.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_PositionTex.vert More: Uses c++11 multi-line string literal (#16803) 2016-11-04 09:36:26 +08:00
ccShader_3D_Skybox.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_Skybox.vert More: Uses c++11 multi-line string literal (#16803) 2016-11-04 09:36:26 +08:00
ccShader_3D_Terrain.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_3D_Terrain.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_CameraClear.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_CameraClear.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_ETC1AS_PositionTextureColor.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_ETC1AS_PositionTextureGray.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Label.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Label_df.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Label_df_glow.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Label_normal.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Label_outline.frag [label] Fixes shadow is drawn incorrect while also enabling outline. (#17024) 2016-12-16 14:56:36 +08:00
ccShader_PositionColor.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionColor.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionColorLengthTexture.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionColorLengthTexture.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionColorTextureAsPointsize.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTexture.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTexture.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureA8Color.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureA8Color.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureColor.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureColor.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureColorAlphaTest.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureColor_noMVP.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTextureColor_noMVP.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTexture_uColor.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_PositionTexture_uColor.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Position_uColor.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_Position_uColor.vert Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShader_UI_Gray.frag Use C++11 multiline string literal instead (#16765) 2016-11-02 14:13:34 +08:00
ccShaders.cpp Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
ccShaders.h Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00