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

issue #6: update CCConfiguration.cpp, CCDrawingPrimitives.cpp

This commit is contained in:
Ming 2010-07-06 09:54:36 +00:00
parent 69eefc5363
commit c04225ab4b
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos2dx/CCConfiguration.cpp
View File

@ -59,5 +59,13 @@ CCConfiguration* CCConfiguration::sharedConfiguration(void)
BOOL CCConfiguration::checkForGLExtension(const string &searchName) BOOL CCConfiguration::checkForGLExtension(const string &searchName)
{ {
BOOL ret = FALSE;
const char *pszSearchName = searchName.c_str();
if (strstr(g_pGlExtensions, pszSearchName))
ret = TRUE;
delete pszSearchName;
return ret;
} }

9
cocos2dx/CCDrawingPrimitives.cpp
View File

@ -1,5 +1,6 @@
#include "CCDrawingPrimitives.h" #include "CCDrawingPrimitives.h"
#define _USE_MATH_DEFINES
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -101,7 +102,7 @@ void ccDrawCircle(CGPoint center, float r, float a, int segs, BOOL drawLineToCen
const float coef = 2.0f * (float)M_PI/segs; const float coef = 2.0f * (float)M_PI/segs;
float *vertices = malloc( sizeof(float)*2*(segs+2)); float *vertices = (float *)malloc( sizeof(float)*2*(segs+2));
if( ! vertices ) if( ! vertices )
{ {
return; return;
@ -141,7 +142,7 @@ void ccDrawCircle(CGPoint center, float r, float a, int segs, BOOL drawLineToCen
void ccDrawQuadBezier(CGPoint origin, CGPoint control, CGPoint destination, int segments) void ccDrawQuadBezier(CGPoint origin, CGPoint control, CGPoint destination, int segments)
{ {
CGPoint vertices[segments + 1]; CGPoint *vertices = new CGPoint[segments + 1];
float t = 0.0f; float t = 0.0f;
for(int i = 0; i < segments; i++) for(int i = 0; i < segments; i++)
@ -162,6 +163,7 @@ void ccDrawQuadBezier(CGPoint origin, CGPoint control, CGPoint destination, int
glVertexPointer(2, GL_FLOAT, 0, vertices); glVertexPointer(2, GL_FLOAT, 0, vertices);
glDrawArrays(GL_LINE_STRIP, 0, segments + 1); glDrawArrays(GL_LINE_STRIP, 0, segments + 1);
delete[] vertices;
// restore default state // restore default state
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);
@ -171,7 +173,7 @@ void ccDrawQuadBezier(CGPoint origin, CGPoint control, CGPoint destination, int
void ccDrawCubicBezier(CGPoint origin, CGPoint control1, CGPoint control2, CGPoint destination, int segments) void ccDrawCubicBezier(CGPoint origin, CGPoint control1, CGPoint control2, CGPoint destination, int segments)
{ {
CGPoint vertices[segments + 1]; CGPoint *vertices = new CGPoint[segments + 1];
float t = 0; float t = 0;
for(int i = 0; i < segments; ++i) for(int i = 0; i < segments; ++i)
@ -192,6 +194,7 @@ void ccDrawCubicBezier(CGPoint origin, CGPoint control1, CGPoint control2, CGPoi
glVertexPointer(2, GL_FLOAT, 0, vertices); glVertexPointer(2, GL_FLOAT, 0, vertices);
glDrawArrays(GL_LINE_STRIP, 0, segments + 1); glDrawArrays(GL_LINE_STRIP, 0, segments + 1);
delete[] vertices;
// restore default state // restore default state
glEnableClientState(GL_COLOR_ARRAY); glEnableClientState(GL_COLOR_ARRAY);