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

Fixing warnings of the order of member variables and fixing errors for tizen projects.

This commit is contained in:
James Chen 2013-07-29 14:07:57 +08:00
parent 84d2bbe2b3
commit 343c98af13
28 changed files with 102 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos2dx/actions/CCActionInterval.cpp
View File

@ -1273,7 +1273,7 @@ void JumpTo::startWithTarget(Node *target)
// Bezier cubic formula:
// ((1 - t) + t)3 = 1
// Expands to¡­
// Expands to ...
// (1 - t)3 + 3t(1-t)2 + 3t2(1 - t) + t3 = 1
static inline float bezierat( float a, float b, float c, float d, float t )
{
@ -1987,11 +1987,11 @@ Animate* Animate::create(Animation *pAnimation)
}
Animate::Animate()
: _animation(NULL)
, _splitTimes(new std::vector<float>)
: _splitTimes(new std::vector<float>)
, _nextFrame(0)
, _origFrame(NULL)
, _executedLoops(0)
, _animation(NULL)
{
}
@ -2155,8 +2155,8 @@ Animate* Animate::reverse() const
// TargetedAction
TargetedAction::TargetedAction()
: _forcedTarget(NULL)
, _action(NULL)
: _action(NULL)
, _forcedTarget(NULL)
{
}

8
cocos2dx/base_nodes/CCNode.cpp
View File

@ -64,6 +64,11 @@ Node::Node(void)
, _anchorPoint(Point::ZERO)
, _contentSize(Size::ZERO)
, _additionalTransform(AffineTransformMakeIdentity())
, _transform(AffineTransformMakeIdentity())
, _inverse(AffineTransformMakeIdentity())
, _additionalTransformDirty(false)
, _transformDirty(true)
, _inverseDirty(true)
, _camera(NULL)
// children (lazy allocs)
// lazy alloc
@ -79,9 +84,6 @@ Node::Node(void)
, _shaderProgram(NULL)
, _orderOfArrival(0)
, _running(false)
, _transformDirty(true)
, _inverseDirty(true)
, _additionalTransformDirty(false)
, _visible(true)
, _ignoreAnchorPointForPosition(false)
, _reorderChildDirty(false)

2
cocos2dx/include/ccTypes.h
View File

@ -412,8 +412,8 @@ public:
: _fontSize(0)
, _alignment(Label::HAlignment::CENTER)
, _vertAlignment(Label::VAlignment::TOP)
, _dimensions(Size::ZERO)
, _fontFillColor(Color3B::WHITE)
, _dimensions(Size::ZERO)
{}
// font name

4
cocos2dx/menu_nodes/CCMenuItem.h
View File

@ -128,8 +128,8 @@ public:
static MenuItemLabel* create(Node *label);
MenuItemLabel()
: _label(NULL)
, _originalScale(0.0)
: _originalScale(0.0)
, _label(NULL)
{}
virtual ~MenuItemLabel();

2
cocos2dx/misc_nodes/CCMotionStreak.cpp
View File

@ -37,6 +37,7 @@ MotionStreak::MotionStreak()
: _fastMode(false)
, _startingPositionInitialized(false)
, _texture(NULL)
, _blendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED)
, _positionR(Point::ZERO)
, _stroke(0.0f)
, _fadeDelta(0.0f)
@ -49,7 +50,6 @@ MotionStreak::MotionStreak()
, _vertices(NULL)
, _colorPointer(NULL)
, _texCoords(NULL)
, _blendFunc(BlendFunc::ALPHA_NON_PREMULTIPLIED)
{
}

4
cocos2dx/misc_nodes/CCProgressTimer.cpp
View File

@ -46,12 +46,12 @@ const char kProgressTextureCoords = 0x4b;
ProgressTimer::ProgressTimer()
:_type(Type::RADIAL)
,_midpoint(0,0)
,_barChangeRate(0,0)
,_percentage(0.0f)
,_sprite(NULL)
,_vertexDataCount(0)
,_vertexData(NULL)
,_midpoint(0,0)
,_barChangeRate(0,0)
,_reverseDirection(false)
{}

4
cocos2dx/misc_nodes/CCRenderTexture.cpp
View File

@ -44,8 +44,7 @@ NS_CC_BEGIN
// implementation RenderTexture
RenderTexture::RenderTexture()
: _sprite(NULL)
, _FBO(0)
: _FBO(0)
, _depthRenderBufffer(0)
, _oldFBO(0)
, _texture(0)
@ -57,6 +56,7 @@ RenderTexture::RenderTexture()
, _clearDepth(0.0f)
, _clearStencil(0)
, _autoDraw(false)
, _sprite(NULL)
{
#if CC_ENABLE_CACHE_TEXTURE_DATA
// Listen this event to save render texture before come to background.

12
cocos2dx/particle_nodes/CCParticleSystem.cpp
View File

@ -81,7 +81,9 @@ NS_CC_BEGIN
//
ParticleSystem::ParticleSystem()
: _plistFile("")
: _isBlendAdditive(false)
, _isAutoRemoveOnFinish(false)
, _plistFile("")
, _elapsed(0)
, _particles(NULL)
, _emitCounter(0)
@ -99,6 +101,7 @@ ParticleSystem::ParticleSystem()
, _lifeVar(0)
, _angle(0)
, _angleVar(0)
, _emitterMode(Mode::GRAVITY)
, _startSize(0)
, _startSizeVar(0)
, _endSize(0)
@ -110,12 +113,9 @@ ParticleSystem::ParticleSystem()
, _emissionRate(0)
, _totalParticles(0)
, _texture(NULL)
, _opacityModifyRGB(false)
, _isBlendAdditive(false)
, _positionType(PositionType::FREE)
, _isAutoRemoveOnFinish(false)
, _emitterMode(Mode::GRAVITY)
, _blendFunc(BlendFunc::ALPHA_PREMULTIPLIED)
, _opacityModifyRGB(false)
, _positionType(PositionType::FREE)
{
modeA.gravity = Point::ZERO;
modeA.speed = 0;

2
cocos2dx/platform/mac/CCImage.mm
View File

@ -303,8 +303,8 @@ static bool _isValidFontName(const char *fontName)
}
}
}
#endif
out:
#endif
return ret;
}

4
cocos2dx/platform/tizen/CCImage.cpp
View File

@ -244,7 +244,7 @@ public:
int lineWidth = textLines.at(line).lineWidth;
if (eAlignMask == Image::TextAlign::CENTER || eAlignMask == Image::TextAlign::TOP || eAlignMask == Image::TextAlign::BOTTOM) {
return (iMaxLineWidth - lineWidth) / 2;
} else if (eAlignMask == Image::TextAlign::RIGHT || eAlignMask == Image::TextAlign::TO_RIGHT || eAlignMask == Image::TextAlign::BOTTOM_RIGHT) {
} else if (eAlignMask == Image::TextAlign::RIGHT || eAlignMask == Image::TextAlign::TOP_RIGHT || eAlignMask == Image::TextAlign::BOTTOM_RIGHT) {
return (iMaxLineWidth - lineWidth);
}
@ -428,7 +428,7 @@ bool Image::initWithString(
const char * pText,
int nWidth/* = 0*/,
int nHeight/* = 0*/,
ETextAlign eAlignMask/* = kAlignCenter*/,
TextAlign eAlignMask/* = kAlignCenter*/,
const char * pFontName/* = nil*/,
int nSize/* = 0*/)
{

19
cocos2dx/proj.tizen/.project
View File

@ -7,8 +7,11 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?children?</key>
<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
@ -31,7 +34,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/cocos2dx/Debug-Tizen-Device}</value>
<value>${workspace_loc:/cocos2dx/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +46,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
@ -347,16 +350,6 @@
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/CCThread.h</locationURI>
</link>
<link>
<name>src/platform/platform.cpp</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/platform.cpp</locationURI>
</link>
<link>
<name>src/platform/platform.h</name>
<type>1</type>
<locationURI>PARENT-1-PROJECT_LOC/platform/platform.h</locationURI>
</link>
<link>
<name>src/platform/tizen</name>
<type>2</type>

10
cocos2dx/textures/CCTexture2D.cpp
View File

@ -57,14 +57,12 @@ NS_CC_BEGIN
// Default is: RGBA8888 (32-bit textures)
static Texture2D::PixelFormat g_defaultAlphaPixelFormat = Texture2D::PixelFormat::DEFAULT;
// By default PVR images are treated as if they don't have the alpha channel premultiplied
static bool PVRHaveAlphaPremultiplied_ = false;
static bool _PVRHaveAlphaPremultiplied = false;
Texture2D::Texture2D()
: _PVRHaveAlphaPremultiplied(true)
: _pixelFormat(Texture2D::PixelFormat::DEFAULT)
, _pixelsWide(0)
, _pixelsHigh(0)
, _pixelFormat(Texture2D::PixelFormat::DEFAULT)
, _name(0)
, _maxS(0.0)
, _maxT(0.0)
@ -664,7 +662,7 @@ bool Texture2D::initWithPVRFile(const char* file)
_contentSize = Size((float)_pixelsWide, (float)_pixelsHigh);
// FIX ME, if premultiply should be false, or the test case in RenderTextureTest(RenderTextureTargetNode) works in wrong effect
//_hasPremultipliedAlpha = (pvr->isForcePremultipliedAlpha()) ? pvr->hasPremultipliedAlpha() : _PVRHaveAlphaPremultiplied;
_hasPremultipliedAlpha =PVRHaveAlphaPremultiplied_;
_hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied;
_pixelFormat = pvr->getFormat();
_hasMipmaps = pvr->getNumberOfMipmaps() > 1;
@ -708,7 +706,7 @@ bool Texture2D::initWithETCFile(const char* file)
void Texture2D::PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied)
{
PVRHaveAlphaPremultiplied_ = haveAlphaPremultiplied;
_PVRHaveAlphaPremultiplied = haveAlphaPremultiplied;
}

