mirror of https://github.com/axmolengine/axmol.git
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
[ci skip]Add new line at the end of a file to *.[cpp|h]
This commit is contained in:
commit
7553060ba7
|
@ -13,4 +13,4 @@
|
||||||
#include <agile.h>
|
#include <agile.h>
|
||||||
#include <concrt.h>
|
#include <concrt.h>
|
||||||
#include <collection.h>
|
#include <collection.h>
|
||||||
#include "App.xaml.h"
|
#include "App.xaml.h"
|
||||||
|
|
|
@ -138,4 +138,4 @@ protected:
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif //__CCCAMERA_ACTION_H__
|
#endif //__CCCAMERA_ACTION_H__
|
||||||
|
|
|
@ -201,4 +201,4 @@ Animation* Animation::clone() const
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -237,4 +237,4 @@ void AnimationCache::addAnimationsWithFile(const std::string& plist)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -160,4 +160,4 @@ FontAtlas * FontCharMap::createFontAtlas()
|
||||||
return tempAtlas;
|
return tempAtlas;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -74,4 +74,4 @@ private:
|
||||||
};
|
};
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -110,4 +110,4 @@ protected:
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif //__CCTMX_OBJECT_GROUP_H__
|
#endif //__CCTMX_OBJECT_GROUP_H__
|
||||||
|
|
|
@ -179,4 +179,4 @@ OSStatus AudioSessionGetProperty(UInt32 inID, UInt32 *ioDataSize, void *outData)
|
||||||
- (BOOL)setPreferredIOBufferDuration:(NSTimeInterval)duration error:(NSError**)outError {return YES;}
|
- (BOOL)setPreferredIOBufferDuration:(NSTimeInterval)duration error:(NSError**)outError {return YES;}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -212,4 +212,4 @@ void MediaStreamer::Restart()
|
||||||
ThrowIfFailed(
|
ThrowIfFailed(
|
||||||
m_reader->SetCurrentPosition(GUID_NULL, var)
|
m_reader->SetCurrentPosition(GUID_NULL, var)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,4 +38,4 @@ public:
|
||||||
bool GetNextBuffer(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
bool GetNextBuffer(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
||||||
void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
||||||
void Restart();
|
void Restart();
|
||||||
};
|
};
|
||||||
|
|
|
@ -213,4 +213,4 @@ void MediaStreamer::ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferL
|
||||||
void MediaStreamer::Restart()
|
void MediaStreamer::Restart()
|
||||||
{
|
{
|
||||||
m_offset = 0;
|
m_offset = 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,4 +55,4 @@ internal:
|
||||||
void Initialize(_In_ const WCHAR* url);
|
void Initialize(_In_ const WCHAR* url);
|
||||||
void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
void ReadAll(uint8* buffer, uint32 maxBufferSize, uint32* bufferLength);
|
||||||
void Restart();
|
void Restart();
|
||||||
};
|
};
|
||||||
|
|
|
@ -39,4 +39,4 @@ _widgetGetFocus(widgetGetFocus)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -95,4 +95,4 @@ bool EventListenerFocus::checkAvailable()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -109,4 +109,4 @@ bool EventListenerMouse::init()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -187,4 +187,4 @@ EventListenerTouchAllAtOnce* EventListenerTouchAllAtOnce::clone()
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -38,4 +38,4 @@ EventMouse::EventMouse(MouseEventType mouseEventCode)
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -70,4 +70,4 @@ Vec2 Touch::getDelta() const
|
||||||
return getLocation() - getPreviousLocation();
|
return getLocation() - getPreviousLocation();
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -86,4 +86,4 @@ void CCBSequence::setChainedSequenceId(int nChainedSequenceId)
|
||||||
mChainedSequenceId = nChainedSequenceId;
|
mChainedSequenceId = nChainedSequenceId;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -114,4 +114,4 @@ void ControlButtonLoader::onHandlePropTypeColor3(Node * pNode, Node * pParent, c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -27,4 +27,4 @@ void ControlLoader::onHandlePropTypeBlockControl(Node * pNode, Node * pParent, c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,4 +50,4 @@ void LabelBMFontLoader::onHandlePropTypeText(Node * pNode, Node * pParent, const
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,4 +80,4 @@ void LabelTTFLoader::onHandlePropTypeSize(Node * pNode, Node * pParent, const ch
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,4 +32,4 @@ void LayerColorLoader::onHandlePropTypeBlendFunc(Node * pNode, Node * pParent, c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,4 +42,4 @@ void LayerLoader::onHandlePropTypeCheck(Node * pNode, Node * pParent, const char
|
||||||
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
|
#pragma GCC diagnostic warning "-Wdeprecated-declarations"
|
||||||
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
#elif _MSC_VER >= 1400 //vs 2005 or higher
|
||||||
#pragma warning (pop)
|
#pragma warning (pop)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -27,4 +27,4 @@ void MenuItemLoader::onHandlePropTypeCheck(Node * pNode, Node * pParent, const c
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -102,4 +102,4 @@ NodeLoaderLibrary * NodeLoaderLibrary::newDefaultNodeLoaderLibrary() {
|
||||||
return ccNodeLoaderLibrary;
|
return ccNodeLoaderLibrary;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -137,4 +137,4 @@ void ParticleSystemQuadLoader::onHandlePropTypeTexture(Node * pNode, Node * pPar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,4 +54,4 @@ void ScrollViewLoader::onHandlePropTypeIntegerLabeled(Node * pNode, Node * pPare
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -373,4 +373,4 @@ ActionInterval* ActionTintFrame::getAction(float fDuration)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -188,4 +188,4 @@ float ActionFrameEasing::easeValue(float t)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -222,4 +222,4 @@ void ActionObject::simulationActionUpdate(float dt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -224,4 +224,4 @@ bool DictionaryHelper::checkObjectExist_json(const rapidjson::Value &root, int i
|
||||||
return bRet;
|
return bRet;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,4 +7,4 @@
|
||||||
#include "Mat4.h"
|
#include "Mat4.h"
|
||||||
#include "Quaternion.h"
|
#include "Quaternion.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,4 +33,4 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif // __CCMATHBASE_H__
|
#endif // __CCMATHBASE_H__
|
||||||
|
|
|
@ -16,4 +16,4 @@ int getDPIJNI()
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // extern "C"
|
} // extern "C"
|
||||||
|
|
|
@ -58,4 +58,4 @@ void LuaLog(const char * format)
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif // CC_PLATFORM_IOS
|
#endif // CC_PLATFORM_IOS
|
||||||
|
|
|
@ -136,4 +136,4 @@ private:
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#include "cocos2d.h"
|
||||||
|
|
|
@ -419,4 +419,4 @@ void SHA1ConvertMessageToString(uint8_t *hash_binary, char* hash_string)
|
||||||
hash_string[2*i + 1] = alphabet[hash_binary[i] % 16];
|
hash_string[2*i + 1] = alphabet[hash_binary[i] % 16];
|
||||||
}
|
}
|
||||||
hash_string[SHA1HashSize * 2] = '\0';
|
hash_string[SHA1HashSize * 2] = '\0';
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,4 +90,4 @@ int SHA1Result( SHA1Context *,
|
||||||
void SHA1ConvertMessageToString(uint8_t *hash_binary, char* hash_string);
|
void SHA1ConvertMessageToString(uint8_t *hash_binary, char* hash_string);
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -62,4 +62,4 @@ HRESULT Direct3DContentProvider::PrepareResources(_In_ const LARGE_INTEGER* pres
|
||||||
HRESULT Direct3DContentProvider::Draw(_In_ ID3D11Device1* device, _In_ ID3D11DeviceContext1* context, _In_ ID3D11RenderTargetView* renderTargetView)
|
HRESULT Direct3DContentProvider::Draw(_In_ ID3D11Device1* device, _In_ ID3D11DeviceContext1* context, _In_ ID3D11RenderTargetView* renderTargetView)
|
||||||
{
|
{
|
||||||
return m_controller->Draw(device, context, renderTargetView);
|
return m_controller->Draw(device, context, renderTargetView);
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,4 +49,4 @@ public:
|
||||||
private:
|
private:
|
||||||
PhoneDirect3DXamlAppComponent::Direct3DInterop^ m_controller;
|
PhoneDirect3DXamlAppComponent::Direct3DInterop^ m_controller;
|
||||||
Microsoft::WRL::ComPtr<IDrawingSurfaceRuntimeHostNative> m_host;
|
Microsoft::WRL::ComPtr<IDrawingSurfaceRuntimeHostNative> m_host;
|
||||||
};
|
};
|
||||||
|
|
|
@ -185,4 +185,4 @@ bool Direct3DInterop::SendCocos2dEvent(Cocos2dEvent event)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,4 +81,4 @@ protected private:
|
||||||
Microsoft::WRL::ComPtr<IWinPhone8XamlD3DWindow> m_eglPhoneWindow;
|
Microsoft::WRL::ComPtr<IWinPhone8XamlD3DWindow> m_eglPhoneWindow;
|
||||||
DirectX::XMMATRIX m_orientationMatrix;
|
DirectX::XMMATRIX m_orientationMatrix;
|
||||||
float m_aspectRatio;
|
float m_aspectRatio;
|
||||||
};
|
};
|
||||||
|
|
|
@ -45,4 +45,4 @@ namespace PhoneDirect3DXamlAppComponent
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -43,4 +43,4 @@ protected private:
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // 0
|
#endif // 0
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#include "cocos2d.h"
|
||||||
|
|
|
@ -70,4 +70,4 @@ void BatchCommand::execute()
|
||||||
_textureAtlas->drawQuads();
|
_textureAtlas->drawQuads();
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -50,4 +50,4 @@ void CustomCommand::execute()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -177,4 +177,4 @@ void MeshCommand::execute()
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -97,4 +97,4 @@ void QuadCommand::useMaterial() const
|
||||||
_glProgramState->apply(_mv);
|
_glProgramState->apply(_mv);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -60,4 +60,4 @@ void RenderCommand::printID()
|
||||||
printf("Command Depth: %f\n", _globalOrder);
|
printf("Command Depth: %f\n", _globalOrder);
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -36,4 +36,4 @@ extern "C"
|
||||||
extern int cocos2dx_lua_loader(lua_State *L);
|
extern int cocos2dx_lua_loader(lua_State *L);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // __COCOS2DX_LUA_LOADER_H__
|
#endif // __COCOS2DX_LUA_LOADER_H__
|
||||||
|
|
|
@ -414,4 +414,4 @@ int register_all_cocos2dx_coco_studio_manual(lua_State* L)
|
||||||
extendBone(L);
|
extendBone(L);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1616,4 +1616,4 @@ int register_all_cocos2dx_physics_manual(lua_State* tolua_S)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -415,4 +415,4 @@ void ProtectedNode::disableCascadeColor()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -181,4 +181,4 @@ private:
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
||||||
#endif // __CPROTECTEDCNODE_H__
|
#endif // __CPROTECTEDCNODE_H__
|
||||||
|
|
|
@ -82,4 +82,4 @@ bool HBox::initWithSize(const Size& size)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -564,4 +564,4 @@ void RelativeLayoutManager::doLayout(LayoutProtocol *layout)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -82,4 +82,4 @@ bool RelativeBox::initWithSize(const Size& size)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -490,4 +490,4 @@ std::string RichText::getDescription() const
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -82,4 +82,4 @@ bool VBox::initWithSize(const Size& size)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_END
|
NS_CC_END
|
||||||
|
|
|
@ -22,4 +22,4 @@
|
||||||
@defgroup sprite_nodes Sprite Nodes
|
@defgroup sprite_nodes Sprite Nodes
|
||||||
@defgroup textures Textures
|
@defgroup textures Textures
|
||||||
@defgroup tilemap_parallax_nodes TileMap, Parallax
|
@defgroup tilemap_parallax_nodes TileMap, Parallax
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -53,4 +53,4 @@ THE SOFTWARE. \n
|
||||||
- Fork our repository on github, commit your changes, and send a "pull request" to us. We will merge your contribution to master
|
- Fork our repository on github, commit your changes, and send a "pull request" to us. We will merge your contribution to master
|
||||||
- Suggestion, bug fixes, and improvements are highly appreciated.
|
- Suggestion, bug fixes, and improvements are highly appreciated.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -87,4 +87,4 @@ protected:
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -34,4 +34,4 @@ THE SOFTWARE.
|
||||||
#include "CCControlStepper.h"
|
#include "CCControlStepper.h"
|
||||||
#include "CCControlSwitch.h"
|
#include "CCControlSwitch.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -88,4 +88,4 @@ protected:
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -104,4 +104,4 @@ public:
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -76,4 +76,4 @@ protected:
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -300,4 +300,4 @@ std::string CCEditBoxImplWp8::PlatformStringTostring( Platform::String^ strSrc )
|
||||||
return strDst;
|
return strDst;
|
||||||
}
|
}
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
|
@ -84,4 +84,4 @@ private:
|
||||||
|
|
||||||
NS_CC_EXT_END
|
NS_CC_EXT_END
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -103,4 +103,4 @@ public:
|
||||||
|
|
||||||
#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */
|
#endif /* (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#include "cocos2d.h"
|
||||||
|
|
|
@ -33,4 +33,4 @@ string getIPAddress()
|
||||||
t.env->DeleteLocalRef(str);
|
t.env->DeleteLocalRef(str);
|
||||||
}
|
}
|
||||||
return IPAddress;
|
return IPAddress;
|
||||||
}
|
}
|
||||||
|
|
|
@ -350,4 +350,4 @@ void createSimulator(const char* viewName, float width, float height, bool isLan
|
||||||
printf("SetWindowLong NewWndProc Error:%d\n",GetLastError());
|
printf("SetWindowLong NewWndProc Error:%d\n",GetLastError());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,4 +69,4 @@ std::string getCurAppPath(void)
|
||||||
char fuldir[MAX_PATH]={0};
|
char fuldir[MAX_PATH]={0};
|
||||||
_fullpath(fuldir,strPath.c_str(),MAX_PATH);
|
_fullpath(fuldir,strPath.c_str(),MAX_PATH);
|
||||||
return fuldir;
|
return fuldir;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "cocos2d.h"
|
#include "cocos2d.h"
|
||||||
|
|
|
@ -156,4 +156,4 @@ void AppDelegate::setCurrentTest(BaseTest* curTest)
|
||||||
BaseTest* AppDelegate::getCurrentTest()
|
BaseTest* AppDelegate::getCurrentTest()
|
||||||
{
|
{
|
||||||
return _curTest;
|
return _curTest;
|
||||||
}
|
}
|
||||||
|
|
|
@ -275,4 +275,4 @@ void Box2DTestScene::runThisTest()
|
||||||
|
|
||||||
Director::getInstance()->replaceScene(this);
|
Director::getInstance()->replaceScene(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,4 +55,4 @@ void AnimationsTestLayer::onControlButtonJumpClicked(Ref *pSender, Control::Even
|
||||||
|
|
||||||
void AnimationsTestLayer::onControlButtonFunkyClicked(Ref *pSender, Control::EventType pControlEvent) {
|
void AnimationsTestLayer::onControlButtonFunkyClicked(Ref *pSender, Control::EventType pControlEvent) {
|
||||||
mAnimationManager->runAnimationsForSequenceNamedTweenDuration("Funky", 0.3f);
|
mAnimationManager->runAnimationsForSequenceNamedTweenDuration("Funky", 0.3f);
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,4 +31,4 @@ private:
|
||||||
cocosbuilder::CCBAnimationManager *mAnimationManager;
|
cocosbuilder::CCBAnimationManager *mAnimationManager;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -61,4 +61,4 @@ void ButtonTestLayer::onControlButtonClicked(cocos2d::Ref *pSender, Control::Eve
|
||||||
default:
|
default:
|
||||||
assert(false); // OH SHIT!
|
assert(false); // OH SHIT!
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,4 +26,4 @@ private:
|
||||||
cocos2d::Label * mControlEventLabel;
|
cocos2d::Label * mControlEventLabel;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -8,4 +8,4 @@ class CocosBuilderTestScene : public TestScene {
|
||||||
virtual void runThisTest();
|
virtual void runThisTest();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,4 +9,4 @@ class LabelTestLayer : public cocos2d::Layer {
|
||||||
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(LabelTestLayer, create);
|
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(LabelTestLayer, create);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -41,4 +41,4 @@ void MenuTestLayer::onMenuItemBClicked(cocos2d::Ref *pSender) {
|
||||||
|
|
||||||
void MenuTestLayer::onMenuItemCClicked(cocos2d::Ref *pSender) {
|
void MenuTestLayer::onMenuItemCClicked(cocos2d::Ref *pSender) {
|
||||||
this->mMenuItemStatusLabelBMFont->setString("Menu Item C clicked.");
|
this->mMenuItemStatusLabelBMFont->setString("Menu Item C clicked.");
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,4 +28,4 @@ class MenuTestLayer
|
||||||
cocos2d::Label * mMenuItemStatusLabelBMFont;
|
cocos2d::Label * mMenuItemStatusLabelBMFont;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,4 +9,4 @@ class ParticleSystemTestLayer : public cocos2d::Layer {
|
||||||
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(ParticleSystemTestLayer, create);
|
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(ParticleSystemTestLayer, create);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,4 +9,4 @@ class ScrollViewTestLayer : public cocos2d::Layer {
|
||||||
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(ScrollViewTestLayer, create);
|
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(ScrollViewTestLayer, create);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -9,4 +9,4 @@ class SpriteTestLayer : public cocos2d::Layer {
|
||||||
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(SpriteTestLayer, create);
|
CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(SpriteTestLayer, create);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -22,4 +22,4 @@ void TestHeaderLayer::onNodeLoaded(cocos2d::Node * node, cocosbuilder::NodeLoade
|
||||||
|
|
||||||
void TestHeaderLayer::onBackClicked(cocos2d::Ref *pSender) {
|
void TestHeaderLayer::onBackClicked(cocos2d::Ref *pSender) {
|
||||||
Director::getInstance()->popScene();
|
Director::getInstance()->popScene();
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,4 +20,4 @@ class TestHeaderLayer
|
||||||
void onBackClicked(cocos2d::Ref * sender);
|
void onBackClicked(cocos2d::Ref * sender);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -48,4 +48,4 @@ public:
|
||||||
|
|
||||||
void runSocketIOTest();
|
void runSocketIOTest();
|
||||||
|
|
||||||
#endif /* defined(__TestCpp__SocketIOTest__) */
|
#endif /* defined(__TestCpp__SocketIOTest__) */
|
||||||
|
|
|
@ -226,4 +226,4 @@ public:
|
||||||
|
|
||||||
virtual std::string title() const override;
|
virtual std::string title() const override;
|
||||||
virtual std::string subtitle() const override;
|
virtual std::string subtitle() const override;
|
||||||
};
|
};
|
||||||
|
|
|
@ -79,4 +79,4 @@ void MouseTestScene::runThisTest()
|
||||||
|
|
||||||
Director::getInstance()->replaceScene(this);
|
Director::getInstance()->replaceScene(this);
|
||||||
layer->release();
|
layer->release();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1862,4 +1862,4 @@ std::string LabelAdditionalKerningTest::title() const
|
||||||
std::string LabelAdditionalKerningTest::subtitle() const
|
std::string LabelAdditionalKerningTest::subtitle() const
|
||||||
{
|
{
|
||||||
return "Testing additional kerning of label";
|
return "Testing additional kerning of label";
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,4 +52,4 @@ void runRendererTest()
|
||||||
{
|
{
|
||||||
auto scene = RenderTestLayer::scene();
|
auto scene = RenderTestLayer::scene();
|
||||||
Director::getInstance()->replaceScene(scene);
|
Director::getInstance()->replaceScene(scene);
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,4 +8,4 @@ void main()
|
||||||
gl_Position = CC_MVPMatrix * a_position;
|
gl_Position = CC_MVPMatrix * a_position;
|
||||||
}
|
}
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
|
@ -60,4 +60,4 @@ protected:
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue