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

Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.

This commit is contained in:
James Chen 2013-07-21 19:10:22 +08:00
parent 89d210bdb3
commit 50c280fb9d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/textures/CCTextureAtlas.cpp
View File

@ -660,7 +660,7 @@ void TextureAtlas::drawNumberOfQuads(int numberOfQuads, int start)
// XXX: update is done in draw... perhaps it should be done in a timer // XXX: update is done in draw... perhaps it should be done in a timer
if (_dirty) if (_dirty)
{ {
glBufferSubData(GL_ARRAY_BUFFER, sizeof(_quads[0])*start, sizeof(_quads[0]) * n , &_quads[start] ); glBufferSubData(GL_ARRAY_BUFFER, sizeof(_quads[0])*start, sizeof(_quads[0]) * numberOfQuads , &_quads[start] );
_dirty = false; _dirty = false;
} }
@ -678,9 +678,9 @@ void TextureAtlas::drawNumberOfQuads(int numberOfQuads, int start)
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _buffersVBO[1]);
#if CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP #if CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP
glDrawElements(GL_TRIANGLE_STRIP, (GLsizei)n*6, GL_UNSIGNED_SHORT, (GLvoid*) (start*6*sizeof(_indices[0]))); glDrawElements(GL_TRIANGLE_STRIP, (GLsizei)numberOfQuads*6, GL_UNSIGNED_SHORT, (GLvoid*) (start*6*sizeof(_indices[0])));
#else #else
glDrawElements(GL_TRIANGLES, (GLsizei)n*6, GL_UNSIGNED_SHORT, (GLvoid*) (start*6*sizeof(_indices[0]))); glDrawElements(GL_TRIANGLES, (GLsizei)numberOfQuads*6, GL_UNSIGNED_SHORT, (GLvoid*) (start*6*sizeof(_indices[0])));
#endif // CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP #endif // CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP
glBindBuffer(GL_ARRAY_BUFFER, 0); glBindBuffer(GL_ARRAY_BUFFER, 0);

1
scripting/javascript/bindings/ScriptingCore.h
View File

@ -10,6 +10,7 @@
#define __SCRIPTING_CORE_H__ #define __SCRIPTING_CORE_H__
#include <assert.h> #include <assert.h>
#include <memory>
#include "cocos2d.h" #include "cocos2d.h"
#include "js_bindings_config.h" #include "js_bindings_config.h"
#include "js_bindings_core.h" #include "js_bindings_core.h"