3
cocos2dx/textures/CCTexture2D.h
View File

@ -269,9 +269,6 @@ public:
private:
bool initPremultipliedATextureWithImage(Image * image, unsigned int pixelsWide, unsigned int pixelsHigh);
// By default PVR images are treated as if they don't have the alpha channel premultiplied
bool _PVRHaveAlphaPremultiplied;
protected:
/** pixel format of the texture */
Texture2D::PixelFormat _pixelFormat;

15
cocos2dx/tilemap_parallax_nodes/CCTMXLayer.cpp
View File

@ -98,14 +98,21 @@ bool TMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *la
}
TMXLayer::TMXLayer()
:_layerSize(Size::ZERO)
:_layerName("")
,_opacity(0)
,_minGID(0)
,_maxGID(0)
,_vertexZvalue(0)
,_useAutomaticVertexZ(false)
,_reusedTile(NULL)
,_atlasIndexArray(NULL)
,_contentScaleFactor(1.0f)
,_layerSize(Size::ZERO)
,_mapTileSize(Size::ZERO)
,_tiles(NULL)
,_tileSet(NULL)
,_layerOrientation(TMXOrientationOrtho)
,_properties(NULL)
,_layerName("")
,_reusedTile(NULL)
,_atlasIndexArray(NULL)
{}
TMXLayer::~TMXLayer()

4
cocos2dx/tilemap_parallax_nodes/CCTMXObjectGroup.cpp
View File

