Skip to content

Commit abd39c9

Browse files
author
minggo
committed
issue cocos2d#1555:menu can receive touch event now
1 parent 31c0213 commit abd39c9

File tree

5 files changed

+64
-23
lines changed

5 files changed

+64
-23
lines changed

‎cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ void CCLayer::setTouchEnabled(bool enabled)
175175
}
176176
}
177177

178-
179178
void CCLayer::setTouchMode(ccTouchesMode mode)
180179
{
181180
if(m_eTouchMode != mode)

‎cocos2dx/menu_nodes/CCMenu.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,8 @@ bool CCMenu::initWithArray(CCArray* pArrayOfItems)
137137
if (CCLayer::init())
138138
{
139139
setTouchPriority(kCCMenuHandlerPriority);
140+
setTouchMode(kCCTouchesOneByOne);
141+
setTouchEnabled(true);
140142

141143
m_bEnabled = true;
142144
// menu in the center of the screen

‎cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
152DCD8E165614AB009B8D87 /* CCDrawingPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 152DCD8A165614AB009B8D87 /* CCDrawingPrimitives.cpp */; };
11+
152DCD8F165614AB009B8D87 /* CCDrawingPrimitives.h in Headers */ = {isa = PBXBuildFile; fileRef = 152DCD8B165614AB009B8D87 /* CCDrawingPrimitives.h */; };
12+
152DCD90165614AB009B8D87 /* CCDrawNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 152DCD8C165614AB009B8D87 /* CCDrawNode.cpp */; };
13+
152DCD91165614AB009B8D87 /* CCDrawNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 152DCD8D165614AB009B8D87 /* CCDrawNode.h */; };
14+
152DCD97165614C2009B8D87 /* CCPhysicsDebugNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 152DCD93165614C2009B8D87 /* CCPhysicsDebugNode.cpp */; };
15+
152DCD98165614C2009B8D87 /* CCPhysicsDebugNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 152DCD94165614C2009B8D87 /* CCPhysicsDebugNode.h */; };
16+
152DCD99165614C2009B8D87 /* CCPhysicsSprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 152DCD95165614C2009B8D87 /* CCPhysicsSprite.cpp */; };
17+
152DCD9A165614C2009B8D87 /* CCPhysicsSprite.h in Headers */ = {isa = PBXBuildFile; fileRef = 152DCD96165614C2009B8D87 /* CCPhysicsSprite.h */; };
1018
154269DC15B5653000712A7F /* CCNotificationCenter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 154269DA15B5653000712A7F /* CCNotificationCenter.cpp */; };
1119
154269DD15B5653000712A7F /* CCNotificationCenter.h in Headers */ = {isa = PBXBuildFile; fileRef = 154269DB15B5653000712A7F /* CCNotificationCenter.h */; };
1220
1551A343158F2AB200E66CFE /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1551A342158F2AB200E66CFE /* Foundation.framework */; };
@@ -46,8 +54,6 @@
4654
1551A649158F2ADE00E66CFE /* CCConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 1551A378158F2ADE00E66CFE /* CCConfiguration.h */; };
4755
1551A64A158F2ADE00E66CFE /* CCDirector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1551A379158F2ADE00E66CFE /* CCDirector.cpp */; };
4856
1551A64B158F2ADE00E66CFE /* CCDirector.h in Headers */ = {isa = PBXBuildFile; fileRef = 1551A37A158F2ADE00E66CFE /* CCDirector.h */; };
49-
1551A64C158F2ADE00E66CFE /* CCDrawingPrimitives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1551A37B158F2ADE00E66CFE /* CCDrawingPrimitives.cpp */; };
50-
1551A64D158F2ADE00E66CFE /* CCDrawingPrimitives.h in Headers */ = {isa = PBXBuildFile; fileRef = 1551A37C158F2ADE00E66CFE /* CCDrawingPrimitives.h */; };
5157
1551A64E158F2ADE00E66CFE /* CCScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1551A37D158F2ADE00E66CFE /* CCScheduler.cpp */; };
5258
1551A64F158F2ADE00E66CFE /* CCScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1551A37E158F2ADE00E66CFE /* CCScheduler.h */; };
5359
1551A650158F2ADE00E66CFE /* CCAffineTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1551A380158F2ADE00E66CFE /* CCAffineTransform.cpp */; };
@@ -280,6 +286,14 @@
280286
/* End PBXBuildFile section */
281287

282288
/* Begin PBXFileReference section */
289+
152DCD8A165614AB009B8D87 /* CCDrawingPrimitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCDrawingPrimitives.cpp; sourceTree = "<group>"; };
290+
152DCD8B165614AB009B8D87 /* CCDrawingPrimitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDrawingPrimitives.h; sourceTree = "<group>"; };
291+
152DCD8C165614AB009B8D87 /* CCDrawNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCDrawNode.cpp; sourceTree = "<group>"; };
292+
152DCD8D165614AB009B8D87 /* CCDrawNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDrawNode.h; sourceTree = "<group>"; };
293+
152DCD93165614C2009B8D87 /* CCPhysicsDebugNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsDebugNode.cpp; sourceTree = "<group>"; };
294+
152DCD94165614C2009B8D87 /* CCPhysicsDebugNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsDebugNode.h; sourceTree = "<group>"; };
295+
152DCD95165614C2009B8D87 /* CCPhysicsSprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsSprite.cpp; sourceTree = "<group>"; };
296+
152DCD96165614C2009B8D87 /* CCPhysicsSprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsSprite.h; sourceTree = "<group>"; };
283297
154269DA15B5653000712A7F /* CCNotificationCenter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCNotificationCenter.cpp; sourceTree = "<group>"; };
284298
154269DB15B5653000712A7F /* CCNotificationCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCNotificationCenter.h; sourceTree = "<group>"; };
285299
1551A33F158F2AB200E66CFE /* libcocos2dx.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libcocos2dx.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -320,8 +334,6 @@
320334
1551A378158F2ADE00E66CFE /* CCConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCConfiguration.h; sourceTree = "<group>"; };
321335
1551A379158F2ADE00E66CFE /* CCDirector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCDirector.cpp; sourceTree = "<group>"; };
322336
1551A37A158F2ADE00E66CFE /* CCDirector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDirector.h; sourceTree = "<group>"; };
323-
1551A37B158F2ADE00E66CFE /* CCDrawingPrimitives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCDrawingPrimitives.cpp; sourceTree = "<group>"; };
324-
1551A37C158F2ADE00E66CFE /* CCDrawingPrimitives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCDrawingPrimitives.h; sourceTree = "<group>"; };
325337
1551A37D158F2ADE00E66CFE /* CCScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCScheduler.cpp; sourceTree = "<group>"; };
326338
1551A37E158F2ADE00E66CFE /* CCScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCScheduler.h; sourceTree = "<group>"; };
327339
1551A380158F2ADE00E66CFE /* CCAffineTransform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAffineTransform.cpp; sourceTree = "<group>"; };
@@ -567,6 +579,28 @@
567579
/* End PBXFrameworksBuildPhase section */
568580

