Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2397: Shader::sharedShaderCache() --> Shader::getInstance().

This commit is contained in:
James Chen 2013-07-12 13:40:01 +08:00
parent 2c1b26acf8
commit 1f8e852020
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/samples/HelloAnalytics-JS/proj.android/jni/hellocpp/main.cpp
View File

@ -37,7 +37,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
plugin/samples/HelloIAP-JS/proj.android/jni/hellocpp/main.cpp
View File

@ -37,7 +37,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
plugin/samples/HelloPlugins/proj.android/jni/hellocpp/main.cpp
View File

@ -37,7 +37,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Cpp/AssetsManagerTest/proj.android/jni/hellocpp/main.cpp
View File

@ -34,7 +34,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Cpp/HelloCpp/proj.android/jni/hellocpp/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Cpp/SimpleGame/proj.android/jni/hellocpp/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Cpp/TestCpp/proj.android/jni/testcpp/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Javascript/CocosDragonJS/proj.android/jni/cocosdragonjs/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Javascript/CrystalCraze/proj.android/jni/crystalcraze/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Javascript/MoonWarriors/proj.android/jni/moonwarriors/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Javascript/TestJavascript/proj.android/jni/testjavascript/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Javascript/WatermelonWithMe/proj.android/jni/watermelonwithme/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Lua/HelloLua/proj.android/jni/hellolua/main.cpp
View File

@ -34,7 +34,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
samples/Lua/TestLua/proj.android/jni/testlua/main.cpp
View File

@ -35,7 +35,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
template/multi-platform-cpp/proj.android/jni/hellocpp/main.cpp
View File

@ -36,7 +36,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
template/multi-platform-js/proj.android/jni/hellojavascript/main.cpp
View File

@ -35,7 +35,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();

2
template/multi-platform-lua/proj.android/jni/hellolua/main.cpp
View File

@ -35,7 +35,7 @@ void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thi
ccDrawInit(); ccDrawInit();
ccGLInvalidateStateCache(); ccGLInvalidateStateCache();
ShaderCache::sharedShaderCache()->reloadDefaultShaders(); ShaderCache::getInstance()->reloadDefaultShaders();
TextureCache::reloadAllTextures(); TextureCache::reloadAllTextures();
NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL); NotificationCenter::sharedNotificationCenter()->postNotification(EVNET_COME_TO_FOREGROUND, NULL);
Director::getInstance()->setGLDefaultValues(); Director::getInstance()->setGLDefaultValues();