@ -32,8 +32,8 @@ NS_CC_BEGIN
//implementation TMXObjectGroup
TMXObjectGroup::TMXObjectGroup()
:_positionOffset(Point::ZERO)
,_groupName("")
: _groupName("")
, _positionOffset(Point::ZERO)
{
_objects = Array::create();
_objects->retain();

6
cocos2dx/tilemap_parallax_nodes/CCTileMapAtlas.cpp
View File

@ -65,9 +65,9 @@ bool TileMapAtlas::initWithTileFile(const char *tile, const char *mapFile, int t
}
TileMapAtlas::TileMapAtlas()
:_TGAInfo(NULL)
,_posToAtlasIndex(NULL)
,_itemsToRender(0)
: _posToAtlasIndex(NULL)
, _itemsToRender(0)
, _TGAInfo(NULL)
{
}

8
extensions/CCArmature/physics/CCPhysicsWorld.cpp
View File

@ -41,7 +41,7 @@ public:
class ContactListener : public b2ContactListener
{
//! Callbacks for derived classes.
virtual void BeginContact(b2Contact *contact)
virtual void BeginContact(b2Contact *contact) override
{
if (contact)
{
@ -53,17 +53,17 @@ class ContactListener : public b2ContactListener
}
B2_NOT_USED(contact);
}
virtual void EndContact(b2Contact *contact)
virtual void EndContact(b2Contact *contact) override
{
contact_list.clear();
B2_NOT_USED(contact);
}
virtual void PreSolve(b2Contact *contact, const b2Manifold *oldManifold)
virtual void PreSolve(b2Contact *contact, const b2Manifold *oldManifold) override
{
B2_NOT_USED(contact);
B2_NOT_USED(oldManifold);
}
virtual void PostSolve(const b2Contact *contact, const b2ContactImpulse *impulse)
virtual void PostSolve(b2Contact *contact, const b2ContactImpulse *impulse) override
{
B2_NOT_USED(contact);
B2_NOT_USED(impulse);

7
extensions/CCBReader/CCBAnimationManager.cpp
View File

@ -17,7 +17,9 @@ NS_CC_EXT_BEGIN
// Implementation of CCBAinmationManager
CCBAnimationManager::CCBAnimationManager()
: _sequences(NULL)
: _jsControlled(false)
, _owner(NULL)
, _sequences(NULL)
, _nodeSequences(NULL)
, _baseValues(NULL)
, _autoPlaySequenceId(0)
@ -25,8 +27,7 @@ CCBAnimationManager::CCBAnimationManager()
, _rootContainerSize(Size::ZERO)
, _delegate(NULL)
, _runningSequence(NULL)
, _jsControlled(false)
, _owner(NULL)
{
init();
}

8
extensions/GUI/CCControlExtension/CCControl.cpp
View File

@ -37,13 +37,13 @@
NS_CC_EXT_BEGIN
Control::Control()
: _isOpacityModifyRGB(false)
, _state(State::NORMAL)
, _hasVisibleParents(false)
, _enabled(false)
: _enabled(false)
, _selected(false)
, _highlighted(false)
, _hasVisibleParents(false)
, _dispatchTable(NULL)
, _isOpacityModifyRGB(false)
, _state(State::NORMAL)
{
}

8
extensions/GUI/CCControlExtension/CCControlButton.cpp
View File

@ -42,14 +42,14 @@ enum
};
ControlButton::ControlButton()
: _currentTitle(NULL)
, _currentTitleColor(Color3B::WHITE)
: _isPushed(false)
, _parentInited(false)
, _doesAdjustBackgroundImage(false)
, _currentTitle(NULL)
, _currentTitleColor(Color3B::WHITE)
, _titleLabel(NULL)
, _backgroundSprite(NULL)
, _zoomOnTouchDown(false)
, _isPushed(false)
, _parentInited(false)
, _titleDispatchTable(NULL)
, _titleColorDispatchTable(NULL)
, _titleLabelDispatchTable(NULL)

6
extensions/GUI/CCControlExtension/CCControlPotentiometer.cpp
View File

@ -31,11 +31,11 @@
NS_CC_EXT_BEGIN
ControlPotentiometer::ControlPotentiometer()
: _thumbSprite(NULL)
, _progressTimer(NULL)
, _value(0.0f)
: _value(0.0f)
, _minimumValue(0.0f)
, _maximumValue(0.0f)
, _thumbSprite(NULL)
, _progressTimer(NULL)
{
}

10
extensions/GUI/CCControlExtension/CCControlStepper.cpp
View File

@ -39,11 +39,7 @@ NS_CC_EXT_BEGIN
#define kAutorepeatIncreaseTimeIncrement 12
ControlStepper::ControlStepper()
: _minusSprite(NULL)
, _plusSprite(NULL)
, _minusLabel(NULL)
, _plusLabel(NULL)
, _value(0.0)
: _value(0.0)
, _continuous(false)
, _autorepeat(false)
, _wraps(false)
@ -53,6 +49,10 @@ ControlStepper::ControlStepper()
, _touchInsideFlag(false)
, _touchedPart(Part::NONE)
, _autorepeatCount(0)
, _minusSprite(NULL)
, _plusSprite(NULL)
, _minusLabel(NULL)
, _plusLabel(NULL)
{
}

10
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
View File

@ -43,11 +43,7 @@ enum positions
};
Scale9Sprite::Scale9Sprite()
: _insetLeft(0)
, _insetTop(0)
, _insetRight(0)
, _insetBottom(0)
, _spritesGenerated(false)
: _spritesGenerated(false)
, _spriteFrameRotated(false)
, _positionsAreDirty(false)
, _scale9Image(NULL)
@ -61,6 +57,10 @@ Scale9Sprite::Scale9Sprite()
, _bottom(NULL)
, _bottomRight(NULL)
, _opacityModifyRGB(false)
, _insetLeft(0)
, _insetTop(0)
, _insetRight(0)
, _insetBottom(0)
{
}

2
extensions/GUI/CCEditBox/CCEditBoxImplIOS.mm
View File

@ -257,8 +257,8 @@ EditBoxImplIOS::EditBoxImplIOS(EditBox* pEditText)
: EditBoxImpl(pEditText)
, _label(NULL)
, _labelPlaceHolder(NULL)
, _systemControl(NULL)
, _anchorPoint(Point(0.5f, 0.5f))
, _systemControl(NULL)
, _maxTextLength(-1)
{
_inRetinaMode = [[CCEAGLView sharedEGLView] contentScaleFactor] == 2.0f ? true : false;

4
extensions/GUI/CCEditBox/CCEditBoxImplMac.mm
View File

@ -234,8 +234,10 @@ EditBoxImpl* __createSystemEditBox(EditBox* pEditBox)
}
EditBoxImplMac::EditBoxImplMac(EditBox* pEditText)
: EditBoxImpl(pEditText), _sysEdit(NULL), _maxTextLength(-1)
: EditBoxImpl(pEditText)
, _anchorPoint(Point(0.5f, 0.5f))
, _maxTextLength(-1)
, _sysEdit(NULL)
{
//! TODO: Retina on Mac
//! _inRetinaMode = [[CCEAGLView sharedEGLView] contentScaleFactor] == 2.0f ? true : false;

22
extensions/GUI/CCEditBox/CCEditBoxImplTizen.cpp
View File

@ -46,7 +46,7 @@ EditBoxImplTizen::EditBoxImplTizen(EditBox* pEditText)
, _labelPlaceHolder(NULL)
, _editBoxInputMode(EditBox::InputMode::SINGLE_LINE)
, _editBoxInputFlag(EditBox::InputFlag::INTIAL_CAPS_ALL_CHARACTERS)
, _keyboardReturnType(kKeyboardReturnTypeDefault)
, _keyboardReturnType(EditBox::KeyboardReturnType::DEFAULT)
, _colText(Color3B::WHITE)
, _colPlaceHolder(Color3B::GRAY)
, _maxLength(-1)
@ -65,7 +65,7 @@ static const int CC_EDIT_BOX_PADDING = 5;
bool EditBoxImplTizen::initWithSize(const Size& size)
{
int fontSize = (int)size.height-12;
// int fontSize = (int)size.height-12;
_label = LabelTTF::create("", "", size.height-12);
// align the text vertically center
_label->setAnchorPoint(Point(0, 0.5f));
@ -160,7 +160,7 @@ void EditBoxImplTizen::setText(const char* pText)
std::string strToShow;
if (kEditBoxInputFlagPassword == _editBoxInputFlag)
if (EditBox::InputFlag::PASSWORD == _editBoxInputFlag)
{
long length = cc_utf8_strlen(_text.c_str(), -1);
for (long i = 0; i < length; i++)
@ -284,21 +284,21 @@ void EditBoxImplTizen::openKeyboard()
bool bSingleLineEnabled = false;
switch (_editBoxInputMode)
{
case kEditBoxInputModeAny:
case EditBox::InputMode::ANY:
keypadStyle = KEYPAD_STYLE_NORMAL;
break;
case kEditBoxInputModeEmailAddr:
case EditBox::InputMode::EMAIL_ADDRESS:
keypadStyle = KEYPAD_STYLE_EMAIL;
break;
case kEditBoxInputModeNumeric:
case kEditBoxInputModeDecimal:
case EditBox::InputMode::NUMERIC:
case EditBox::InputMode::DECIMAL:
keypadStyle = KEYPAD_STYLE_NUMBER;
keypadCategory = KEYPAD_MODE_NUMERIC;
break;
case kEditBoxInputModePhoneNumber:
case EditBox::InputMode::PHONE_NUMBER:
keypadStyle = KEYPAD_STYLE_PHONE_NUMBER;
break;
case kEditBoxInputModeUrl:
case EditBox::InputMode::URL:
keypadStyle = KEYPAD_STYLE_URL;
break;
case EditBox::InputMode::SINGLE_LINE:
@ -312,10 +312,10 @@ void EditBoxImplTizen::openKeyboard()
bool bTextPrediction = true;
switch (_editBoxInputFlag)
{
case kEditBoxInputFlagPassword:
case EditBox::InputFlag::PASSWORD:
keypadStyle = KEYPAD_STYLE_PASSWORD;
break;
case kEditBoxInputFlagSensitive:
case EditBox::InputFlag::SENSITIVE:
bTextPrediction = false;
break;
default:

6
extensions/network/SocketIO.cpp
View File

@ -490,11 +490,11 @@ void SIOClientImpl::onError(cocos2d::extension::WebSocket* ws, const cocos2d::ex
//begin SIOClient methods
SIOClient::SIOClient(const std::string& host, int port, const std::string& path, SIOClientImpl* impl, SocketIO::SIODelegate& delegate)
: _host(host)
, _port(port)
: _port(port)
, _host(host)
, _path(path)
, _connected(false)
, _socket(impl)
, _connected(false)
, _delegate(&delegate)
{

5
external/chipmunk/proj.tizen/.project vendored
View File

@ -7,7 +7,6 @@
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
@ -31,7 +30,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/chipmunk/Debug-Tizen-Device}</value>
<value>${workspace_loc:/chipmunk/Debug-Tizen-Emulator}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
@ -43,7 +42,7 @@
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>