569581
/* Begin PBXGroup section */
582+
152DCD89165614AB009B8D87 /* draw_nodes */ = {
583+
isa = PBXGroup;
584+
children = (
585+
152DCD8A165614AB009B8D87 /* CCDrawingPrimitives.cpp */,
586+
152DCD8B165614AB009B8D87 /* CCDrawingPrimitives.h */,
587+
152DCD8C165614AB009B8D87 /* CCDrawNode.cpp */,
588+
152DCD8D165614AB009B8D87 /* CCDrawNode.h */,
589+
);
590+
path = draw_nodes;
591+
sourceTree = "<group>";
592+
};
593+
152DCD92165614C2009B8D87 /* physics_nodes */ = {
594+
isa = PBXGroup;
595+
children = (
596+
152DCD93165614C2009B8D87 /* CCPhysicsDebugNode.cpp */,
597+
152DCD94165614C2009B8D87 /* CCPhysicsDebugNode.h */,
598+
152DCD95165614C2009B8D87 /* CCPhysicsSprite.cpp */,
599+
152DCD96165614C2009B8D87 /* CCPhysicsSprite.h */,
600+
);
601+
path = physics_nodes;
602+
sourceTree = "<group>";
603+
};
570604
1551A334158F2AB200E66CFE = {
571605
isa = PBXGroup;
572606
children = (
@@ -596,20 +630,19 @@
596630
1551A353158F2ADE00E66CFE /* cocos2dx */ = {
597631
isa = PBXGroup;
598632
children = (
599-
1551A354158F2ADE00E66CFE /* actions */,
600-
1551A370158F2ADE00E66CFE /* base_nodes */,
601633
1551A375158F2ADE00E66CFE /* CCCamera.cpp */,
602-
1551A376158F2ADE00E66CFE /* CCCamera.h */,
603634
1551A377158F2ADE00E66CFE /* CCConfiguration.cpp */,
604-
1551A378158F2ADE00E66CFE /* CCConfiguration.h */,
605635
1551A379158F2ADE00E66CFE /* CCDirector.cpp */,
606-
1551A37A158F2ADE00E66CFE /* CCDirector.h */,
607-
1551A37B158F2ADE00E66CFE /* CCDrawingPrimitives.cpp */,
608-
1551A37C158F2ADE00E66CFE /* CCDrawingPrimitives.h */,
609636
1551A37D158F2ADE00E66CFE /* CCScheduler.cpp */,
637+
1551A395158F2ADE00E66CFE /* cocos2d.cpp */,
638+
1551A376158F2ADE00E66CFE /* CCCamera.h */,
639+
1551A378158F2ADE00E66CFE /* CCConfiguration.h */,
640+
1551A37A158F2ADE00E66CFE /* CCDirector.h */,
610641
1551A37E158F2ADE00E66CFE /* CCScheduler.h */,
642+
1551A354158F2ADE00E66CFE /* actions */,
643+
1551A370158F2ADE00E66CFE /* base_nodes */,
611644
1551A37F158F2ADE00E66CFE /* cocoa */,
612-
1551A395158F2ADE00E66CFE /* cocos2d.cpp */,
645+
152DCD89165614AB009B8D87 /* draw_nodes */,
613646
1551A396158F2ADE00E66CFE /* effects */,
614647
1551A3E8158F2ADE00E66CFE /* include */,
615648
1551A3F0158F2ADE00E66CFE /* kazmath */,
@@ -619,6 +652,7 @@
619652
1551A42A158F2ADE00E66CFE /* menu_nodes */,
620653
1551A42F158F2ADE00E66CFE /* misc_nodes */,
621654
1551A436158F2ADE00E66CFE /* particle_nodes */,
655+
152DCD92165614C2009B8D87 /* physics_nodes */,
622656
1551A43F158F2ADE00E66CFE /* platform */,
623657
1551A5C0158F2ADE00E66CFE /* script_support */,
624658
1551A5C3158F2ADE00E66CFE /* shaders */,
@@ -1136,7 +1170,6 @@
11361170
1551A647158F2ADE00E66CFE /* CCCamera.h in Headers */,
11371171
1551A649158F2ADE00E66CFE /* CCConfiguration.h in Headers */,
11381172
1551A64B158F2ADE00E66CFE /* CCDirector.h in Headers */,
1139-
1551A64D158F2ADE00E66CFE /* CCDrawingPrimitives.h in Headers */,
11401173
1551A64F158F2ADE00E66CFE /* CCScheduler.h in Headers */,
11411174
1551A651158F2ADE00E66CFE /* CCAffineTransform.h in Headers */,
11421175
1551A653158F2ADE00E66CFE /* CCArray.h in Headers */,
@@ -1270,6 +1303,10 @@
12701303
41CD6C4415BF7382005E6F29 /* CCWindow.h in Headers */,
12711304
41CD6C4615BF7382005E6F29 /* EAGLView.h in Headers */,
12721305
F4D7A74715F269D10081CE26 /* ccTypeInfo.h in Headers */,
1306+
152DCD8F165614AB009B8D87 /* CCDrawingPrimitives.h in Headers */,
1307+
152DCD91165614AB009B8D87 /* CCDrawNode.h in Headers */,
1308+
152DCD98165614C2009B8D87 /* CCPhysicsDebugNode.h in Headers */,
1309+
152DCD9A165614C2009B8D87 /* CCPhysicsSprite.h in Headers */,
12731310
);
12741311
runOnlyForDeploymentPostprocessing = 0;
12751312
};
@@ -1342,7 +1379,6 @@
13421379
1551A646158F2ADE00E66CFE /* CCCamera.cpp in Sources */,
13431380
1551A648158F2ADE00E66CFE /* CCConfiguration.cpp in Sources */,
13441381
1551A64A158F2ADE00E66CFE /* CCDirector.cpp in Sources */,
1345-
1551A64C158F2ADE00E66CFE /* CCDrawingPrimitives.cpp in Sources */,
13461382
1551A64E158F2ADE00E66CFE /* CCScheduler.cpp in Sources */,
13471383
1551A650158F2ADE00E66CFE /* CCAffineTransform.cpp in Sources */,
13481384
1551A652158F2ADE00E66CFE /* CCArray.cpp in Sources */,
@@ -1441,6 +1477,10 @@
14411477
41CD6C4715BF7382005E6F29 /* EAGLView.mm in Sources */,
14421478
41BC70B915BF7EA2006A0A6C /* CCThread.mm in Sources */,
14431479
15842A2615CF6C42006B033F /* CCTouch.cpp in Sources */,
1480+
152DCD8E165614AB009B8D87 /* CCDrawingPrimitives.cpp in Sources */,
1481+
152DCD90165614AB009B8D87 /* CCDrawNode.cpp in Sources */,
1482+
152DCD97165614C2009B8D87 /* CCPhysicsDebugNode.cpp in Sources */,
1483+
152DCD99165614C2009B8D87 /* CCPhysicsSprite.cpp in Sources */,
14441484
);
14451485
runOnlyForDeploymentPostprocessing = 0;
14461486
};

