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

Editing code as comment. 

Move CocosStudioExtension path and update related files.
This commit is contained in:
XiaoFeng 2015-12-04 10:43:39 +08:00
parent 2da192a1c2
commit 6fb65b5610
20 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cocos/2d/CCDrawNode.cpp
View File

@ -400,12 +400,17 @@ void DrawNode::onDrawGLLine(const Mat4 &transform, uint32_t flags)
} }
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
// GL_MULTISAMPLE & GL_LINE_SMOOTH only work on PC platform // GL_MULTISAMPLE only work on PC platform, GL_LINE_SMOOTH will not support at GLES v3.0
if (this->_lineSmoothEnable == false) if (this->_lineSmoothEnable == false)
{ {
glDisable(GL_MULTISAMPLE); glDisable(GL_MULTISAMPLE);
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
} }
else
{
glEnable(GL_MULTISAMPLE);
glEnable(GL_LINE_SMOOTH);
}
#endif #endif
glLineWidth(_lineWidth); glLineWidth(_lineWidth);
@ -419,14 +424,6 @@ void DrawNode::onDrawGLLine(const Mat4 &transform, uint32_t flags)
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);
CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,_bufferCountGLLine); CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,_bufferCountGLLine);
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
if (this->_lineSmoothEnable == true)
{
glEnable(GL_MULTISAMPLE);
glEnable(GL_LINE_SMOOTH);
}
#endif
CHECK_GL_ERROR_DEBUG(); CHECK_GL_ERROR_DEBUG();
} }

2
cocos/2d/CCSpriteFrameCache.cpp
View File

@ -701,8 +701,6 @@ bool SpriteFrameCache::reloadTexture(const std::string& plist)
// append .png // append .png
texturePath = texturePath.append(".png"); texturePath = texturePath.append(".png");
CCLOG("cocos2d: SpriteFrameCache: Trying to use file %s as texture", texturePath.c_str());
} }
Texture2D *texture = nullptr; Texture2D *texture = nullptr;

9
cocos/2d/CCTMXTiledMap.cpp
View File

@ -29,7 +29,6 @@ THE SOFTWARE.
#include "2d/CCTMXLayer.h" #include "2d/CCTMXLayer.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "deprecated/CCString.h" // For StringUtils::format #include "deprecated/CCString.h" // For StringUtils::format
#include "2d/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN
@ -284,12 +283,4 @@ int TMXTiledMap::getLayerNum()
return _tmxLayerNum; return _tmxLayerNum;
} }
ResouceData TMXTiledMap::getRenderFile()
{
ResouceData rData;
rData.type = 0;
rData.file = _tmxFile;
return rData;
}
NS_CC_END NS_CC_END

3
cocos/2d/CCTMXTiledMap.h
View File