‎extensions/GUI/CCControlExtension/CCControlSwitch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void CCControlSwitchSprite::draw()
159159

160160
ccGLEnableVertexAttribs(kCCVertexAttribFlag_PosColorTex);
161161
ccGLBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
162-
getShaderProgram()->setUniformForModelViewProjectionMatrix();
162+
getShaderProgram()->setUniformsForBuiltins();
163163

164164
glActiveTexture(GL_TEXTURE0);
165165
glBindTexture( GL_TEXTURE_2D, getTexture()->getName());

‎samples/TestCpp/Classes/Box2DTestBed/GLES-Render.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void GLESDebugDraw::initShader( void )
4848
void GLESDebugDraw::DrawPolygon(const b2Vec2* old_vertices, int vertexCount, const b2Color& color)
4949
{
5050
mShaderProgram->use();
51-
mShaderProgram->setUniformForModelViewProjectionMatrix();
51+
mShaderProgram->setUniformsForBuiltins();
5252

5353
b2Vec2* vertices = new b2Vec2[vertexCount];
5454
for( int i=0;i<vertexCount;i++)
@@ -72,7 +72,7 @@ void GLESDebugDraw::DrawPolygon(const b2Vec2* old_vertices, int vertexCount, con
7272
void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* old_vertices, int vertexCount, const b2Color& color)
7373
{
7474
mShaderProgram->use();
75-
mShaderProgram->setUniformForModelViewProjectionMatrix();
75+
mShaderProgram->setUniformsForBuiltins();
7676

7777
b2Vec2* vertices = new b2Vec2[vertexCount];
7878
for( int i=0;i<vertexCount;i++) {
@@ -99,7 +99,7 @@ void GLESDebugDraw::DrawSolidPolygon(const b2Vec2* old_vertices, int vertexCount
9999
void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Color& color)
100100
{
101101
mShaderProgram->use();
102-
mShaderProgram->setUniformForModelViewProjectionMatrix();
102+
mShaderProgram->setUniformsForBuiltins();
103103

104104
const float32 k_segments = 16.0f;
105105
int vertexCount=16;
@@ -130,7 +130,7 @@ void GLESDebugDraw::DrawCircle(const b2Vec2& center, float32 radius, const b2Col
130130
void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const b2Vec2& axis, const b2Color& color)
131131
{
132132
mShaderProgram->use();
133-
mShaderProgram->setUniformForModelViewProjectionMatrix();
133+
mShaderProgram->setUniformsForBuiltins();
134134

135135
const float32 k_segments = 16.0f;
136136
int vertexCount=16;
@@ -167,7 +167,7 @@ void GLESDebugDraw::DrawSolidCircle(const b2Vec2& center, float32 radius, const
167167
void GLESDebugDraw::DrawSegment(const b2Vec2& p1, const b2Vec2& p2, const b2Color& color)
168168
{
169169
mShaderProgram->use();
170-
mShaderProgram->setUniformForModelViewProjectionMatrix();
170+
mShaderProgram->setUniformsForBuiltins();
171171

172172
mShaderProgram->setUniformLocationWith4f(mColorLocation, color.r, color.g, color.b, 1);
173173

@@ -199,7 +199,7 @@ void GLESDebugDraw::DrawTransform(const b2Transform& xf)
199199
void GLESDebugDraw::DrawPoint(const b2Vec2& p, float32 size, const b2Color& color)
200200
{
201201
mShaderProgram->use();
202-
mShaderProgram->setUniformForModelViewProjectionMatrix();
202+
mShaderProgram->setUniformsForBuiltins();
203203

204204
mShaderProgram->setUniformLocationWith4f(mColorLocation, color.r, color.g, color.b, 1);
205205

@@ -229,7 +229,7 @@ void GLESDebugDraw::DrawString(int x, int y, const char *string, ...)
229229
void GLESDebugDraw::DrawAABB(b2AABB* aabb, const b2Color& color)
230230
{
231231
mShaderProgram->use();
232-
mShaderProgram->setUniformForModelViewProjectionMatrix();
232+
mShaderProgram->setUniformsForBuiltins();
233233

234234
mShaderProgram->setUniformLocationWith4f(mColorLocation, color.r, color.g, color.b, 1);
235235

0 commit comments

Comments
 (0)