@ -37,7 +37,6 @@ class TMXLayer;
class TMXLayerInfo; class TMXLayerInfo;
class TMXTilesetInfo; class TMXTilesetInfo;
class TMXMapInfo; class TMXMapInfo;
struct CC_DLL ResouceData;
/** /**
* @addtogroup _2d * @addtogroup _2d
@ -253,8 +252,8 @@ public:
*/ */
virtual std::string getDescription() const override; virtual std::string getDescription() const override;
ResouceData getRenderFile();
int getLayerNum(); int getLayerNum();
const std::string getResourceFile() const { return _tmxFile; }
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
/** /**

0
cocos/2d/CocosStudioExtension.cpp → cocos/editor-support/cocostudio/CocosStudioExtension.cpp
View File

0
cocos/2d/CocosStudioExtension.h → cocos/editor-support/cocostudio/CocosStudioExtension.h
View File

2
cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
View File

@ -27,7 +27,7 @@
#include "js_manual_conversions.h" #include "js_manual_conversions.h"
#include "cocos2d_specifics.hpp" #include "cocos2d_specifics.hpp"
#include "math/TransformUtils.h" #include "math/TransformUtils.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
USING_NS_CC; USING_NS_CC;

2
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
View File

@ -31,7 +31,7 @@ extern "C" {
#include "tolua_fix.h" #include "tolua_fix.h"
#include "cocos2d.h" #include "cocos2d.h"
#include "Lua-BindingsExport.h" #include "Lua-BindingsExport.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
using namespace cocos2d; using namespace cocos2d;

2
cocos/ui/CocosGUI.h
View File

@ -57,7 +57,7 @@ THE SOFTWARE.
#include "ui/UIScale9Sprite.h" #include "ui/UIScale9Sprite.h"
#include "ui/UIEditBox/UIEditBox.h" #include "ui/UIEditBox/UIEditBox.h"
#include "ui/UILayoutComponent.h" #include "ui/UILayoutComponent.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
/** /**
* @addtogroup ui * @addtogroup ui

2
cocos/ui/UIAbstractCheckButton.cpp
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#include "ui/UIAbstractCheckButton.h" #include "ui/UIAbstractCheckButton.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UIButton.cpp
View File

@ -30,7 +30,7 @@ THE SOFTWARE.
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#include "ui/UIHelper.h" #include "ui/UIHelper.h"
#include <algorithm> #include <algorithm>
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UIImageView.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "ui/UIScale9Sprite.h" #include "ui/UIScale9Sprite.h"
#include "ui/UIHelper.h" #include "ui/UIHelper.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UILayout.cpp
View File

@ -38,7 +38,7 @@ THE SOFTWARE.
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "base/CCEventFocus.h" #include "base/CCEventFocus.h"
#include "base/CCStencilStateManager.hpp" #include "base/CCStencilStateManager.hpp"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UILoadingBar.cpp
View File

@ -26,7 +26,7 @@ THE SOFTWARE.
#include "ui/UIHelper.h" #include "ui/UIHelper.h"
#include "ui/UIScale9Sprite.h" #include "ui/UIScale9Sprite.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UISlider.cpp
View File

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "ui/UIHelper.h" #include "ui/UIHelper.h"
#include "2d/CCSprite.h" #include "2d/CCSprite.h"
#include "2d/CCCamera.h" #include "2d/CCCamera.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UITextAtlas.cpp
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#include "ui/UITextAtlas.h" #include "ui/UITextAtlas.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UITextBMFont.cpp
View File

@ -24,7 +24,7 @@ THE SOFTWARE.
#include "ui/UITextBMFont.h" #include "ui/UITextBMFont.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
NS_CC_BEGIN NS_CC_BEGIN

2
tests/cpp-tests/Classes/ParticleTest/ParticleTest.cpp
View File

@ -1,6 +1,6 @@
#include "ParticleTest.h" #include "ParticleTest.h"
#include "../testResource.h" #include "../testResource.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
USING_NS_CC; USING_NS_CC;

2
tests/cpp-tests/Classes/SpriteTest/SpriteTest.cpp
View File

@ -27,7 +27,7 @@
#include <algorithm> #include <algorithm>
#include "../testResource.h" #include "../testResource.h"
#include "2d/CocosStudioExtension.h" #include "editor-support/cocostudio/CocosStudioExtension.h"
USING_NS_CC; USING_NS_CC;

6
tests/cpp-tests/Classes/TileMapTest/TileMapTest.cpp
View File

@ -1,6 +1,6 @@
#include "TileMapTest.h" #include "TileMapTest.h"
#include "../testResource.h" #include "../testResource.h"
#include "2d/CocosStudioExtension.h"
USING_NS_CC; USING_NS_CC;
@ -858,10 +858,6 @@ TMXIsoZorder::TMXIsoZorder()
_tamara->runAction( RepeatForever::create(seq) ); _tamara->runAction( RepeatForever::create(seq) );
schedule( CC_SCHEDULE_SELECTOR(TMXIsoZorder::repositionSprite) ); schedule( CC_SCHEDULE_SELECTOR(TMXIsoZorder::repositionSprite) );
int layerCount = map->getLayerNum();
auto rd = map->getRenderFile();
CCLOG("There's %d layer in map. Resource type is : %d, file name : %s", layerCount, rd.type, 0 ==rd.type ? rd.file.c_str() : rd.plist.c_str());
} }
TMXIsoZorder::~TMXIsoZorder() TMXIsoZorder::~TMXIsoZorder()