diff --git a/native/build/cocos2d_libs.xcodeproj/project.pbxproj b/native/build/cocos2d_libs.xcodeproj/project.pbxproj index b83c15f621..6c432d9d67 100644 --- a/native/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/native/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -7,6 +7,10 @@ objects = { /* Begin PBXBuildFile section */ + 1A14FD912080B4E300E10ABE /* CCGLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A14FD8F2080B4E300E10ABE /* CCGLUtils.cpp */; }; + 1A14FD922080B4E300E10ABE /* CCGLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A14FD8F2080B4E300E10ABE /* CCGLUtils.cpp */; }; + 1A14FD932080B4E300E10ABE /* CCGLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A14FD902080B4E300E10ABE /* CCGLUtils.h */; }; + 1A14FD942080B4E300E10ABE /* CCGLUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A14FD902080B4E300E10ABE /* CCGLUtils.h */; }; 1A28FF4D1F20AFAB007A1D9D /* SRDelegateController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A28FF1F1F20AFAB007A1D9D /* SRDelegateController.h */; }; 1A28FF4E1F20AFAB007A1D9D /* SRDelegateController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A28FF1F1F20AFAB007A1D9D /* SRDelegateController.h */; }; 1A28FF4F1F20AFAB007A1D9D /* SRDelegateController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A28FF201F20AFAB007A1D9D /* SRDelegateController.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; }; @@ -1016,6 +1020,8 @@ /* Begin PBXFileReference section */ 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 1A14FD8F2080B4E300E10ABE /* CCGLUtils.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLUtils.cpp; sourceTree = ""; }; + 1A14FD902080B4E300E10ABE /* CCGLUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGLUtils.h; sourceTree = ""; }; 1A28FF1F1F20AFAB007A1D9D /* SRDelegateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRDelegateController.h; sourceTree = ""; }; 1A28FF201F20AFAB007A1D9D /* SRDelegateController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRDelegateController.m; sourceTree = ""; }; 1A28FF221F20AFAB007A1D9D /* SRIOConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRIOConsumer.h; sourceTree = ""; }; @@ -2264,6 +2270,8 @@ 46FDDB43202ADDCE00931238 /* CCValue.cpp */, 46FDDB44202ADDCE00931238 /* firePngData.h */, 46FDDB45202ADDCE00931238 /* ccCArray.h */, + 1A14FD8F2080B4E300E10ABE /* CCGLUtils.cpp */, + 1A14FD902080B4E300E10ABE /* CCGLUtils.h */, ); name = base; path = ../cocos/base; @@ -2981,6 +2989,7 @@ 1A28FF7D1F20AFAB007A1D9D /* SRMutex.h in Headers */, 1A28FF711F20AFAB007A1D9D /* SRHash.h in Headers */, 469301CF203FC696004A3D6C /* CCConfiguration.h in Headers */, + 1A14FD932080B4E300E10ABE /* CCGLUtils.h in Headers */, 50ABC0171926664800A911A9 /* CCImage.h in Headers */, ED30577F1BEC76C90083C3ED /* ioapi_mem.h in Headers */, 4617864B20522469008256E1 /* HttpCookie.h in Headers */, @@ -3209,6 +3218,7 @@ 46FDDC30202AEAC500931238 /* Assertions.h in Headers */, 4617862620522469008256E1 /* CCDownloader.h in Headers */, 46FDDBD2202ADDCE00931238 /* ccUTF8.h in Headers */, + 1A14FD942080B4E300E10ABE /* CCGLUtils.h in Headers */, 46FDDC2A202AEAC500931238 /* Casting.h in Headers */, 50ABBD5F1925AB0000A911A9 /* Vec3.h in Headers */, 46FDDC02202ADDCE00931238 /* ccCArray.h in Headers */, @@ -3395,6 +3405,7 @@ BA68D78D1D62F4A500B7A3F9 /* sweep.cc in Sources */, 4693042E2046AE06004A3D6C /* jsb_helper.cpp in Sources */, 1A52DB31205BCD9200350EE3 /* inspector_agent.cc in Sources */, + 1A14FD912080B4E300E10ABE /* CCGLUtils.cpp in Sources */, 469303A02046AE05004A3D6C /* ScriptEngine.mm in Sources */, 46FDDAB5202ACC6A00931238 /* Program.cpp in Sources */, 46FDDBF9202ADDCE00931238 /* etc1.cpp in Sources */, @@ -3646,6 +3657,7 @@ 469304092046AE06004A3D6C /* jsb_global.cpp in Sources */, 46FDDA70202ACC6A00931238 /* Pass.cpp in Sources */, 1A52DB7A205BCDD000350EE3 /* ScriptEngine.cpp in Sources */, + 1A14FD922080B4E300E10ABE /* CCGLUtils.cpp in Sources */, 46FDDBBA202ADDCE00931238 /* CCNS.cpp in Sources */, 1A28FF741F20AFAB007A1D9D /* SRHash.m in Sources */, 46FDDB70202ADDCE00931238 /* ZipUtils.cpp in Sources */, @@ -3883,6 +3895,7 @@ "\"$(SRCROOT)/../external/mac/libs\"", ); MACH_O_TYPE = staticlib; + OTHER_CFLAGS = "-DCC_NEW_RENDERER"; OTHER_LDFLAGS = "-llibsql3"; USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/mac/include $(SRCROOT)/../external/sources $(SRCROOT)/../external/mac/include/freetype $(SRCROOT)/../external/mac/include/spidermonkey $(SRCROOT)/../external/mac/include/chakracore $(SRCROOT)/../external/mac/include/v8"; }; @@ -3932,6 +3945,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 8.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../external/ios/libs\""; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-DCC_NEW_RENDERER"; OTHER_LDFLAGS = "-llibsql3"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/native/cocos/Android.mk b/native/cocos/Android.mk index cff9bb4c6c..77290a0b1e 100644 --- a/native/cocos/Android.mk +++ b/native/cocos/Android.mk @@ -51,6 +51,7 @@ base/pvr.cpp \ base/CCLog.cpp \ base/CCScheduler.cpp \ base/csscolorparser.cpp \ +base/CCGLUtils.cpp \ renderer/Types.cpp \ renderer/gfx/DeviceGraphics.cpp \ renderer/gfx/FrameBuffer.cpp \ diff --git a/native/cocos/base/CCGLUtils.cpp b/native/cocos/base/CCGLUtils.cpp new file mode 100644 index 0000000000..928b0c459a --- /dev/null +++ b/native/cocos/base/CCGLUtils.cpp @@ -0,0 +1,174 @@ +/**************************************************************************** + Copyright (c) 2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#include "CCGLUtils.h" +#include + +NS_CC_BEGIN + +//FIXME: Consider to use variable to enable/disable cache state since using macro will not be able to close it if there're serious bugs. +// #undef CC_ENABLE_GL_STATE_CACHE +// #define CC_ENABLE_GL_STATE_CACHE 0 + +#if CC_ENABLE_GL_STATE_CACHE + +namespace { + const int MAX_ACTIVE_TEXTURE = 16; + GLuint __currentArrayBufferId = -1; + GLuint __currentElementArrayBufferId = -1; + GLuint __activeTextureUnit = 0; + GLuint __currentBoundTexture[MAX_ACTIVE_TEXTURE] = { + (GLuint)-1,(GLuint)-1,(GLuint)-1,(GLuint)-1, + (GLuint)-1,(GLuint)-1,(GLuint)-1,(GLuint)-1, + (GLuint)-1,(GLuint)-1,(GLuint)-1,(GLuint)-1, + (GLuint)-1,(GLuint)-1,(GLuint)-1,(GLuint)-1 + }; +} + +#endif // CC_ENABLE_GL_STATE_CACHE + +//FIXME: need to consider invoking this after restarting game. +void ccInvalidateStateCache() +{ +#if CC_ENABLE_GL_STATE_CACHE + __currentArrayBufferId = -1; + __currentElementArrayBufferId = -1; + __activeTextureUnit = 0; + for (int i = 0; i < MAX_ACTIVE_TEXTURE; ++i) + { + __currentBoundTexture[i] = -1; + }; +#endif +} + +void ccBindBuffer(GLenum target, GLuint buffer) +{ +#if CC_ENABLE_GL_STATE_CACHE + if (target == GL_ARRAY_BUFFER) + { + if (buffer == 0) + return; + if (__currentArrayBufferId != buffer) + { + __currentArrayBufferId = buffer; + glBindBuffer(target, buffer); + } +// else +// { +// printf("glBindBuffer(GL_ARRAY_BUFFER, %u) isn't needed!\n", buffer); +// } + } + else if (target == GL_ELEMENT_ARRAY_BUFFER) + { + if (buffer == 0) + return; + if (__currentElementArrayBufferId != buffer) + { + __currentElementArrayBufferId = buffer; + glBindBuffer(target, buffer); + } +// else +// { +// printf("glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, %u) isn't needed!\n", buffer); +// } + } + else + { + glBindBuffer(target, buffer); + } +#else + glBindBuffer(target, buffer); +#endif +} + +void ccDeleteBuffers(GLsizei n, const GLuint *buffers) +{ +#if CC_ENABLE_GL_STATE_CACHE + for (GLsizei i = 0; i < n; ++i) + { + if (buffers[i] == __currentArrayBufferId) + __currentArrayBufferId = -1; + else if (buffers[i] == __currentElementArrayBufferId) + __currentElementArrayBufferId = -1; + } +#endif + glDeleteBuffers(n, buffers); +} + +void ccActiveTexture(GLenum texture) +{ +#if CC_ENABLE_GL_STATE_CACHE + GLuint newTextureUnit = texture - GL_TEXTURE0; + if (__activeTextureUnit != newTextureUnit) + { + __activeTextureUnit = newTextureUnit; + glActiveTexture(texture); + } +#else + glActiveTexture(texture); +#endif +} + +void ccBindTexture(GLenum target, GLuint texture) +{ +#if CC_ENABLE_GL_STATE_CACHE + if (target == GL_TEXTURE_2D) + { + CCASSERT(__activeTextureUnit < MAX_ACTIVE_TEXTURE, "textureUnit is too big"); + if (__currentBoundTexture[__activeTextureUnit] != texture) + { + __currentBoundTexture[__activeTextureUnit] = texture; + glBindTexture(target, texture); + } +// else +// { +// printf("glBindTexture(GL_TEXTURE_2D, %u) isn't needed!\n", texture); +// } + } + else + { + glBindTexture(target, texture); + } +#else + glBindTexture(target, texture); +#endif +} + +void ccDeleteTextures(GLsizei n, const GLuint *textures) +{ +#if CC_ENABLE_GL_STATE_CACHE + for (size_t i = 0; i < MAX_ACTIVE_TEXTURE; ++i) + { + for (GLsizei j = 0; j < n; ++j) + { + if (__currentBoundTexture[i] == textures[j]) + __currentBoundTexture[i] = -1; + } + } +#endif // CC_ENABLE_GL_STATE_CACHE + + glDeleteTextures(n, textures); +} + +NS_CC_END diff --git a/native/cocos/base/CCGLUtils.h b/native/cocos/base/CCGLUtils.h new file mode 100644 index 0000000000..54772f2574 --- /dev/null +++ b/native/cocos/base/CCGLUtils.h @@ -0,0 +1,41 @@ +/**************************************************************************** + Copyright (c) 2018 Xiamen Yaji Software Co., Ltd. + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + ****************************************************************************/ + +#pragma once + +#include "base/ccMacros.h" +#include "platform/CCGL.h" + +NS_CC_BEGIN + +void ccInvalidateStateCache(); + +void ccBindBuffer(GLenum target, GLuint buffer); +void ccDeleteBuffers(GLsizei n, const GLuint *buffers); + +void ccActiveTexture(GLenum texture); +void ccBindTexture(GLenum target, GLuint texture); +void ccDeleteTextures(GLsizei n, const GLuint *textures); + +NS_CC_END diff --git a/native/cocos/math/CCGeometry.h b/native/cocos/math/CCGeometry.h index 4fc12c046f..2ca95ed389 100644 --- a/native/cocos/math/CCGeometry.h +++ b/native/cocos/math/CCGeometry.h @@ -27,7 +27,6 @@ THE SOFTWARE. #ifndef __MATH_CCGEOMETRY_H__ #define __MATH_CCGEOMETRY_H__ -#include "base/ccMacros.h" #include "base/ccMacros.h" #include "math/CCMath.h" diff --git a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp index 792cbfe4d2..f204daae01 100644 --- a/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp +++ b/native/cocos/platform/android/CCCanvasRenderingContext2D-android.cpp @@ -42,6 +42,7 @@ public: if (w < 1.0f || h < 1.0f) return; JniHelper::callObjectVoidMethod(_obj, _className, "recreateBuffer", w, h); + fillData(); } void clearRect(float x, float y, float w, float h) @@ -170,7 +171,7 @@ CanvasRenderingContext2D::CanvasRenderingContext2D(float width, float height) { SE_LOGD("CanvasRenderingContext2D constructor: %p, width: %f, height: %f\n", this, width, height); _impl = new CanvasRenderingContext2DImpl(); - _impl->recreateBuffer(width, height); + recreateBuffer(); } CanvasRenderingContext2D::~CanvasRenderingContext2D() @@ -183,6 +184,8 @@ void CanvasRenderingContext2D::recreateBuffer() { _isBufferSizeDirty = false; _impl->recreateBuffer(__width, __height); + if (_canvasBufferUpdatedCB != nullptr) + _canvasBufferUpdatedCB(_impl->getDataRef()); } void CanvasRenderingContext2D::clearRect(float x, float y, float width, float height) @@ -196,9 +199,7 @@ void CanvasRenderingContext2D::fillRect(float x, float y, float width, float hei _impl->fillRect(x, y, width, height); if (_canvasBufferUpdatedCB != nullptr) - { _canvasBufferUpdatedCB(_impl->getDataRef()); - } } void CanvasRenderingContext2D::fillText(const std::string& text, float x, float y, float maxWidth) diff --git a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java index cc948d1434..7d1934f35d 100644 --- a/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java +++ b/native/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java @@ -26,6 +26,7 @@ THE SOFTWARE. package org.cocos2dx.lib; import android.opengl.GLSurfaceView; +import android.util.Log; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; @@ -113,6 +114,8 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { * since onDrawFrame() was called by system 60 times per second by default. */ if (sAnimationInterval <= 1.0 / 60 * Cocos2dxRenderer.NANOSECONDSPERSECOND) { + + Cocos2dxRenderer.nativeRender(); } else { final long now = System.nanoTime(); diff --git a/native/cocos/platform/android/jni/JniImp.cpp b/native/cocos/platform/android/jni/JniImp.cpp index e889e247ed..505ef2188c 100644 --- a/native/cocos/platform/android/jni/JniImp.cpp +++ b/native/cocos/platform/android/jni/JniImp.cpp @@ -36,6 +36,7 @@ #include "base/CCScheduler.h" #include "base/CCAutoreleasePool.h" #include "audio/include/AudioEngine.h" +#include "base/CCGLUtils.h" #define JNI_IMP_LOG_TAG "JniImp" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,JNI_IMP_LOG_TAG,__VA_ARGS__) @@ -131,6 +132,7 @@ extern "C" JNIEXPORT void Java_org_cocos2dx_lib_Cocos2dxRenderer_nativeInit(JNIEnv* env, jobject thiz, jint w, jint h, jstring jDefaultResourcePath) { g_isGameFinished = false; + ccInvalidateStateCache(); std::string defaultResourcePath = JniHelper::jstring2string(jDefaultResourcePath); LOGD("CocosRenderer.nativeInit: %d, %d, %s", w, h, defaultResourcePath.c_str()); g_width = w; diff --git a/native/cocos/platform/ios/CCApplication-ios.mm b/native/cocos/platform/ios/CCApplication-ios.mm index 9044f44c23..86205170c5 100644 --- a/native/cocos/platform/ios/CCApplication-ios.mm +++ b/native/cocos/platform/ios/CCApplication-ios.mm @@ -24,13 +24,16 @@ ****************************************************************************/ #import "CCApplication.h" -#import -#import "base/CCScheduler.h" + +#include "base/CCScheduler.h" #include "base/CCAutoreleasePool.h" +#include "base/CCGLUtils.h" +#include "renderer/gfx/DeviceGraphics.h" +#include "scripting/js-bindings/jswrapper/jsc/ScriptEngine.hpp" +#include "scripting/js-bindings/event/EventDispatcher.h" + #import "CCEAGLView-ios.h" -#import "renderer/gfx/DeviceGraphics.h" -#import "scripting/js-bindings/jswrapper/jsc/ScriptEngine.hpp" -#import "scripting/js-bindings/event/EventDispatcher.h" +#import namespace { @@ -118,6 +121,7 @@ namespace -(void) firstStart:(id) view { if ([view isReady]) { + cocos2d::ccInvalidateStateCache(); se::ScriptEngine* se = se::ScriptEngine::getInstance(); se->addRegisterCallback(setCanvasCallback); @@ -187,9 +191,6 @@ Application::Application(const std::string& name) createView(name); - //TODO: Runtime doesn't need renderer stuff temporarily. - // renderer::DeviceGraphics::getInstance(); - se::ScriptEngine::getInstance(); EventDispatcher::init(); diff --git a/native/cocos/platform/ios/CCCanvasRenderingContext2D-ios.mm b/native/cocos/platform/ios/CCCanvasRenderingContext2D-ios.mm index cae9984620..305b49384e 100644 --- a/native/cocos/platform/ios/CCCanvasRenderingContext2D-ios.mm +++ b/native/cocos/platform/ios/CCCanvasRenderingContext2D-ios.mm @@ -25,8 +25,8 @@ enum class CanvasTextBaseline { namespace { void fillRectWithColor(uint8_t* buf, uint32_t totalWidth, uint32_t totalHeight, uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint8_t r, uint8_t g, uint8_t b) { - assert(x + width <= totalWidth); - assert(y + height <= totalHeight); + if ((x + width) > totalWidth || (y + height) > totalHeight) + return; uint32_t y0 = totalHeight - (y + height); uint32_t y1 = totalHeight - y; @@ -198,7 +198,7 @@ namespace { -(CGPoint) convertDrawPoint:(CGPoint) point text:(NSString*) text { CGSize textSize = [self measureText:text]; - NSLog(@"textSize: %f, %f", textSize.width, textSize.height); +// NSLog(@"textSize: %f, %f", textSize.width, textSize.height); if (_textAlign == CanvasTextAlign::CENTER) { @@ -285,7 +285,7 @@ namespace { if (rect.size.width < 1 || rect.size.height < 1) return; //TODO: - assert(rect.origin.x == 0 && rect.origin.y == 0); +// assert(rect.origin.x == 0 && rect.origin.y == 0); memset((void*)_imageData.getBytes(), 0x00, _imageData.getSize()); } @@ -325,14 +325,14 @@ CanvasRenderingContext2D::CanvasRenderingContext2D(float width, float height) : __width(width) , __height(height) { - SE_LOGD("CanvasRenderingContext2D constructor: %p, width: %f, height: %f\n", this, width, height); +// SE_LOGD("CanvasRenderingContext2D constructor: %p, width: %f, height: %f\n", this, width, height); _impl = [[CanvasRenderingContext2DImpl alloc] init]; [_impl recreateBufferWithWidth:width height:height]; } CanvasRenderingContext2D::~CanvasRenderingContext2D() { - SE_LOGD("CanvasRenderingContext2D destructor: %p\n", this); +// SE_LOGD("CanvasRenderingContext2D destructor: %p\n", this); [_impl release]; } @@ -340,11 +340,13 @@ void CanvasRenderingContext2D::recreateBuffer() { _isBufferSizeDirty = false; [_impl recreateBufferWithWidth: __width height:__height]; + if (_canvasBufferUpdatedCB != nullptr) + _canvasBufferUpdatedCB([_impl getDataRef]); } void CanvasRenderingContext2D::clearRect(float x, float y, float width, float height) { - SE_LOGD("CanvasGradient::clearRect: %p, %f, %f, %f, %f\n", this, x, y, width, height); +// SE_LOGD("CanvasGradient::clearRect: %p, %f, %f, %f, %f\n", this, x, y, width, height); [_impl clearRect:CGRectMake(x, y, width, height)]; } @@ -360,7 +362,7 @@ void CanvasRenderingContext2D::fillRect(float x, float y, float width, float hei void CanvasRenderingContext2D::fillText(const std::string& text, float x, float y, float maxWidth) { - SE_LOGD("CanvasRenderingContext2D::fillText: %s, %f, %f, %f\n", text.c_str(), x, y, maxWidth); +// SE_LOGD("CanvasRenderingContext2D::fillText: %s, %f, %f, %f\n", text.c_str(), x, y, maxWidth); if (text.empty()) return; if (_isBufferSizeDirty) @@ -373,7 +375,7 @@ void CanvasRenderingContext2D::fillText(const std::string& text, float x, float void CanvasRenderingContext2D::strokeText(const std::string& text, float x, float y, float maxWidth) { - SE_LOGD("CanvasRenderingContext2D::strokeText: %s, %f, %f, %f\n", text.c_str(), x, y, maxWidth); +// SE_LOGD("CanvasRenderingContext2D::strokeText: %s, %f, %f, %f\n", text.c_str(), x, y, maxWidth); if (text.empty()) return; if (_isBufferSizeDirty) @@ -385,7 +387,7 @@ void CanvasRenderingContext2D::strokeText(const std::string& text, float x, floa cocos2d::Size CanvasRenderingContext2D::measureText(const std::string& text) { - SE_LOGD("CanvasRenderingContext2D::measureText: %s\n", text.c_str()); +// SE_LOGD("CanvasRenderingContext2D::measureText: %s\n", text.c_str()); CGSize size = [_impl measureText: [NSString stringWithUTF8String:text.c_str()]]; return cocos2d::Size(size.width, size.height); } @@ -437,7 +439,7 @@ void CanvasRenderingContext2D::setCanvasBufferUpdatedCallback(const CanvasBuffer void CanvasRenderingContext2D::set__width(float width) { - SE_LOGD("CanvasRenderingContext2D::set__width: %f\n", width); +// SE_LOGD("CanvasRenderingContext2D::set__width: %f\n", width); __width = width; _isBufferSizeDirty = true; recreateBuffer(); @@ -445,7 +447,7 @@ void CanvasRenderingContext2D::set__width(float width) void CanvasRenderingContext2D::set__height(float height) { - SE_LOGD("CanvasRenderingContext2D::set__height: %f\n", height); +// SE_LOGD("CanvasRenderingContext2D::set__height: %f\n", height); __height = height; _isBufferSizeDirty = true; recreateBuffer(); @@ -488,7 +490,7 @@ void CanvasRenderingContext2D::set_font(const std::string& font) void CanvasRenderingContext2D::set_textAlign(const std::string& textAlign) { - SE_LOGD("CanvasRenderingContext2D::set_textAlign: %s\n", textAlign.c_str()); +// SE_LOGD("CanvasRenderingContext2D::set_textAlign: %s\n", textAlign.c_str()); if (textAlign == "left") { _impl.textAlign = CanvasTextAlign::LEFT; @@ -509,7 +511,7 @@ void CanvasRenderingContext2D::set_textAlign(const std::string& textAlign) void CanvasRenderingContext2D::set_textBaseline(const std::string& textBaseline) { - SE_LOGD("CanvasRenderingContext2D::set_textBaseline: %s\n", textBaseline.c_str()); +// SE_LOGD("CanvasRenderingContext2D::set_textBaseline: %s\n", textBaseline.c_str()); if (textBaseline == "top") { _impl.textBaseLine = CanvasTextBaseline::TOP; @@ -532,7 +534,7 @@ void CanvasRenderingContext2D::set_fillStyle(const std::string& fillStyle) { CSSColorParser::Color color = CSSColorParser::parse(fillStyle); [_impl setFillStyleWithRed:color.r/255.0f green:color.g/255.0f blue:color.b/255.0f alpha:color.a]; - SE_LOGD("CanvasRenderingContext2D::set_fillStyle: %s, (%d, %d, %d, %f)\n", fillStyle.c_str(), color.r, color.g, color.b, color.a); +// SE_LOGD("CanvasRenderingContext2D::set_fillStyle: %s, (%d, %d, %d, %f)\n", fillStyle.c_str(), color.r, color.g, color.b, color.a); } void CanvasRenderingContext2D::set_strokeStyle(const std::string& strokeStyle) diff --git a/native/cocos/platform/mac/CCApplication-mac.mm b/native/cocos/platform/mac/CCApplication-mac.mm index 2d8790db4a..eddb524910 100644 --- a/native/cocos/platform/mac/CCApplication-mac.mm +++ b/native/cocos/platform/mac/CCApplication-mac.mm @@ -30,6 +30,7 @@ THE SOFTWARE. #include "base/CCScheduler.h" #include "base/CCAutoreleasePool.h" +#include "base/CCGLUtils.h" #import "platform/CCApplication.h" #import "platform/desktop/CCGLView-desktop.h" #import "scripting/js-bindings/event/EventDispatcher.h" @@ -67,9 +68,8 @@ Application::Application(const std::string& name) _scheduler = new Scheduler(); createView(name); - - //TODO: Runtime doesn't need renderer stuff temporarily. -// renderer::DeviceGraphics::getInstance()->setScaleFactor(CAST_VIEW(_view)->getScaleFactor()); + + renderer::DeviceGraphics::setScaleFactor(CAST_VIEW(_view)->getScaleFactor()); EventDispatcher::init(); se::ScriptEngine::getInstance(); } @@ -91,6 +91,8 @@ Application::~Application() void Application::start() { + ccInvalidateStateCache(); + se::ScriptEngine* se = se::ScriptEngine::getInstance(); se->addRegisterCallback(setCanvasCallback); @@ -207,8 +209,8 @@ void Application::onCreateView(int&x, int& y, int& width, int& height, PixelForm { x = 0; y = 0; - width = 960; - height = 640; + width = 640; + height = 960; pixelformat = PixelFormat::RGBA8; depthFormat = DepthFormat::DEPTH24_STENCIL8; diff --git a/native/cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm b/native/cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm index f0c6f3870b..ac918acdcc 100644 --- a/native/cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm +++ b/native/cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm @@ -147,6 +147,7 @@ namespace { -(void) recreateBufferWithWidth:(NSInteger) width height:(NSInteger) height { self.image = [[[NSImage alloc] initWithSize:NSMakeSize(width, height)] autorelease]; + [self clear]; } -(NSSize) measureText:(NSString*) text { @@ -276,9 +277,9 @@ namespace { if (rect.size.width < 1 || rect.size.height < 1) return; //TODO: - assert(rect.origin.x == 0 && rect.origin.y == 0); +// assert(rect.origin.x == 0 && rect.origin.y == 0); // NSLog(@"clearRect, image:%f, %f", _image.size.width, _image.size.height); - assert(rect.size.width <= _image.size.width && rect.size.height <= _image.size.height); +// assert(rect.size.width <= _image.size.width && rect.size.height <= _image.size.height); [_image lockFocus]; [[NSColor clearColor] set]; @@ -304,6 +305,17 @@ namespace { } } +-(void) clear { + NSUInteger textureSize = _image.size.width * _image.size.height * 4; + uint8_t* buffer = nullptr; + buffer = (uint8_t*)malloc(sizeof(uint8_t) * textureSize); + if (buffer) + { + memset(buffer, 0x00, textureSize); + _imageData.fastSet(buffer, textureSize); + } +} + @end NS_CC_BEGIN @@ -344,6 +356,8 @@ void CanvasRenderingContext2D::recreateBuffer() { _isBufferSizeDirty = false; [_impl recreateBufferWithWidth: __width height:__height]; + if (_canvasBufferUpdatedCB != nullptr) + _canvasBufferUpdatedCB([_impl getDataRef]); } void CanvasRenderingContext2D::clearRect(float x, float y, float width, float height) @@ -364,7 +378,7 @@ void CanvasRenderingContext2D::fillRect(float x, float y, float width, float hei void CanvasRenderingContext2D::fillText(const std::string& text, float x, float y, float maxWidth) { -// SE_LOGD("CanvasRenderingContext2D::fillText: %s, %f, %f, %f\n", text.c_str(), x, y, maxWidth); + SE_LOGD("CanvasRenderingContext2D(%p)::fillText: %s, %f, %f, %f\n", this, text.c_str(), x, y, maxWidth); if (text.empty()) return; if (_isBufferSizeDirty) diff --git a/native/cocos/renderer/gfx/DeviceGraphics.cpp b/native/cocos/renderer/gfx/DeviceGraphics.cpp index 49c2fd4af8..8298427352 100644 --- a/native/cocos/renderer/gfx/DeviceGraphics.cpp +++ b/native/cocos/renderer/gfx/DeviceGraphics.cpp @@ -33,6 +33,7 @@ #include "GFXUtils.h" #include "platform/CCPlatformConfig.h" +#include "base/CCGLUtils.h" RENDERER_BEGIN @@ -54,6 +55,8 @@ namespace } } // namespace { +int DeviceGraphics::_scaleFactor = 1.0f; + DeviceGraphics* DeviceGraphics::getInstance() { static DeviceGraphics* __instance = nullptr; @@ -393,7 +396,7 @@ void DeviceGraphics::draw(size_t base, GLsizei count) auto nextIndexBuffer = _nextState.getIndexBuffer(); if (_currentState.getIndexBuffer() != nextIndexBuffer) { - GL_CHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, nextIndexBuffer ? nextIndexBuffer->getHandle() : 0)); + GL_CHECK(ccBindBuffer(GL_ELEMENT_ARRAY_BUFFER, nextIndexBuffer ? nextIndexBuffer->getHandle() : 0)); } //commit program @@ -652,18 +655,18 @@ void DeviceGraphics::restoreTexture(uint32_t index) auto texture = _currentState.getTexture(index); if (texture) { - GL_CHECK(glBindTexture(texture->getTarget(), texture->getHandle())); + GL_CHECK(ccBindTexture(texture->getTarget(), texture->getHandle())); } else { - GL_CHECK(glBindTexture(GL_TEXTURE_2D, 0)); + GL_CHECK(ccBindTexture(GL_TEXTURE_2D, 0)); } } void DeviceGraphics::restoreIndexBuffer() { auto ib = _currentState.getIndexBuffer(); - GL_CHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib ? ib->getHandle(): 0)); + GL_CHECK(ccBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib ? ib->getHandle(): 0)); } void DeviceGraphics::commitBlendStates() @@ -1033,7 +1036,7 @@ void DeviceGraphics::commitVertexBuffer() if (!vb) continue; - GL_CHECK(glBindBuffer(GL_ARRAY_BUFFER, vb->getHandle())); + GL_CHECK(ccBindBuffer(GL_ARRAY_BUFFER, vb->getHandle())); auto vboffset = _nextState.getVertexBufferOffset(i); const auto& attributes = _nextState.getProgram()->getAttributes(); @@ -1090,8 +1093,8 @@ void DeviceGraphics::commitTextures() auto texture = nextTextureUnits[i]; if (texture) { - GL_CHECK(glActiveTexture(GL_TEXTURE0 + i)); - GL_CHECK(glBindTexture(texture->getTarget(), + GL_CHECK(ccActiveTexture(GL_TEXTURE0 + i)); + GL_CHECK(ccBindTexture(texture->getTarget(), texture->getHandle())); } } diff --git a/native/cocos/renderer/gfx/DeviceGraphics.h b/native/cocos/renderer/gfx/DeviceGraphics.h index bc7888088e..869511c121 100644 --- a/native/cocos/renderer/gfx/DeviceGraphics.h +++ b/native/cocos/renderer/gfx/DeviceGraphics.h @@ -62,7 +62,7 @@ public: static DeviceGraphics* getInstance(); - void setScaleFactor(float value); + static void setScaleFactor(float value); inline const Capacity& getCapacity() const { return _caps; } bool supportGLExtension(const std::string& extension) const; @@ -162,7 +162,9 @@ private: inline void commitCullMode(); inline void commitVertexBuffer(); inline void commitTextures(); - + + static int _scaleFactor; + int _vx; int _vy; int _vw; @@ -172,9 +174,7 @@ private: int _sy; int _sw; int _sh; - - int _scaleFactor = 1.f; - + int _defaultFbo; Capacity _caps; diff --git a/native/cocos/renderer/gfx/FrameBuffer.cpp b/native/cocos/renderer/gfx/FrameBuffer.cpp index 97a084cca3..9d1edc12ef 100644 --- a/native/cocos/renderer/gfx/FrameBuffer.cpp +++ b/native/cocos/renderer/gfx/FrameBuffer.cpp @@ -24,6 +24,7 @@ #include "FrameBuffer.h" #include "RenderTarget.h" +#include "base/CCGLUtils.h" RENDERER_BEGIN @@ -51,7 +52,7 @@ FrameBuffer::~FrameBuffer() return; } - glDeleteBuffers(1, &_glID); + ccDeleteBuffers(1, &_glID); //TODO: _device._stats.ib -= _bytes; } diff --git a/native/cocos/renderer/gfx/IndexBuffer.cpp b/native/cocos/renderer/gfx/IndexBuffer.cpp index a27237bdc2..ebe966dc17 100644 --- a/native/cocos/renderer/gfx/IndexBuffer.cpp +++ b/native/cocos/renderer/gfx/IndexBuffer.cpp @@ -24,6 +24,7 @@ #include "IndexBuffer.h" #include "DeviceGraphics.h" +#include "base/CCGLUtils.h" RENDERER_BEGIN @@ -38,14 +39,7 @@ IndexBuffer::IndexBuffer() IndexBuffer::~IndexBuffer() { - if (_glID == 0) - { - RENDERER_LOGE("The index buffer is invalid!"); - return; - } - - glDeleteBuffers(1, &_glID); - //TODO: _device._stats.ib -= _bytes; + destroy(); } bool IndexBuffer::init(DeviceGraphics* device, IndexFormat format, Usage usage, const void* data, size_t dataByteLength, uint32_t numIndices) @@ -97,7 +91,7 @@ void IndexBuffer::update(uint32_t offset, const void* data, size_t dataByteLengt } GLenum glUsage = (GLenum)_usage; - glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _glID); + ccBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _glID); if (!data) { glBufferData(GL_ELEMENT_ARRAY_BUFFER, _bytes, nullptr, glUsage); @@ -116,4 +110,14 @@ void IndexBuffer::update(uint32_t offset, const void* data, size_t dataByteLengt _device->restoreIndexBuffer(); } +void IndexBuffer::destroy() +{ + if (_glID == 0) + return; + + ccDeleteBuffers(1, &_glID); + //TODO: _device._stats.ib -= _bytes; + _glID = 0; +} + RENDERER_END diff --git a/native/cocos/renderer/gfx/IndexBuffer.h b/native/cocos/renderer/gfx/IndexBuffer.h index 02795009ee..ff0aa118d2 100644 --- a/native/cocos/renderer/gfx/IndexBuffer.h +++ b/native/cocos/renderer/gfx/IndexBuffer.h @@ -69,6 +69,8 @@ public: return _fetchDataCallback(bytes); } + void destroy(); + private: DeviceGraphics* _device; IndexFormat _format; diff --git a/native/cocos/renderer/gfx/State.cpp b/native/cocos/renderer/gfx/State.cpp index 049090f45b..7ba4d71206 100644 --- a/native/cocos/renderer/gfx/State.cpp +++ b/native/cocos/renderer/gfx/State.cpp @@ -83,6 +83,8 @@ State::State() State::State(const State& o) { *this = o; + + _textureUnits.reserve(10); } State::State(State&& o) diff --git a/native/cocos/renderer/gfx/Texture.cpp b/native/cocos/renderer/gfx/Texture.cpp index 70a0ed0b02..02a907a7bf 100644 --- a/native/cocos/renderer/gfx/Texture.cpp +++ b/native/cocos/renderer/gfx/Texture.cpp @@ -24,6 +24,7 @@ #include "Texture.h" #include "platform/CCPlatformConfig.h" +#include "base/CCGLUtils.h" namespace { @@ -196,7 +197,7 @@ Texture::~Texture() return; } - glDeleteTextures(1, &_glID); + ccDeleteTextures(1, &_glID); //TODO: this._device._stats.tex -= this.bytes; } diff --git a/native/cocos/renderer/gfx/Texture2D.cpp b/native/cocos/renderer/gfx/Texture2D.cpp index e6f613670f..784095756d 100644 --- a/native/cocos/renderer/gfx/Texture2D.cpp +++ b/native/cocos/renderer/gfx/Texture2D.cpp @@ -30,6 +30,8 @@ #include "firefox/WebGLTexelConversions.h" #include "firefox/mozilla/CheckedInt.h" +#include "base/CCGLUtils.h" + using namespace mozilla; using namespace mozilla::webgl; @@ -575,8 +577,8 @@ void Texture2D::update(const Options& options) genMipmap = false; } - GL_CHECK(glActiveTexture(GL_TEXTURE0)); - GL_CHECK(glBindTexture(GL_TEXTURE_2D, _glID)); + GL_CHECK(ccActiveTexture(GL_TEXTURE0)); + GL_CHECK(ccBindTexture(GL_TEXTURE_2D, _glID)); if (!options.images.empty()) { setMipmap(options.images, options.flipY, options.premultiplyAlpha); } @@ -594,8 +596,8 @@ void Texture2D::updateSubImage(const SubImageOption& option) { const GLTextureFmt& glFmt = glTextureFmt(_format); - GL_CHECK(glActiveTexture(GL_TEXTURE0)); - GL_CHECK(glBindTexture(GL_TEXTURE_2D, _glID)); + GL_CHECK(ccActiveTexture(GL_TEXTURE0)); + GL_CHECK(ccBindTexture(GL_TEXTURE_2D, _glID)); setSubImage(glFmt, option); _device->restoreTexture(0); } @@ -604,8 +606,8 @@ void Texture2D::updateImage(const ImageOption& option) { const GLTextureFmt& glFmt = glTextureFmt(_format); - GL_CHECK(glActiveTexture(GL_TEXTURE0)); - GL_CHECK(glBindTexture(GL_TEXTURE_2D, _glID)); + GL_CHECK(ccActiveTexture(GL_TEXTURE0)); + GL_CHECK(ccBindTexture(GL_TEXTURE_2D, _glID)); setImage(glFmt, option); _device->restoreTexture(0); } diff --git a/native/cocos/renderer/gfx/VertexBuffer.cpp b/native/cocos/renderer/gfx/VertexBuffer.cpp index 364d2cfcb1..f26e1d57c5 100644 --- a/native/cocos/renderer/gfx/VertexBuffer.cpp +++ b/native/cocos/renderer/gfx/VertexBuffer.cpp @@ -24,6 +24,7 @@ #include "VertexBuffer.h" #include "DeviceGraphics.h" +#include "base/CCGLUtils.h" RENDERER_BEGIN @@ -38,25 +39,19 @@ VertexBuffer::VertexBuffer() VertexBuffer::~VertexBuffer() { - if (_glID == 0) - { - RENDERER_LOGE("The vertex buffer is invalid!"); - return; - } - - glDeleteBuffers(1, &_glID); - //TODO: _device._stats.ib -= _bytes; + destroy(); } -bool VertexBuffer::init(DeviceGraphics* device, const VertexFormat& format, Usage usage, const void* data, size_t dataByteLength, uint32_t numVertices) +bool VertexBuffer::init(DeviceGraphics* device, VertexFormat* format, Usage usage, const void* data, size_t dataByteLength, uint32_t numVertices) { _device = device; _format = format; + CC_SAFE_RETAIN(_format); _usage = usage; _numVertices = numVertices; // calculate bytes - _bytes = _format._bytes * numVertices; + _bytes = _format->_bytes * numVertices; // update glGenBuffers(1, &_glID); @@ -68,6 +63,17 @@ bool VertexBuffer::init(DeviceGraphics* device, const VertexFormat& format, Usag return true; } +void VertexBuffer::setFormat(VertexFormat* format) +{ + if (_format == format) + return; + + CC_SAFE_RELEASE(_format); + _format = format; + CC_SAFE_RETAIN(_format); + +} + void VertexBuffer::update(uint32_t offset, const void* data, size_t dataByteLength) { if (_glID == 0) @@ -82,7 +88,7 @@ void VertexBuffer::update(uint32_t offset, const void* data, size_t dataByteLeng } GLenum glUsage = (GLenum)_usage; - glBindBuffer(GL_ARRAY_BUFFER, _glID); + ccBindBuffer(GL_ARRAY_BUFFER, _glID); if (!data) { glBufferData(GL_ARRAY_BUFFER, _bytes, nullptr, glUsage); @@ -98,7 +104,20 @@ void VertexBuffer::update(uint32_t offset, const void* data, size_t dataByteLeng glBufferData(GL_ARRAY_BUFFER, (GLsizeiptr)dataByteLength, data, glUsage); } } - glBindBuffer(GL_ARRAY_BUFFER, 0); + ccBindBuffer(GL_ARRAY_BUFFER, 0); +} + +void VertexBuffer::destroy() +{ + if (_glID == 0) + return; + + CC_SAFE_RELEASE_NULL(_format); + + ccDeleteBuffers(1, &_glID); + //TODO: _device._stats.ib -= _bytes; + + _glID = 0; } #if GFX_DEBUG > 0 diff --git a/native/cocos/renderer/gfx/VertexBuffer.h b/native/cocos/renderer/gfx/VertexBuffer.h index 7ce3e67c08..94cd2e6273 100644 --- a/native/cocos/renderer/gfx/VertexBuffer.h +++ b/native/cocos/renderer/gfx/VertexBuffer.h @@ -37,20 +37,20 @@ class DeviceGraphics; class VertexBuffer final : public GraphicsHandle { public: - RENDERER_DEFINE_CREATE_METHOD_6(VertexBuffer, init, DeviceGraphics*, const VertexFormat&, Usage, const void*, size_t, uint32_t) + RENDERER_DEFINE_CREATE_METHOD_6(VertexBuffer, init, DeviceGraphics*, VertexFormat*, Usage, const void*, size_t, uint32_t) VertexBuffer(); virtual ~VertexBuffer(); - bool init(DeviceGraphics* device, const VertexFormat& format, Usage usage, const void* data, size_t dataByteLength, uint32_t numVertices); + bool init(DeviceGraphics* device, VertexFormat* format, Usage usage, const void* data, size_t dataByteLength, uint32_t numVertices); void update(uint32_t offset, const void* data, size_t dataByteLength); inline uint32_t getCount() const { return _numVertices; } inline void setCount(uint32_t numVertices) { _numVertices = numVertices; } - inline const VertexFormat& getFormat() const { return _format; }; - inline void setFormat(VertexFormat&& format) { _format = std::move(format); } - inline void setFormat(const VertexFormat& format) { _format = format; } + inline const VertexFormat& getFormat() const { return *_format; } +// inline void setFormat(VertexFormat&& format) { _format = std::move(format); } + void setFormat(VertexFormat* format); inline Usage getUsage() const { return _usage; } inline void setUsage(Usage usage) { _usage = usage; } @@ -68,10 +68,12 @@ public: } return _fetchDataCallback(bytes); } + + void destroy(); private: DeviceGraphics* _device; - VertexFormat _format; + VertexFormat* _format; Usage _usage; uint32_t _numVertices; uint32_t _bytes; diff --git a/native/cocos/renderer/gfx/VertexFormat.h b/native/cocos/renderer/gfx/VertexFormat.h index 7e0699f459..a9f9df41aa 100644 --- a/native/cocos/renderer/gfx/VertexFormat.h +++ b/native/cocos/renderer/gfx/VertexFormat.h @@ -24,15 +24,16 @@ #pragma once -#include "../Types.h" - #include #include #include +#include "base/CCRef.h" +#include "../Types.h" + RENDERER_BEGIN -class VertexFormat +class VertexFormat : public Ref { public: struct Info diff --git a/native/cocos/renderer/renderer/BaseRenderer.cpp b/native/cocos/renderer/renderer/BaseRenderer.cpp index 0a6cba505e..64bd5e4518 100644 --- a/native/cocos/renderer/renderer/BaseRenderer.cpp +++ b/native/cocos/renderer/renderer/BaseRenderer.cpp @@ -39,7 +39,10 @@ RENDERER_BEGIN BaseRenderer::BaseRenderer() -{} +{ + _drawItems.reserve(100); + _stageInfos.reserve(10); +} BaseRenderer::~BaseRenderer() { @@ -78,22 +81,22 @@ void BaseRenderer::registerStage(const std::string& name, const StageCallback& c // protected functions -void BaseRenderer::render(const View* view, const Scene* scene) +void BaseRenderer::render(const View& view, const Scene* scene) { // setup framebuffer - _device->setFrameBuffer(view->frameBuffer); + _device->setFrameBuffer(view.frameBuffer); // setup viewport - _device->setViewport(view->rect.x, - view->rect.y, - view->rect.w, - view->rect.h); + _device->setViewport(view.rect.x, + view.rect.y, + view.rect.w, + view.rect.h); // setup clear Color4F clearColor; - if (ClearFlag::COLOR & view->clearFlags) - clearColor = view->color; - _device->clear(view->clearFlags, &clearColor, view->depth, view->stencil); + if (ClearFlag::COLOR & view.clearFlags) + clearColor = view.color; + _device->clear(view.clearFlags, &clearColor, view.depth, view.stencil); // get all draw items _drawItems.clear(); @@ -103,9 +106,9 @@ void BaseRenderer::render(const View* view, const Scene* scene) for (const auto& model : scene->getModels()) { modelViewId = model->getViewId(); - if (view->cullingByID) + if (view.cullingByID) { - if (modelViewId != view->id) + if (modelViewId != view.id) continue; } else @@ -126,16 +129,15 @@ void BaseRenderer::render(const View* view, const Scene* scene) _stageInfos.clear(); StageItem stageItem; StageInfo stageInfo; - for (const auto& stage : view->stages) + std::vector stageItems; + for (const auto& stage : view.stages) { - std::vector stageItems; for (const auto& item : _drawItems) { auto tech = item.effect->getTechnique(stage); if (tech) { stageItem.model = item.model; - stageItem.node = item.node; stageItem.ia = item.ia; stageItem.effect = item.effect; stageItem.defines = item.defines; @@ -147,30 +149,28 @@ void BaseRenderer::render(const View* view, const Scene* scene) } stageInfo.stage = stage; - stageInfo.items = std::move(stageItems); + stageInfo.items = &stageItems; _stageInfos.push_back(std::move(stageInfo)); } // render stages + std::unordered_map::iterator foundIter; for (const auto& stageInfo : _stageInfos) { - if (_stage2fn.end() != _stage2fn.find(stageInfo.stage)) + foundIter = _stage2fn.find(stageInfo.stage); + if (_stage2fn.end() != foundIter) { - auto& fn = _stage2fn.at(stageInfo.stage); - fn(view, stageInfo.items); + auto& fn = foundIter->second; + fn(view, *stageInfo.items); } } } void BaseRenderer::draw(const StageItem& item) { - //TODO: get world matrix of node -// const Mat4& worldMatrix = - - Mat4 worldMatrix = item.node->getWorldMatrix(); - //TODO: Mat4 worldMatrix = item.model->getWorldMatrix(); + Mat4 worldMatrix = item.model->getWorldMatrix(); _device->setUniformMat4("model", worldMatrix.m); - + //TODO: add Mat3 worldMatrix.inverse(); worldMatrix.transpose(); @@ -213,8 +213,10 @@ void BaseRenderer::draw(const StageItem& item) } std::vector slots; + slots.reserve(10); for (int i = 0; i < param.getCount(); ++i) slots.push_back(allocTextureUnit()); + _device->setTextureArray(param.getName(), std::move(prop->getTextureArray()), slots); @@ -268,55 +270,55 @@ void BaseRenderer::draw(const StageItem& item) _device->setPrimitiveType(ia->_primitiveType); // set program - auto program = _programLib->getProgram(pass->_programName, *(item.defines)); + auto program = _programLib->getProgram(pass._programName, *(item.defines)); _device->setProgram(program); // cull mode - _device->setCullMode(pass->_cullMode); + _device->setCullMode(pass._cullMode); // blend - if (pass->_blend) + if (pass._blend) { _device->enableBlend(); - _device->setBlendFuncSeparate(pass->_blendSrc, - pass->_blendDst, - pass->_blendSrcAlpha, - pass->_blendDstAlpha); - _device->setBlendEquationSeparate(pass->_blendEq, pass->_blendAlphaEq); - _device->setBlendColor(pass->_blendColor); + _device->setBlendFuncSeparate(pass._blendSrc, + pass._blendDst, + pass._blendSrcAlpha, + pass._blendDstAlpha); + _device->setBlendEquationSeparate(pass._blendEq, pass._blendAlphaEq); + _device->setBlendColor(pass._blendColor); } // depth test & write - if (pass->_depthTest) + if (pass._depthTest) { _device->enableDepthTest(); - _device->setDepthFunc(pass->_depthFunc); + _device->setDepthFunc(pass._depthFunc); } - if (pass->_depthWrite) + if (pass._depthWrite) _device->enableDepthWrite(); // setencil - if (pass->_stencilTest) + if (pass._stencilTest) { _device->enableStencilTest(); // front - _device->setStencilFuncFront(pass->_stencilFuncFront, - pass->_stencilRefFront, - pass->_stencilMaskFront); - _device->setStencilOpFront(pass->_stencilFailOpFront, - pass->_stencilZFailOpFront, - pass->_stencilZPassOpFront, - pass->_stencilWriteMaskFront); + _device->setStencilFuncFront(pass._stencilFuncFront, + pass._stencilRefFront, + pass._stencilMaskFront); + _device->setStencilOpFront(pass._stencilFailOpFront, + pass._stencilZFailOpFront, + pass._stencilZPassOpFront, + pass._stencilWriteMaskFront); // back - _device->setStencilFuncBack(pass->_stencilFuncBack, - pass->_stencilRefBack, - pass->_stencilMaskBack); - _device->setStencilOpBack(pass->_stencilFailOpBack, - pass->_stencilZFailOpBack, - pass->_stencilZPassOpBack, - pass->_stencilWriteMaskBack); + _device->setStencilFuncBack(pass._stencilFuncBack, + pass._stencilRefBack, + pass._stencilMaskBack); + _device->setStencilOpBack(pass._stencilFailOpBack, + pass._stencilZFailOpBack, + pass._stencilZPassOpBack, + pass._stencilWriteMaskBack); } // draw pass @@ -340,7 +342,7 @@ int BaseRenderer::allocTextureUnit() if (_usedTextureUnits >= maxTexureUnits) RENDERER_LOGW("Trying to use %d texture uints while this GPU only supports %d", _usedTextureUnits, maxTexureUnits); - return ++_usedTextureUnits; + return _usedTextureUnits++; } void BaseRenderer::reset() diff --git a/native/cocos/renderer/renderer/BaseRenderer.h b/native/cocos/renderer/renderer/BaseRenderer.h index 8ab023cda5..4dad284ff3 100644 --- a/native/cocos/renderer/renderer/BaseRenderer.h +++ b/native/cocos/renderer/renderer/BaseRenderer.h @@ -57,7 +57,7 @@ public: Technique* technique = nullptr; int sortKey = -1; }; - typedef std::function&)> StageCallback; + typedef std::function&)> StageCallback; BaseRenderer(); @@ -69,12 +69,12 @@ public: ProgramLib* getProgramLib() const { return _programLib; } protected: - void render(const View*, const Scene* scene); + void render(const View&, const Scene* scene); void draw(const StageItem& item); struct StageInfo { - std::vector items; + std::vector* items; std::string stage = ""; }; diff --git a/native/cocos/renderer/renderer/Camera.cpp b/native/cocos/renderer/renderer/Camera.cpp index 615cf7b6d2..7d88665f84 100644 --- a/native/cocos/renderer/renderer/Camera.cpp +++ b/native/cocos/renderer/renderer/Camera.cpp @@ -29,7 +29,12 @@ RENDERER_BEGIN Camera::Camera() -{} +{ + _cachedView.color = _color; + _cachedView.depth = _depth; + _cachedView.clearFlags = _clearFlags; + _cachedView.stencil = _stencil; +} Camera::~Camera() { @@ -41,6 +46,8 @@ void Camera::setFrameBuffer(FrameBuffer* framebuffer) RENDERER_SAFE_RELEASE(_framebuffer); _framebuffer = framebuffer; RENDERER_SAFE_RETAIN(_framebuffer); + + _cachedView.frameBuffer = _framebuffer; } void Camera::setWorldMatrix(const Mat4& worldMatrix) @@ -53,43 +60,78 @@ void Camera::setWorldMatrix(const Mat4& worldMatrix) _worldRTInv.inverse(); } -void Camera::extractView(View& out, int width, int height) const +void Camera::setColor(float r, float g, float b, float a) { + _color.set(r, g, b, a); + _cachedView.color = _color; +} + +void Camera::setDepth(float depth) +{ + _depth = depth; + _cachedView.depth = _depth; +} + +void Camera::setStencil(int stencil) +{ + _stencil = stencil; + _cachedView.stencil = _stencil; +} + +void Camera::setClearFlags(uint8_t flags ) +{ + _clearFlags = flags; + _cachedView.clearFlags = _clearFlags; +} + +void Camera::setRect(float x, float y, float w, float h) +{ + _rect.set(x, y, w, h); +} + +void Camera::setStages(const std::vector& stages) +{ + _stages = stages; + _cachedView.stages = _stages; +} + + +void Camera::setNode(INode* node) +{ + _node = node; +} + +const View& Camera::extractView( int width, int height) +{ + // can optimize it if node's position is not changed + // rect - out.rect.set(_rect.x * width, + _cachedView.rect.set(_rect.x * width, _rect.y * height, _rect.w * width, _rect.h * height); - - // clear options - out.color = _color; - out.depth = _depth; - out.stencil = _stencil; - out.clearFlags = _clearFlags; - - // stage & framebuffer - out.stages = _stages; - out.frameBuffer = _framebuffer; - + // view matrix - //TODO: - const_cast(this)->_worldRTInv.set(_node->getWorldRT()); - out.matView = _worldRTInv.getInversed(); - + //TODO: + _worldRTInv.set(_node->getWorldRT()); + _cachedView.matView.set(_worldRTInv.getInversed()); + // projecton matrix float aspect = (float)width / height; if (ProjectionType::PERSPECTIVE == _projection) - Mat4::createPerspective(_fov / 3.1415926 * 180, aspect, _near, _far, &out.matProj); + Mat4::createPerspective(_fov / 3.1415926 * 180, aspect, _near, _far, &_cachedView.matProj); else { float x = _orthoHeight * aspect; float y = _orthoHeight; - Mat4::createOrthographic(-x, x, -y, y, &out.matProj); + Mat4::createOrthographic(-x, x, -y, y, &_cachedView.matProj); } - + // view projection - Mat4::multiply(out.matProj, out.matView, &out.matViewProj); - out.matInvViewPorj = out.matViewProj.getInversed(); + Mat4::multiply(_cachedView.matProj, _cachedView.matView, &_cachedView.matViewProj); + _cachedView.matInvViewPorj.set(_cachedView.matViewProj.getInversed()); + + return _cachedView; } Vec3& Camera::screenToWorld(Vec3& out, const Vec3& screenPos, int width, int height) const diff --git a/native/cocos/renderer/renderer/Camera.h b/native/cocos/renderer/renderer/Camera.h index cd10fdf4ce..d101506554 100644 --- a/native/cocos/renderer/renderer/Camera.h +++ b/native/cocos/renderer/renderer/Camera.h @@ -67,34 +67,34 @@ public: inline void setFar(float far) { _far = far; } inline void getColor(Color4F& out) const { out = _color; } - inline void setColor(float r, float g, float b, float a) { _color.set(r, g, b, a); } + void setColor(float r, float g, float b, float a); inline float getDepth() const { return _depth; } - inline void setDepth(float depth) { _depth = depth; } + void setDepth(float depth); inline int getStencil() const { return _stencil; } - inline void setStencil(int stencil) { _stencil = stencil; } + void setStencil(int stencil); inline uint8_t getClearFlags() const { return _clearFlags; } - inline void setClearFlags(uint8_t flags ) { _clearFlags = flags; } + void setClearFlags(uint8_t flags ); inline Rect* getRect(Rect& out) const { out = _rect; return &out; } - inline void setRect(float x, float y, float w, float h) { _rect.set(x, y, w, h); } + void setRect(float x, float y, float w, float h); inline const std::vector& getStages() const { return _stages; } - inline void setStages(const std::vector& stages) { _stages = stages; } + void setStages(const std::vector& stages); inline FrameBuffer* getFrameBuffer() const { return _framebuffer; } void setFrameBuffer(FrameBuffer* framebuffer); void setWorldMatrix(const Mat4& worldMatrix); - void extractView(View& out, int width, int height) const; + const View& extractView(int width, int height); Vec3& screenToWorld(Vec3& out, const Vec3& screenPos, int width, int height) const; Vec3& worldToScreen(Vec3& out, const Vec3& worldPos, int width, int height) const; - inline void setNode(INode* node) { _node = node; } + void setNode(INode* node); inline INode* getNode() const { return _node; } private: @@ -122,6 +122,8 @@ private: Mat4 _worldRTInv; Vec3 _worldPos; + + View _cachedView; }; RENDERER_END diff --git a/native/cocos/renderer/renderer/Effect.cpp b/native/cocos/renderer/renderer/Effect.cpp index fc295e23cb..33dc1b61d6 100644 --- a/native/cocos/renderer/renderer/Effect.cpp +++ b/native/cocos/renderer/renderer/Effect.cpp @@ -35,11 +35,16 @@ Effect::Effect(const Vector& techniques, , _defineTemplates(defineTemplates) { // RENDERER_LOGD("Effect construction: %p", this); + + for (const auto defineTemplate: _defineTemplates) + _cachedNameValues.emplace(defineTemplate.at("name").asString(), + defineTemplate.at("value")); } Effect::~Effect() { // RENDERER_LOGD("Effect destruction: %p", this); + clear(); } void Effect::clear() @@ -82,17 +87,18 @@ void Effect::setDefineValue(const std::string& name, const Value& value) if (name == def.at("name").asString()) { def["value"] = value; + _cachedNameValues[name] = value; return; } } } -ValueMap* Effect::extractDefines(ValueMap& out) const +ValueMap* Effect::extractDefines() { - for (auto& def : _defineTemplates) - out[def.at("name").asString()] = def.at("value"); - - return &out; +// for (auto& def : _defineTemplates) +// out.emplace(def.at("name").asString(), def.at("value")); + + return &_cachedNameValues; } const Effect::Property& Effect::getProperty(const std::string& name) const diff --git a/native/cocos/renderer/renderer/Effect.h b/native/cocos/renderer/renderer/Effect.h index 91b52108fb..500770b452 100644 --- a/native/cocos/renderer/renderer/Effect.h +++ b/native/cocos/renderer/renderer/Effect.h @@ -43,23 +43,26 @@ public: const std::unordered_map& properties, const std::vector& defineTemplates); - virtual ~Effect(); + ~Effect(); void clear(); Technique* getTechnique(const std::string& stage) const; const Vector& getTechniques() const { return _techniques; } - Value getDefineValue(const std::string& name) const; + const std::vector& getDefines() const { return _defineTemplates; } void setDefineValue(const std::string& name, const Value& value); - ValueMap* extractDefines(ValueMap& out) const; + ValueMap* extractDefines(); const Property& getProperty(const std::string& name) const; void setProperty(const std::string& name, const Property& property); + const std::unordered_map& getProperties() const { return _properties; } + private: Vector _techniques; std::vector _defineTemplates; + ValueMap _cachedNameValues; std::unordered_map _properties; }; diff --git a/native/cocos/renderer/renderer/ForwardRenderer.cpp b/native/cocos/renderer/renderer/ForwardRenderer.cpp index ecffdda2db..0db6332dd9 100644 --- a/native/cocos/renderer/renderer/ForwardRenderer.cpp +++ b/native/cocos/renderer/renderer/ForwardRenderer.cpp @@ -54,49 +54,26 @@ bool ForwardRenderer::init(DeviceGraphics* device, std::vectorgetCameras(); for (auto camera : cameras) - { - View* view = new View(); - camera->extractView(*view, _width, _height); - BaseRenderer::render(view, scene); - view->release(); - } + BaseRenderer::render(camera->extractView(_width, _height), scene); + + scene->removeModels(); } -void ForwardRenderer::transparentStage(const View* view, const std::vector& items) +void ForwardRenderer::transparentStage(const View& view, const std::vector& items) { // update uniforms - _device->setUniformMat4("view", view->matView); - _device->setUniformMat4("proj", view->matProj); - _device->setUniformMat4("viewProj", view->matViewProj); + _device->setUniformMat4("view", view.matView); + _device->setUniformMat4("proj", view.matProj); + _device->setUniformMat4("viewProj", view.matViewProj); // RENDERER_LOGD("StageItem count: %d", (int)items.size()); // draw it for (const auto& item : items) - { - // Update vertex buffer and index buffer -// InputAssembler* ia = item.ia; -// VertexBuffer* vb = ia->getVertexBuffer(); -// size_t vertexDataBytes = 0; -// uint8_t* vertexData = vb->invokeFetchDataCallback(&vertexDataBytes); -// assert(vertexData != nullptr); -// assert(vertexDataBytes > 0); -//// RENDERER_LOGD("vertexBuffer size: %d", (int)vertexDataBytes); -// -// IndexBuffer* ib = ia->getIndexBuffer(); -// size_t indexDataBytes = 0; -// uint8_t* indexData = ib->invokeFetchDataCallback(&indexDataBytes); -// assert(indexData != nullptr); -// assert(indexDataBytes > 0); -//// RENDERER_LOGD("indexBuffer size: %d", (int)indexDataBytes); -// -// vb->update(0, vertexData, vertexDataBytes); -// ib->update(0, indexData, indexDataBytes); draw(item); - } } RENDERER_END diff --git a/native/cocos/renderer/renderer/ForwardRenderer.h b/native/cocos/renderer/renderer/ForwardRenderer.h index fdc0e2d9bf..292ca6c321 100644 --- a/native/cocos/renderer/renderer/ForwardRenderer.h +++ b/native/cocos/renderer/renderer/ForwardRenderer.h @@ -37,7 +37,7 @@ public: void render(Scene* scene); private: - void transparentStage(const View* view, const std::vector& items); + void transparentStage(const View& view, const std::vector& items); int _width = 0; int _height = 0; diff --git a/native/cocos/renderer/renderer/InputAssembler.cpp b/native/cocos/renderer/renderer/InputAssembler.cpp index 811aacc1c9..a2062e8d04 100644 --- a/native/cocos/renderer/renderer/InputAssembler.cpp +++ b/native/cocos/renderer/renderer/InputAssembler.cpp @@ -32,12 +32,56 @@ InputAssembler::InputAssembler() { } +InputAssembler::InputAssembler(const InputAssembler& o) +{ + *this = o; +} + +InputAssembler::InputAssembler(InputAssembler&& o) +{ + *this = std::move(o); +} + InputAssembler::~InputAssembler() { RENDERER_SAFE_RELEASE(_vertexBuffer); RENDERER_SAFE_RELEASE(_indexBuffer); } +InputAssembler& InputAssembler::operator=(const InputAssembler& o) +{ + CC_SAFE_RELEASE(_vertexBuffer); + CC_SAFE_RELEASE(_indexBuffer); + + _vertexBuffer = o._vertexBuffer; + _indexBuffer = o._indexBuffer; + _start = o._start; + _count = o._count; + _primitiveType = o._primitiveType; + + CC_SAFE_RETAIN(_vertexBuffer); + CC_SAFE_RETAIN(_indexBuffer); + + return *this; +} + +InputAssembler& InputAssembler::operator=(InputAssembler&& o) +{ + CC_SAFE_RELEASE(_vertexBuffer); + CC_SAFE_RELEASE(_indexBuffer); + + _vertexBuffer = o._vertexBuffer; + _indexBuffer = o._indexBuffer; + _start = o._start; + _count = o._count; + _primitiveType = o._primitiveType; + + o._indexBuffer = nullptr; + o._vertexBuffer = nullptr; + + return *this; +} + bool InputAssembler::init(VertexBuffer* vb, IndexBuffer* ib, PrimitiveType pt/* = PrimitiveType::TRIANGLES*/) diff --git a/native/cocos/renderer/renderer/InputAssembler.h b/native/cocos/renderer/renderer/InputAssembler.h index e47104350f..2ea233af37 100644 --- a/native/cocos/renderer/renderer/InputAssembler.h +++ b/native/cocos/renderer/renderer/InputAssembler.h @@ -24,7 +24,6 @@ #pragma once -#include "base/CCRef.h" #include "../Types.h" #include "../Macro.h" @@ -33,11 +32,16 @@ RENDERER_BEGIN class VertexBuffer; class IndexBuffer; -class InputAssembler : public Ref +class InputAssembler { public: InputAssembler(); + InputAssembler(const InputAssembler& o); + InputAssembler(InputAssembler&& o); ~InputAssembler(); + + InputAssembler& operator=(const InputAssembler& o); + InputAssembler& operator=(InputAssembler&& o); bool init(VertexBuffer* vb, IndexBuffer* ib, diff --git a/native/cocos/renderer/renderer/Model.cpp b/native/cocos/renderer/renderer/Model.cpp index b976646c1e..6aa30aa7d5 100644 --- a/native/cocos/renderer/renderer/Model.cpp +++ b/native/cocos/renderer/renderer/Model.cpp @@ -28,22 +28,55 @@ RENDERER_BEGIN +// Implementation of Model pool. + +ccCArray* ModelPool::_pool = ccCArrayNew(500); + +Model* ModelPool::getOrCreateModel() +{ + Model* model = nullptr; + if (0 != _pool->num) + { + model = static_cast(ModelPool::_pool->arr[ModelPool::_pool->num - 1]); + ccCArrayRemoveValueAtIndex(ModelPool::_pool, ModelPool::_pool->num - 1); + } + else + model = new Model(); + + return model; +} + +void ModelPool::returnModel(Model *model) +{ + if (ModelPool::_pool->num < ModelPool::_pool->max) + { + model->reset(); + ccCArrayAppendValue(ModelPool::_pool, model); + } + else + delete model; +} + +// Implementation of Model + Model::Model() { // RENDERER_LOGD("Model construction %p", this); + + _inputAssemblers.reserve(500); } Model::~Model() { RENDERER_LOGD("Model destruction %p", this); + reset(); + + ccCArrayFree(_effects); } -void Model::addInputAssembler(InputAssembler* ia) +void Model::addInputAssembler(const InputAssembler& ia) { - if (_inputAssemblers.contains(ia)) - return; - - _inputAssemblers.pushBack(ia); + _inputAssemblers.push_back(std::move(ia)); } void Model::clearInputAssemblers() @@ -53,19 +86,17 @@ void Model::clearInputAssemblers() void Model::addEffect(Effect* effect) { - if (_effects.contains(effect)) + if (ccCArrayContainsValue(_effects, effect)) return; - _effects.pushBack(effect); + ccCArrayAppendValue(_effects, effect); - ValueMap defs; - effect->extractDefines(defs); - _defines.push_back(std::move(defs)); + _defines.push_back(effect->extractDefines()); } void Model::clearEffects() { - _effects.clear(); + ccCArrayRemoveAllValues(_effects); _defines.clear(); } @@ -74,35 +105,34 @@ void Model::extractDrawItem(DrawItem& out, uint32_t index) const if (_dynamicIA) { out.model = const_cast(this); - out.node = _node; out.ia = nullptr; - out.effect = _effects.at(0); - out.defines = out.effect->extractDefines(const_cast(_defines[0])); + out.effect = static_cast(_effects->arr[0]); + out.defines = out.effect->extractDefines(); return; } if (index >= _inputAssemblers.size()) - { - out.model = nullptr; - out.node = nullptr; - out.ia = nullptr; - out.effect = nullptr; - out.defines = nullptr; - return; - } out.model = const_cast(this); - out.node = _node; - out.ia = _inputAssemblers.at(index); + out.ia = const_cast(&(_inputAssemblers[index])); - auto effectsSize = _effects.size(); + auto effectsSize = _effects->num; if (index >= effectsSize) index = (uint32_t)(effectsSize - 1); - out.effect = const_cast(_effects.at(index)); - out.defines = out.effect->extractDefines(const_cast(_defines[index])); + out.effect = static_cast(_effects->arr[index]); + + out.defines = out.effect->extractDefines(); +} + +void Model::reset() +{ + ccCArrayRemoveAllValues(_effects); + _inputAssemblers.clear(); + + _defines.clear(); } RENDERER_END diff --git a/native/cocos/renderer/renderer/Model.h b/native/cocos/renderer/renderer/Model.h index 8db4af4186..c7f105f84f 100644 --- a/native/cocos/renderer/renderer/Model.h +++ b/native/cocos/renderer/renderer/Model.h @@ -25,8 +25,10 @@ #pragma once #include +#include #include "base/CCVector.h" #include "base/CCValue.h" +#include "base/ccCArray.h" #include "math/Mat4.h" #include "../Macro.h" @@ -39,14 +41,25 @@ class INode; struct DrawItem { - INode* node = nullptr; Model* model = nullptr; InputAssembler* ia = nullptr; Effect* effect = nullptr; - ValueMap* defines; + ValueMap* defines = nullptr; }; -class Model : public Ref +class Model; + +class ModelPool +{ +public: + static Model* getOrCreateModel(); + static void returnModel(Model*); + +private: + static ccCArray* _pool;; +}; + +class Model { public: Model(); @@ -58,28 +71,27 @@ public: inline void setDynamicIA(bool value) { _dynamicIA = value; } inline uint32_t getDrawItemCount() const { return _dynamicIA ? 1 : (uint32_t)_inputAssemblers.size(); } - inline void setWorldMatix(const Mat4& matrix) { _worldMatrix = matrix; } + inline void setWorldMatix(const Mat4& matrix) { _worldMatrix = std::move(matrix); } inline const Mat4& getWorldMatrix() const { return _worldMatrix; } inline void setViewId(int val) { _viewID = val; } inline int getViewId() const { return _viewID; } - void addInputAssembler(InputAssembler* ia); + void addInputAssembler(const InputAssembler& ia); void clearInputAssemblers(); void addEffect(Effect* effect); void clearEffects(); void extractDrawItem(DrawItem& out, uint32_t index) const; - inline INode* getNode() const { return _node; } - inline void setNode(INode* node) { _node = node; } - private: - // Record world matrix instead of Node. - INode* _node = nullptr; + friend class ModelPool; + void reset(); + Mat4 _worldMatrix; - Vector _effects; - Vector _inputAssemblers; - std::vector _defines; + ccCArray* _effects = ccCArrayNew(2); + + std::vector _inputAssemblers; + std::vector _defines; bool _dynamicIA = false; int _viewID = -1; }; diff --git a/native/cocos/renderer/renderer/Pass.h b/native/cocos/renderer/renderer/Pass.h index b19c88a4fb..fc6e7c4dfd 100644 --- a/native/cocos/renderer/renderer/Pass.h +++ b/native/cocos/renderer/renderer/Pass.h @@ -31,11 +31,12 @@ RENDERER_BEGIN -class Pass : public Ref +class Pass { public: Pass(const std::string& programName); - virtual ~Pass(); + Pass() {} + ~Pass(); void setCullMode(CullMode cullMode); void setBlend(BlendOp blendEq = BlendOp::ADD, @@ -64,6 +65,7 @@ public: uint8_t stencilWriteMask = 0xff); inline void setStencilTest(bool value) { _stencilTest = value; } inline bool getStencilTest() const { return _stencilTest; } + inline void setProgramName(const std::string& programName) { _programName = programName; } private: friend class BaseRenderer; diff --git a/native/cocos/renderer/renderer/RendererUtils.cpp b/native/cocos/renderer/renderer/RendererUtils.cpp index 8de1359064..d6c99376c5 100644 --- a/native/cocos/renderer/renderer/RendererUtils.cpp +++ b/native/cocos/renderer/renderer/RendererUtils.cpp @@ -70,9 +70,10 @@ InputAssembler* createIA(DeviceGraphics* device, const IAData& data) if (!data.uvs.empty()) vfmt.push_back({ ATTRIB_NAME_UV0, AttribType::FLOAT32, 2}); - VertexFormat fmt(vfmt); + VertexFormat* fmt = new VertexFormat(vfmt); auto vb = new VertexBuffer(); vb->init(device, fmt, Usage::STATIC, verts.data(), verts.size() * sizeof(float), (uint32_t)vcount); + fmt->release(); IndexBuffer* ib = nullptr; diff --git a/native/cocos/renderer/renderer/Scene.cpp b/native/cocos/renderer/renderer/Scene.cpp index 3a3673c4be..aef18ea1b6 100644 --- a/native/cocos/renderer/renderer/Scene.cpp +++ b/native/cocos/renderer/renderer/Scene.cpp @@ -34,6 +34,7 @@ RENDERER_BEGIN Scene::Scene() { + _models.reserve(500); } void Scene::reset() @@ -74,12 +75,25 @@ Model* Scene::getModel(uint32_t index) void Scene::addModel(Model* model) { - _models.pushBack(model); + _models.push_back(model); } void Scene::removeModel(Model* model) { - _models.eraseObject(model); + auto iter = std::find(_models.begin(), _models.end(), model); + if (_models.end() != iter) + { + ModelPool::returnModel(model); + _models.erase(iter); + } +} + +void Scene::removeModels() +{ + for (const auto& model : _models) + ModelPool::returnModel(model); + + _models.clear(); } Light* Scene::getLight(uint32_t index) diff --git a/native/cocos/renderer/renderer/Scene.h b/native/cocos/renderer/renderer/Scene.h index bb5e07ed31..10568f2653 100644 --- a/native/cocos/renderer/renderer/Scene.h +++ b/native/cocos/renderer/renderer/Scene.h @@ -26,6 +26,7 @@ #include #include "base/CCVector.h" +#include "base/ccCArray.h" #include "../Macro.h" RENDERER_BEGIN @@ -55,7 +56,8 @@ public: Model* getModel(uint32_t index); void addModel(Model* model); void removeModel(Model* model); - inline const Vector& getModels() const { return _models; } + void removeModels(); + inline const std::vector& getModels() const { return _models; } // light inline uint32_t getLightCount() const { return (uint32_t)_lights.size(); } @@ -71,7 +73,7 @@ private: //TODO: optimize speed. Vector _cameras; Vector _lights; - Vector _models; + std::vector _models; Vector _views; Camera* _debugCamera = nullptr; }; diff --git a/native/cocos/renderer/renderer/Technique.cpp b/native/cocos/renderer/renderer/Technique.cpp index 22558116a9..2f900cb6df 100644 --- a/native/cocos/renderer/renderer/Technique.cpp +++ b/native/cocos/renderer/renderer/Technique.cpp @@ -359,7 +359,7 @@ uint32_t Technique::_genID = 0; Technique::Technique(const std::vector& stages, const std::vector& parameters, - const Vector& passes, + const std::vector& passes, int layer) : _id(_genID++) , _stageIDs(Config::getStageIDs(stages)) @@ -380,9 +380,9 @@ void Technique::setStages(const std::vector& stages) _stageIDs = Config::getStageIDs(stages); } -void Technique::setPass(int index, Pass* pass) +void Technique::setPass(int index, const Pass& pass) { - _passes.replace(index, pass); + _passes[index] = pass; } RENDERER_END diff --git a/native/cocos/renderer/renderer/Technique.h b/native/cocos/renderer/renderer/Technique.h index 5723ff215e..e0fda9e083 100644 --- a/native/cocos/renderer/renderer/Technique.h +++ b/native/cocos/renderer/renderer/Technique.h @@ -109,16 +109,16 @@ public: Technique(const std::vector& stages, const std::vector& parameters, - const Vector& passes, + const std::vector& passes, int layer = 0); - virtual ~Technique(); + ~Technique(); void setStages(const std::vector& stages); - void setPass(int index, Pass* pass); + void setPass(int index, const Pass& pass); const std::vector& getParameters() const { return _parameters; } - const Vector& getPasses() const { return _passes; } + const std::vector& getPasses() const { return _passes; } uint32_t getStageIDs() const { return _stageIDs; } private: @@ -128,7 +128,7 @@ private: uint32_t _stageIDs = 0; int _layer = 0; std::vector _parameters; - Vector _passes; + std::vector _passes; }; RENDERER_END diff --git a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js index 31566cbf84..a132bd3055 100644 --- a/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js +++ b/native/cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js @@ -556,6 +556,16 @@ Camera : function ( */ renderer.Technique = { +/** + * @method getPasses + * @return {Array} + */ +getPasses : function ( +) +{ + return new Array(); +}, + /** * @method getStageIDs * @return {unsigned int} @@ -588,16 +598,6 @@ array { }, -/** - * @method getPasses - * @return {Array} - */ -getPasses : function ( -) -{ - return new Array(); -}, - /** * @method getParameters * @return {Array} @@ -644,18 +644,6 @@ str return cc.Value; }, -/** - * @method getProperty - * @param {String} arg0 - * @return {cc.renderer::Technique::Parameter} - */ -getProperty : function ( -str -) -{ - return cc.renderer::Technique::Parameter; -}, - /** * @method clear */ diff --git a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.cpp index b6f504b175..c44a0eba68 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.cpp @@ -39,12 +39,14 @@ SE_BIND_CTOR(js_gfx_GraphicsHandle_constructor, __jsb_cocos2d_renderer_GraphicsH static bool js_cocos2d_renderer_GraphicsHandle_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::GraphicsHandle)", s.nativeThisObject()); cocos2d::renderer::GraphicsHandle* cobj = (cocos2d::renderer::GraphicsHandle*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_GraphicsHandle_finalize) @@ -143,6 +145,21 @@ static bool js_gfx_IndexBuffer_setCount(se::State& s) } SE_BIND_FUNC(js_gfx_IndexBuffer_setCount) +static bool js_gfx_IndexBuffer_destroy(se::State& s) +{ + cocos2d::renderer::IndexBuffer* cobj = (cocos2d::renderer::IndexBuffer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_IndexBuffer_destroy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->destroy(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_gfx_IndexBuffer_destroy) + static bool js_gfx_IndexBuffer_setUsage(se::State& s) { cocos2d::renderer::IndexBuffer* cobj = (cocos2d::renderer::IndexBuffer*)s.nativeThisObject(); @@ -233,12 +250,14 @@ extern se::Object* __jsb_cocos2d_renderer_GraphicsHandle_proto; static bool js_cocos2d_renderer_IndexBuffer_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::IndexBuffer)", s.nativeThisObject()); cocos2d::renderer::IndexBuffer* cobj = (cocos2d::renderer::IndexBuffer*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_IndexBuffer_finalize) @@ -251,6 +270,7 @@ bool js_register_gfx_IndexBuffer(se::Object* obj) cls->defineFunction("getUsage", _SE(js_gfx_IndexBuffer_getUsage)); cls->defineFunction("setFormat", _SE(js_gfx_IndexBuffer_setFormat)); cls->defineFunction("setCount", _SE(js_gfx_IndexBuffer_setCount)); + cls->defineFunction("destroy", _SE(js_gfx_IndexBuffer_destroy)); cls->defineFunction("setUsage", _SE(js_gfx_IndexBuffer_setUsage)); cls->defineFunction("getCount", _SE(js_gfx_IndexBuffer_getCount)); cls->defineFunction("setBytesPerIndex", _SE(js_gfx_IndexBuffer_setBytesPerIndex)); @@ -325,6 +345,21 @@ static bool js_gfx_VertexBuffer_setCount(se::State& s) } SE_BIND_FUNC(js_gfx_VertexBuffer_setCount) +static bool js_gfx_VertexBuffer_destroy(se::State& s) +{ + cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_VertexBuffer_destroy : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->destroy(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_gfx_VertexBuffer_destroy) + static bool js_gfx_VertexBuffer_setUsage(se::State& s) { cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); @@ -396,12 +431,14 @@ extern se::Object* __jsb_cocos2d_renderer_GraphicsHandle_proto; static bool js_cocos2d_renderer_VertexBuffer_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::VertexBuffer)", s.nativeThisObject()); cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_VertexBuffer_finalize) @@ -413,6 +450,7 @@ bool js_register_gfx_VertexBuffer(se::Object* obj) cls->defineFunction("setBytes", _SE(js_gfx_VertexBuffer_setBytes)); cls->defineFunction("getUsage", _SE(js_gfx_VertexBuffer_getUsage)); cls->defineFunction("setCount", _SE(js_gfx_VertexBuffer_setCount)); + cls->defineFunction("destroy", _SE(js_gfx_VertexBuffer_destroy)); cls->defineFunction("setUsage", _SE(js_gfx_VertexBuffer_setUsage)); cls->defineFunction("getCount", _SE(js_gfx_VertexBuffer_getCount)); cls->defineFunction("getBytes", _SE(js_gfx_VertexBuffer_getBytes)); @@ -1167,12 +1205,6 @@ extern se::Object* __jsb_cocos2d_renderer_GraphicsHandle_proto; static bool js_cocos2d_renderer_FrameBuffer_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::FrameBuffer)", s.nativeThisObject()); - cocos2d::renderer::FrameBuffer* cobj = (cocos2d::renderer::FrameBuffer*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_FrameBuffer_finalize) @@ -1200,12 +1232,14 @@ extern se::Object* __jsb_cocos2d_renderer_GraphicsHandle_proto; static bool js_cocos2d_renderer_RenderTarget_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::RenderTarget)", s.nativeThisObject()); cocos2d::renderer::RenderTarget* cobj = (cocos2d::renderer::RenderTarget*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_RenderTarget_finalize) @@ -1298,12 +1332,14 @@ extern se::Object* __jsb_cocos2d_renderer_RenderTarget_proto; static bool js_cocos2d_renderer_RenderBuffer_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::RenderBuffer)", s.nativeThisObject()); cocos2d::renderer::RenderBuffer* cobj = (cocos2d::renderer::RenderBuffer*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_RenderBuffer_finalize) @@ -1387,12 +1423,6 @@ extern se::Object* __jsb_cocos2d_renderer_RenderTarget_proto; static bool js_cocos2d_renderer_Texture_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Texture)", s.nativeThisObject()); - cocos2d::renderer::Texture* cobj = (cocos2d::renderer::Texture*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Texture_finalize) @@ -1460,25 +1490,6 @@ static bool js_gfx_Texture2D_init(se::State& s) } SE_BIND_FUNC(js_gfx_Texture2D_init) -static bool js_gfx_Texture2D_updateSubImage(se::State& s) -{ - cocos2d::renderer::Texture2D* cobj = (cocos2d::renderer::Texture2D*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_gfx_Texture2D_updateSubImage : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::Texture::SubImageOption arg0; - ok &= seval_to_TextureSubImageOption(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_gfx_Texture2D_updateSubImage : Error processing arguments"); - cobj->updateSubImage(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_gfx_Texture2D_updateSubImage) - static bool js_gfx_Texture2D_update(se::State& s) { cocos2d::renderer::Texture2D* cobj = (cocos2d::renderer::Texture2D*)s.nativeThisObject(); @@ -1498,6 +1509,25 @@ static bool js_gfx_Texture2D_update(se::State& s) } SE_BIND_FUNC(js_gfx_Texture2D_update) +static bool js_gfx_Texture2D_updateSubImage(se::State& s) +{ + cocos2d::renderer::Texture2D* cobj = (cocos2d::renderer::Texture2D*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_Texture2D_updateSubImage : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + cocos2d::renderer::Texture::SubImageOption arg0; + ok &= seval_to_TextureSubImageOption(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_gfx_Texture2D_updateSubImage : Error processing arguments"); + cobj->updateSubImage(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_gfx_Texture2D_updateSubImage) + static bool js_gfx_Texture2D_create(se::State& s) { const auto& args = s.args(); @@ -1537,12 +1567,14 @@ extern se::Object* __jsb_cocos2d_renderer_Texture_proto; static bool js_cocos2d_renderer_Texture2D_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Texture2D)", s.nativeThisObject()); cocos2d::renderer::Texture2D* cobj = (cocos2d::renderer::Texture2D*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Texture2D_finalize) @@ -1553,8 +1585,8 @@ bool js_register_gfx_Texture2D(se::Object* obj) cls->defineFunction("updateImage", _SE(js_gfx_Texture2D_updateImage)); cls->defineFunction("init", _SE(js_gfx_Texture2D_init)); + cls->defineFunction("updateBinding", _SE(js_gfx_Texture2D_update)); cls->defineFunction("updateSubImage", _SE(js_gfx_Texture2D_updateSubImage)); - cls->defineFunction("update", _SE(js_gfx_Texture2D_update)); cls->defineStaticFunction("create", _SE(js_gfx_Texture2D_create)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Texture2D_finalize)); cls->install(); @@ -1644,12 +1676,14 @@ extern se::Object* __jsb_cocos2d_renderer_GraphicsHandle_proto; static bool js_cocos2d_renderer_Program_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Program)", s.nativeThisObject()); cocos2d::renderer::Program* cobj = (cocos2d::renderer::Program*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Program_finalize) diff --git a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.hpp index 9898cafd46..bb13ad800e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_gfx_auto.hpp @@ -20,6 +20,7 @@ SE_DECLARE_FUNC(js_gfx_IndexBuffer_setBytes); SE_DECLARE_FUNC(js_gfx_IndexBuffer_getUsage); SE_DECLARE_FUNC(js_gfx_IndexBuffer_setFormat); SE_DECLARE_FUNC(js_gfx_IndexBuffer_setCount); +SE_DECLARE_FUNC(js_gfx_IndexBuffer_destroy); SE_DECLARE_FUNC(js_gfx_IndexBuffer_setUsage); SE_DECLARE_FUNC(js_gfx_IndexBuffer_getCount); SE_DECLARE_FUNC(js_gfx_IndexBuffer_setBytesPerIndex); @@ -34,6 +35,7 @@ bool register_all_gfx(se::Object* obj); SE_DECLARE_FUNC(js_gfx_VertexBuffer_setBytes); SE_DECLARE_FUNC(js_gfx_VertexBuffer_getUsage); SE_DECLARE_FUNC(js_gfx_VertexBuffer_setCount); +SE_DECLARE_FUNC(js_gfx_VertexBuffer_destroy); SE_DECLARE_FUNC(js_gfx_VertexBuffer_setUsage); SE_DECLARE_FUNC(js_gfx_VertexBuffer_getCount); SE_DECLARE_FUNC(js_gfx_VertexBuffer_getBytes); @@ -114,8 +116,8 @@ bool js_register_cocos2d_renderer_Texture2D(se::Object* obj); bool register_all_gfx(se::Object* obj); SE_DECLARE_FUNC(js_gfx_Texture2D_updateImage); SE_DECLARE_FUNC(js_gfx_Texture2D_init); -SE_DECLARE_FUNC(js_gfx_Texture2D_updateSubImage); SE_DECLARE_FUNC(js_gfx_Texture2D_update); +SE_DECLARE_FUNC(js_gfx_Texture2D_updateSubImage); SE_DECLARE_FUNC(js_gfx_Texture2D_create); SE_DECLARE_FUNC(js_gfx_Texture2D_Texture2D); diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp index eda3e89319..5d2e535b54 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp @@ -100,6 +100,7 @@ SE_BIND_CTOR(js_renderer_ProgramLib_constructor, __jsb_cocos2d_renderer_ProgramL static bool js_cocos2d_renderer_ProgramLib_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::ProgramLib)", s.nativeThisObject()); auto iter = se::NonRefNativePtrCreatedByCtorMap::find(s.nativeThisObject()); if (iter != se::NonRefNativePtrCreatedByCtorMap::end()) @@ -108,6 +109,7 @@ static bool js_cocos2d_renderer_ProgramLib_finalize(se::State& s) cocos2d::renderer::ProgramLib* cobj = (cocos2d::renderer::ProgramLib*)s.nativeThisObject(); delete cobj; } + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_ProgramLib_finalize) @@ -130,276 +132,6 @@ bool js_register_renderer_ProgramLib(se::Object* obj) return true; } -se::Object* __jsb_cocos2d_renderer_Model_proto = nullptr; -se::Class* __jsb_cocos2d_renderer_Model_class = nullptr; - -static bool js_renderer_Model_getInputAssemblerCount(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_getInputAssemblerCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getInputAssemblerCount(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Model_getInputAssemblerCount : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_getInputAssemblerCount) - -static bool js_renderer_Model_getDrawItemCount(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_getDrawItemCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getDrawItemCount(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Model_getDrawItemCount : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_getDrawItemCount) - -static bool js_renderer_Model_getWorldMatrix(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_getWorldMatrix : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - const cocos2d::Mat4& result = cobj->getWorldMatrix(); - ok &= Mat4_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Model_getWorldMatrix : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_getWorldMatrix) - -static bool js_renderer_Model_isDynamicIA(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_isDynamicIA : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - bool result = cobj->isDynamicIA(); - ok &= boolean_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Model_isDynamicIA : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_isDynamicIA) - -static bool js_renderer_Model_addEffect(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_addEffect : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::Effect* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Model_addEffect : Error processing arguments"); - cobj->addEffect(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_addEffect) - -static bool js_renderer_Model_setWorldMatix(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_setWorldMatix : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::Mat4 arg0; - ok &= seval_to_Mat4(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Model_setWorldMatix : Error processing arguments"); - cobj->setWorldMatix(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_setWorldMatix) - -static bool js_renderer_Model_clearEffects(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_clearEffects : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) { - cobj->clearEffects(); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_clearEffects) - -static bool js_renderer_Model_setDynamicIA(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_setDynamicIA : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - bool arg0; - ok &= seval_to_boolean(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Model_setDynamicIA : Error processing arguments"); - cobj->setDynamicIA(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_setDynamicIA) - -static bool js_renderer_Model_getViewId(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_getViewId : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - int result = cobj->getViewId(); - ok &= int32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Model_getViewId : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_getViewId) - -static bool js_renderer_Model_clearInputAssemblers(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_clearInputAssemblers : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) { - cobj->clearInputAssemblers(); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Model_clearInputAssemblers) - -static bool js_renderer_Model_addInputAssembler(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_addInputAssembler : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::InputAssembler* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Model_addInputAssembler : Error processing arguments"); - cobj->addInputAssembler(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_addInputAssembler) - -static bool js_renderer_Model_setViewId(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_setViewId : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - int arg0 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Model_setViewId : Error processing arguments"); - cobj->setViewId(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_setViewId) - -SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_Model_finalize) - -static bool js_renderer_Model_constructor(se::State& s) -{ - cocos2d::renderer::Model* cobj = new (std::nothrow) cocos2d::renderer::Model(); - s.thisObject()->setPrivateData(cobj); - return true; -} -SE_BIND_CTOR(js_renderer_Model_constructor, __jsb_cocos2d_renderer_Model_class, js_cocos2d_renderer_Model_finalize) - - - - -static bool js_cocos2d_renderer_Model_finalize(se::State& s) -{ - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Model)", s.nativeThisObject()); - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); - return true; -} -SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Model_finalize) - -bool js_register_renderer_Model(se::Object* obj) -{ - auto cls = se::Class::create("Model", obj, nullptr, _SE(js_renderer_Model_constructor)); - - cls->defineFunction("getInputAssemblerCount", _SE(js_renderer_Model_getInputAssemblerCount)); - cls->defineFunction("getDrawItemCount", _SE(js_renderer_Model_getDrawItemCount)); - cls->defineFunction("getWorldMatrix", _SE(js_renderer_Model_getWorldMatrix)); - cls->defineFunction("isDynamicIA", _SE(js_renderer_Model_isDynamicIA)); - cls->defineFunction("addEffect", _SE(js_renderer_Model_addEffect)); - cls->defineFunction("setWorldMatix", _SE(js_renderer_Model_setWorldMatix)); - cls->defineFunction("clearEffects", _SE(js_renderer_Model_clearEffects)); - cls->defineFunction("setDynamicIA", _SE(js_renderer_Model_setDynamicIA)); - cls->defineFunction("getViewId", _SE(js_renderer_Model_getViewId)); - cls->defineFunction("clearInputAssemblers", _SE(js_renderer_Model_clearInputAssemblers)); - cls->defineFunction("addInputAssembler", _SE(js_renderer_Model_addInputAssembler)); - cls->defineFunction("setViewId", _SE(js_renderer_Model_setViewId)); - cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Model_finalize)); - cls->install(); - JSBClassType::registerClass(cls); - - __jsb_cocos2d_renderer_Model_proto = cls->getProto(); - __jsb_cocos2d_renderer_Model_class = cls; - - se::ScriptEngine::getInstance()->clearException(); - return true; -} - se::Object* __jsb_cocos2d_renderer_BaseRenderer_proto = nullptr; se::Class* __jsb_cocos2d_renderer_BaseRenderer_class = nullptr; @@ -481,12 +213,14 @@ SE_BIND_CTOR(js_renderer_BaseRenderer_constructor, __jsb_cocos2d_renderer_BaseRe static bool js_cocos2d_renderer_BaseRenderer_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::BaseRenderer)", s.nativeThisObject()); cocos2d::renderer::BaseRenderer* cobj = (cocos2d::renderer::BaseRenderer*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_BaseRenderer_finalize) @@ -540,25 +274,6 @@ static bool js_renderer_ForwardRenderer_init(se::State& s) } SE_BIND_FUNC(js_renderer_ForwardRenderer_init) -static bool js_renderer_ForwardRenderer_render(se::State& s) -{ - cocos2d::renderer::ForwardRenderer* cobj = (cocos2d::renderer::ForwardRenderer*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_ForwardRenderer_render : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::Scene* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_ForwardRenderer_render : Error processing arguments"); - cobj->render(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_ForwardRenderer_render) - SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_ForwardRenderer_finalize) static bool js_renderer_ForwardRenderer_constructor(se::State& s) @@ -575,12 +290,6 @@ extern se::Object* __jsb_cocos2d_renderer_BaseRenderer_proto; static bool js_cocos2d_renderer_ForwardRenderer_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::ForwardRenderer)", s.nativeThisObject()); - cocos2d::renderer::ForwardRenderer* cobj = (cocos2d::renderer::ForwardRenderer*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_ForwardRenderer_finalize) @@ -590,7 +299,6 @@ bool js_register_renderer_ForwardRenderer(se::Object* obj) auto cls = se::Class::create("ForwardRenderer", obj, __jsb_cocos2d_renderer_BaseRenderer_proto, _SE(js_renderer_ForwardRenderer_constructor)); cls->defineFunction("init", _SE(js_renderer_ForwardRenderer_init)); - cls->defineFunction("render", _SE(js_renderer_ForwardRenderer_render)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_ForwardRenderer_finalize)); cls->install(); JSBClassType::registerClass(cls); @@ -620,12 +328,6 @@ SE_BIND_CTOR(js_renderer_View_constructor, __jsb_cocos2d_renderer_View_class, js static bool js_cocos2d_renderer_View_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::View)", s.nativeThisObject()); - cocos2d::renderer::View* cobj = (cocos2d::renderer::View*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_View_finalize) @@ -1083,12 +785,14 @@ SE_BIND_CTOR(js_renderer_Camera_constructor, __jsb_cocos2d_renderer_Camera_class static bool js_cocos2d_renderer_Camera_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Camera)", s.nativeThisObject()); cocos2d::renderer::Camera* cobj = (cocos2d::renderer::Camera*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Camera_finalize) @@ -1130,238 +834,9 @@ bool js_register_renderer_Camera(se::Object* obj) return true; } -se::Object* __jsb_cocos2d_renderer_Technique_proto = nullptr; -se::Class* __jsb_cocos2d_renderer_Technique_class = nullptr; - -static bool js_renderer_Technique_getStageIDs(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_getStageIDs : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getStageIDs(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_getStageIDs : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Technique_getStageIDs) - -static bool js_renderer_Technique_setPass(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_setPass : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 2) { - int arg0 = 0; - cocos2d::renderer::Pass* arg1 = nullptr; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); - ok &= seval_to_native_ptr(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_setPass : Error processing arguments"); - cobj->setPass(arg0, arg1); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); - return false; -} -SE_BIND_FUNC(js_renderer_Technique_setPass) - -static bool js_renderer_Technique_setStages(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_setStages : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - std::vector arg0; - ok &= seval_to_std_vector_string(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_setStages : Error processing arguments"); - cobj->setStages(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Technique_setStages) - -static bool js_renderer_Technique_getPasses(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_getPasses : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - const cocos2d::Vector& result = cobj->getPasses(); - ok &= Vector_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_getPasses : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Technique_getPasses) - -static bool js_renderer_Technique_getParameters(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_getParameters : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - const std::vector& result = cobj->getParameters(); - ok &= std_vector_TechniqueParameter_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_getParameters : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Technique_getParameters) - -SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_Technique_finalize) - -static bool js_renderer_Technique_constructor(se::State& s) -{ - CC_UNUSED bool ok = true; - const auto& args = s.args(); - std::vector arg0; - std::vector arg1; - cocos2d::Vector arg2; - ok &= seval_to_std_vector_string(args[0], &arg0); - ok &= seval_to_std_vector_TechniqueParameter(args[1], &arg1); - ok &= seval_to_Vector(args[2], &arg2); - SE_PRECONDITION2(ok, false, "js_renderer_Technique_constructor : Error processing arguments"); - cocos2d::renderer::Technique* cobj = new (std::nothrow) cocos2d::renderer::Technique(arg0, arg1, arg2); - s.thisObject()->setPrivateData(cobj); - return true; -} -SE_BIND_CTOR(js_renderer_Technique_constructor, __jsb_cocos2d_renderer_Technique_class, js_cocos2d_renderer_Technique_finalize) - - - - -static bool js_cocos2d_renderer_Technique_finalize(se::State& s) -{ - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Technique)", s.nativeThisObject()); - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); - return true; -} -SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Technique_finalize) - -bool js_register_renderer_Technique(se::Object* obj) -{ - auto cls = se::Class::create("Technique", obj, nullptr, _SE(js_renderer_Technique_constructor)); - - cls->defineFunction("getStageIDs", _SE(js_renderer_Technique_getStageIDs)); - cls->defineFunction("setPass", _SE(js_renderer_Technique_setPass)); - cls->defineFunction("setStages", _SE(js_renderer_Technique_setStages)); - cls->defineFunction("getPasses", _SE(js_renderer_Technique_getPasses)); - cls->defineFunction("getParameters", _SE(js_renderer_Technique_getParameters)); - cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Technique_finalize)); - cls->install(); - JSBClassType::registerClass(cls); - - __jsb_cocos2d_renderer_Technique_proto = cls->getProto(); - __jsb_cocos2d_renderer_Technique_class = cls; - - se::ScriptEngine::getInstance()->clearException(); - return true; -} - se::Object* __jsb_cocos2d_renderer_Effect_proto = nullptr; se::Class* __jsb_cocos2d_renderer_Effect_class = nullptr; -static bool js_renderer_Effect_getDefineValue(se::State& s) -{ - cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Effect_getDefineValue : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - std::string arg0; - ok &= seval_to_std_string(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getDefineValue : Error processing arguments"); - cocos2d::Value result = cobj->getDefineValue(arg0); - ok &= ccvalue_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getDefineValue : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Effect_getDefineValue) - -static bool js_renderer_Effect_getProperty(se::State& s) -{ - cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Effect_getProperty : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - std::string arg0; - ok &= seval_to_std_string(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getProperty : Error processing arguments"); - const cocos2d::renderer::Technique::Parameter& result = cobj->getProperty(arg0); - ok &= TechniqueParameter_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getProperty : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Effect_getProperty) - -static bool js_renderer_Effect_clear(se::State& s) -{ - cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Effect_clear : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) { - cobj->clear(); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Effect_clear) - -static bool js_renderer_Effect_getTechnique(se::State& s) -{ - cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Effect_getTechnique : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - std::string arg0; - ok &= seval_to_std_string(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getTechnique : Error processing arguments"); - cocos2d::renderer::Technique* result = cobj->getTechnique(arg0); - ok &= native_ptr_to_seval((cocos2d::renderer::Technique*)result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Effect_getTechnique : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Effect_getTechnique) - static bool js_renderer_Effect_setDefineValue(se::State& s) { cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); @@ -1383,6 +858,21 @@ static bool js_renderer_Effect_setDefineValue(se::State& s) } SE_BIND_FUNC(js_renderer_Effect_setDefineValue) +static bool js_renderer_Effect_clear(se::State& s) +{ + cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_Effect_clear : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + if (argc == 0) { + cobj->clear(); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); + return false; +} +SE_BIND_FUNC(js_renderer_Effect_clear) + SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_Effect_finalize) static bool js_renderer_Effect_constructor(se::State& s) @@ -1407,25 +897,24 @@ SE_BIND_CTOR(js_renderer_Effect_constructor, __jsb_cocos2d_renderer_Effect_class static bool js_cocos2d_renderer_Effect_finalize(se::State& s) { + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Effect)", s.nativeThisObject()); cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); if (cobj->getReferenceCount() == 1) cobj->autorelease(); else cobj->release(); + return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Effect_finalize) bool js_register_renderer_Effect(se::Object* obj) { - auto cls = se::Class::create("Effect", obj, nullptr, _SE(js_renderer_Effect_constructor)); + auto cls = se::Class::create("EffectNative", obj, nullptr, _SE(js_renderer_Effect_constructor)); - cls->defineFunction("getDefineValue", _SE(js_renderer_Effect_getDefineValue)); - cls->defineFunction("getProperty", _SE(js_renderer_Effect_getProperty)); + cls->defineFunction("setDefineValue", _SE(js_renderer_Effect_setDefineValue)); cls->defineFunction("clear", _SE(js_renderer_Effect_clear)); - cls->defineFunction("getTechnique", _SE(js_renderer_Effect_getTechnique)); - cls->defineFunction("define", _SE(js_renderer_Effect_setDefineValue)); cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Effect_finalize)); cls->install(); JSBClassType::registerClass(cls); @@ -1437,300 +926,6 @@ bool js_register_renderer_Effect(se::Object* obj) return true; } -se::Object* __jsb_cocos2d_renderer_InputAssembler_proto = nullptr; -se::Class* __jsb_cocos2d_renderer_InputAssembler_class = nullptr; - -static bool js_renderer_InputAssembler_setVertexBuffer(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_setVertexBuffer : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::VertexBuffer* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_setVertexBuffer : Error processing arguments"); - cobj->setVertexBuffer(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_setVertexBuffer) - -static bool js_renderer_InputAssembler_getStart(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getStart : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - int result = cobj->getStart(); - ok &= int32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getStart : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getStart) - -static bool js_renderer_InputAssembler_setStart(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_setStart : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - int arg0 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_setStart : Error processing arguments"); - cobj->setStart(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_setStart) - -static bool js_renderer_InputAssembler_setPrimitiveType(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_setPrimitiveType : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::PrimitiveType arg0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::PrimitiveType)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_setPrimitiveType : Error processing arguments"); - cobj->setPrimitiveType(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_setPrimitiveType) - -static bool js_renderer_InputAssembler_getPrimitiveCount(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getPrimitiveCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getPrimitiveCount(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getPrimitiveCount : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getPrimitiveCount) - -static bool js_renderer_InputAssembler_setCount(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_setCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - int arg0 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_setCount : Error processing arguments"); - cobj->setCount(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_setCount) - -static bool js_renderer_InputAssembler_init(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_init : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 2) { - cocos2d::renderer::VertexBuffer* arg0 = nullptr; - cocos2d::renderer::IndexBuffer* arg1 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - ok &= seval_to_native_ptr(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_init : Error processing arguments"); - bool result = cobj->init(arg0, arg1); - ok &= boolean_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_init : Error processing arguments"); - return true; - } - if (argc == 3) { - cocos2d::renderer::VertexBuffer* arg0 = nullptr; - cocos2d::renderer::IndexBuffer* arg1 = nullptr; - cocos2d::renderer::PrimitiveType arg2; - ok &= seval_to_native_ptr(args[0], &arg0); - ok &= seval_to_native_ptr(args[1], &arg1); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::PrimitiveType)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_init : Error processing arguments"); - bool result = cobj->init(arg0, arg1, arg2); - ok &= boolean_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_init : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 3); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_init) - -static bool js_renderer_InputAssembler_getVertexBuffer(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getVertexBuffer : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cocos2d::renderer::VertexBuffer* result = cobj->getVertexBuffer(); - ok &= native_ptr_to_seval((cocos2d::renderer::VertexBuffer*)result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getVertexBuffer : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getVertexBuffer) - -static bool js_renderer_InputAssembler_getIndexBuffer(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getIndexBuffer : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cocos2d::renderer::IndexBuffer* result = cobj->getIndexBuffer(); - ok &= native_ptr_to_seval((cocos2d::renderer::IndexBuffer*)result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getIndexBuffer : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getIndexBuffer) - -static bool js_renderer_InputAssembler_getCount(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - int result = cobj->getCount(); - ok &= int32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getCount : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getCount) - -static bool js_renderer_InputAssembler_getPrimitiveType(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_getPrimitiveType : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - int result = (int)cobj->getPrimitiveType(); - ok &= int32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_getPrimitiveType : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_getPrimitiveType) - -static bool js_renderer_InputAssembler_setIndexBuffer(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_InputAssembler_setIndexBuffer : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::IndexBuffer* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_InputAssembler_setIndexBuffer : Error processing arguments"); - cobj->setIndexBuffer(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_InputAssembler_setIndexBuffer) - -SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_InputAssembler_finalize) - -static bool js_renderer_InputAssembler_constructor(se::State& s) -{ - cocos2d::renderer::InputAssembler* cobj = new (std::nothrow) cocos2d::renderer::InputAssembler(); - s.thisObject()->setPrivateData(cobj); - return true; -} -SE_BIND_CTOR(js_renderer_InputAssembler_constructor, __jsb_cocos2d_renderer_InputAssembler_class, js_cocos2d_renderer_InputAssembler_finalize) - - - - -static bool js_cocos2d_renderer_InputAssembler_finalize(se::State& s) -{ - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::InputAssembler)", s.nativeThisObject()); - cocos2d::renderer::InputAssembler* cobj = (cocos2d::renderer::InputAssembler*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); - return true; -} -SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_InputAssembler_finalize) - -bool js_register_renderer_InputAssembler(se::Object* obj) -{ - auto cls = se::Class::create("InputAssembler", obj, nullptr, _SE(js_renderer_InputAssembler_constructor)); - - cls->defineFunction("setVertexBuffer", _SE(js_renderer_InputAssembler_setVertexBuffer)); - cls->defineFunction("getStart", _SE(js_renderer_InputAssembler_getStart)); - cls->defineFunction("setStart", _SE(js_renderer_InputAssembler_setStart)); - cls->defineFunction("setPrimitiveType", _SE(js_renderer_InputAssembler_setPrimitiveType)); - cls->defineFunction("getPrimitiveCount", _SE(js_renderer_InputAssembler_getPrimitiveCount)); - cls->defineFunction("setCount", _SE(js_renderer_InputAssembler_setCount)); - cls->defineFunction("init", _SE(js_renderer_InputAssembler_init)); - cls->defineFunction("getVertexBuffer", _SE(js_renderer_InputAssembler_getVertexBuffer)); - cls->defineFunction("getIndexBuffer", _SE(js_renderer_InputAssembler_getIndexBuffer)); - cls->defineFunction("getCount", _SE(js_renderer_InputAssembler_getCount)); - cls->defineFunction("getPrimitiveType", _SE(js_renderer_InputAssembler_getPrimitiveType)); - cls->defineFunction("setIndexBuffer", _SE(js_renderer_InputAssembler_setIndexBuffer)); - cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_InputAssembler_finalize)); - cls->install(); - JSBClassType::registerClass(cls); - - __jsb_cocos2d_renderer_InputAssembler_proto = cls->getProto(); - __jsb_cocos2d_renderer_InputAssembler_class = cls; - - se::ScriptEngine::getInstance()->clearException(); - return true; -} - se::Object* __jsb_cocos2d_renderer_Light_proto = nullptr; se::Class* __jsb_cocos2d_renderer_Light_class = nullptr; @@ -2381,12 +1576,6 @@ SE_BIND_CTOR(js_renderer_Light_constructor, __jsb_cocos2d_renderer_Light_class, static bool js_cocos2d_renderer_Light_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Light)", s.nativeThisObject()); - cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Light_finalize) @@ -2440,481 +1629,6 @@ bool js_register_renderer_Light(se::Object* obj) return true; } -se::Object* __jsb_cocos2d_renderer_Pass_proto = nullptr; -se::Class* __jsb_cocos2d_renderer_Pass_class = nullptr; - -static bool js_renderer_Pass_getStencilTest(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_getStencilTest : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - bool result = cobj->getStencilTest(); - ok &= boolean_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_getStencilTest : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_getStencilTest) - -static bool js_renderer_Pass_setStencilBack(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setStencilBack : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cobj->setStencilBack(); - return true; - } - if (argc == 1) { - cocos2d::renderer::ComparisonFunc arg0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0); - return true; - } - if (argc == 2) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1); - return true; - } - if (argc == 3) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1, arg2); - return true; - } - if (argc == 4) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1, arg2, arg3); - return true; - } - if (argc == 5) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1, arg2, arg3, arg4); - return true; - } - if (argc == 6) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - cocos2d::renderer::StencilOp arg5; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1, arg2, arg3, arg4, arg5); - return true; - } - if (argc == 7) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - cocos2d::renderer::StencilOp arg5; - uint8_t arg6; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::StencilOp)tmp; } while(false); - ok &= seval_to_uint8(args[6], (uint8_t*)&arg6); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilBack : Error processing arguments"); - cobj->setStencilBack(arg0, arg1, arg2, arg3, arg4, arg5, arg6); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 7); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setStencilBack) - -static bool js_renderer_Pass_setStencilTest(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setStencilTest : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - bool arg0; - ok &= seval_to_boolean(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilTest : Error processing arguments"); - cobj->setStencilTest(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setStencilTest) - -static bool js_renderer_Pass_setCullMode(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setCullMode : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::CullMode arg0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::CullMode)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setCullMode : Error processing arguments"); - cobj->setCullMode(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setCullMode) - -static bool js_renderer_Pass_setBlend(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setBlend : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cobj->setBlend(); - return true; - } - if (argc == 1) { - cocos2d::renderer::BlendOp arg0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0); - return true; - } - if (argc == 2) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1); - return true; - } - if (argc == 3) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - cocos2d::renderer::BlendFactor arg2; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1, arg2); - return true; - } - if (argc == 4) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - cocos2d::renderer::BlendFactor arg2; - cocos2d::renderer::BlendOp arg3; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::BlendOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1, arg2, arg3); - return true; - } - if (argc == 5) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - cocos2d::renderer::BlendFactor arg2; - cocos2d::renderer::BlendOp arg3; - cocos2d::renderer::BlendFactor arg4; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1, arg2, arg3, arg4); - return true; - } - if (argc == 6) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - cocos2d::renderer::BlendFactor arg2; - cocos2d::renderer::BlendOp arg3; - cocos2d::renderer::BlendFactor arg4; - cocos2d::renderer::BlendFactor arg5; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1, arg2, arg3, arg4, arg5); - return true; - } - if (argc == 7) { - cocos2d::renderer::BlendOp arg0; - cocos2d::renderer::BlendFactor arg1; - cocos2d::renderer::BlendFactor arg2; - cocos2d::renderer::BlendOp arg3; - cocos2d::renderer::BlendFactor arg4; - cocos2d::renderer::BlendFactor arg5; - unsigned int arg6 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[1], &tmp); arg1 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::BlendOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::BlendFactor)tmp; } while(false); - ok &= seval_to_uint32(args[6], (uint32_t*)&arg6); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setBlend : Error processing arguments"); - cobj->setBlend(arg0, arg1, arg2, arg3, arg4, arg5, arg6); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 7); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setBlend) - -static bool js_renderer_Pass_setStencilFront(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setStencilFront : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cobj->setStencilFront(); - return true; - } - if (argc == 1) { - cocos2d::renderer::ComparisonFunc arg0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0); - return true; - } - if (argc == 2) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1); - return true; - } - if (argc == 3) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1, arg2); - return true; - } - if (argc == 4) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1, arg2, arg3); - return true; - } - if (argc == 5) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1, arg2, arg3, arg4); - return true; - } - if (argc == 6) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - cocos2d::renderer::StencilOp arg5; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::StencilOp)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1, arg2, arg3, arg4, arg5); - return true; - } - if (argc == 7) { - cocos2d::renderer::ComparisonFunc arg0; - unsigned int arg1 = 0; - uint8_t arg2; - cocos2d::renderer::StencilOp arg3; - cocos2d::renderer::StencilOp arg4; - cocos2d::renderer::StencilOp arg5; - uint8_t arg6; - do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - ok &= seval_to_uint32(args[1], (uint32_t*)&arg1); - ok &= seval_to_uint8(args[2], (uint8_t*)&arg2); - do { int32_t tmp = 0; ok &= seval_to_int32(args[3], &tmp); arg3 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[4], &tmp); arg4 = (cocos2d::renderer::StencilOp)tmp; } while(false); - do { int32_t tmp = 0; ok &= seval_to_int32(args[5], &tmp); arg5 = (cocos2d::renderer::StencilOp)tmp; } while(false); - ok &= seval_to_uint8(args[6], (uint8_t*)&arg6); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setStencilFront : Error processing arguments"); - cobj->setStencilFront(arg0, arg1, arg2, arg3, arg4, arg5, arg6); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 7); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setStencilFront) - -static bool js_renderer_Pass_setDepth(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_setDepth : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - cobj->setDepth(); - return true; - } - if (argc == 1) { - bool arg0; - ok &= seval_to_boolean(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setDepth : Error processing arguments"); - cobj->setDepth(arg0); - return true; - } - if (argc == 2) { - bool arg0; - bool arg1; - ok &= seval_to_boolean(args[0], &arg0); - ok &= seval_to_boolean(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setDepth : Error processing arguments"); - cobj->setDepth(arg0, arg1); - return true; - } - if (argc == 3) { - bool arg0; - bool arg1; - cocos2d::renderer::ComparisonFunc arg2; - ok &= seval_to_boolean(args[0], &arg0); - ok &= seval_to_boolean(args[1], &arg1); - do { int32_t tmp = 0; ok &= seval_to_int32(args[2], &tmp); arg2 = (cocos2d::renderer::ComparisonFunc)tmp; } while(false); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_setDepth : Error processing arguments"); - cobj->setDepth(arg0, arg1, arg2); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 3); - return false; -} -SE_BIND_FUNC(js_renderer_Pass_setDepth) - -SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_Pass_finalize) - -static bool js_renderer_Pass_constructor(se::State& s) -{ - CC_UNUSED bool ok = true; - const auto& args = s.args(); - std::string arg0; - ok &= seval_to_std_string(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_constructor : Error processing arguments"); - cocos2d::renderer::Pass* cobj = new (std::nothrow) cocos2d::renderer::Pass(arg0); - s.thisObject()->setPrivateData(cobj); - return true; -} -SE_BIND_CTOR(js_renderer_Pass_constructor, __jsb_cocos2d_renderer_Pass_class, js_cocos2d_renderer_Pass_finalize) - - - - -static bool js_cocos2d_renderer_Pass_finalize(se::State& s) -{ - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Pass)", s.nativeThisObject()); - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - if (cobj->getReferenceCount() == 1) - cobj->autorelease(); - else - cobj->release(); - return true; -} -SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Pass_finalize) - -bool js_register_renderer_Pass(se::Object* obj) -{ - auto cls = se::Class::create("Pass", obj, nullptr, _SE(js_renderer_Pass_constructor)); - - cls->defineFunction("getStencilTest", _SE(js_renderer_Pass_getStencilTest)); - cls->defineFunction("setStencilBack", _SE(js_renderer_Pass_setStencilBack)); - cls->defineFunction("setStencilTest", _SE(js_renderer_Pass_setStencilTest)); - cls->defineFunction("setCullMode", _SE(js_renderer_Pass_setCullMode)); - cls->defineFunction("setBlend", _SE(js_renderer_Pass_setBlend)); - cls->defineFunction("setStencilFront", _SE(js_renderer_Pass_setStencilFront)); - cls->defineFunction("setDepth", _SE(js_renderer_Pass_setDepth)); - cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Pass_finalize)); - cls->install(); - JSBClassType::registerClass(cls); - - __jsb_cocos2d_renderer_Pass_proto = cls->getProto(); - __jsb_cocos2d_renderer_Pass_class = cls; - - se::ScriptEngine::getInstance()->clearException(); - return true; -} - se::Object* __jsb_cocos2d_renderer_Scene_proto = nullptr; se::Class* __jsb_cocos2d_renderer_Scene_class = nullptr; @@ -3007,64 +1721,6 @@ static bool js_renderer_Scene_getLightCount(se::State& s) } SE_BIND_FUNC(js_renderer_Scene_getLightCount) -static bool js_renderer_Scene_getModel(se::State& s) -{ - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Scene_getModel : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - unsigned int arg0 = 0; - ok &= seval_to_uint32(args[0], (uint32_t*)&arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_getModel : Error processing arguments"); - cocos2d::renderer::Model* result = cobj->getModel(arg0); - ok &= native_ptr_to_seval((cocos2d::renderer::Model*)result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_getModel : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Scene_getModel) - -static bool js_renderer_Scene_removeModel(se::State& s) -{ - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Scene_removeModel : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::Model* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_removeModel : Error processing arguments"); - cobj->removeModel(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Scene_removeModel) - -static bool js_renderer_Scene_getModelCount(se::State& s) -{ - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Scene_getModelCount : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - unsigned int result = cobj->getModelCount(); - ok &= uint32_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_getModelCount : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Scene_getModelCount) - static bool js_renderer_Scene_getCamera(se::State& s) { cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); @@ -3125,24 +1781,6 @@ static bool js_renderer_Scene_getCameras(se::State& s) } SE_BIND_FUNC(js_renderer_Scene_getCameras) -static bool js_renderer_Scene_getModels(se::State& s) -{ - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Scene_getModels : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 0) { - const cocos2d::Vector& result = cobj->getModels(); - ok &= Vector_to_seval(result, &s.rval()); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_getModels : Error processing arguments"); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Scene_getModels) - static bool js_renderer_Scene_addView(se::State& s) { cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); @@ -3181,25 +1819,6 @@ static bool js_renderer_Scene_setDebugCamera(se::State& s) } SE_BIND_FUNC(js_renderer_Scene_setDebugCamera) -static bool js_renderer_Scene_addModel(se::State& s) -{ - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Scene_addModel : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - cocos2d::renderer::Model* arg0 = nullptr; - ok &= seval_to_native_ptr(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Scene_addModel : Error processing arguments"); - cobj->addModel(arg0); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Scene_addModel) - static bool js_renderer_Scene_removeView(se::State& s) { cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); @@ -3273,14 +1892,6 @@ SE_BIND_CTOR(js_renderer_Scene_constructor, __jsb_cocos2d_renderer_Scene_class, static bool js_cocos2d_renderer_Scene_finalize(se::State& s) { - CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Scene)", s.nativeThisObject()); - auto iter = se::NonRefNativePtrCreatedByCtorMap::find(s.nativeThisObject()); - if (iter != se::NonRefNativePtrCreatedByCtorMap::end()) - { - se::NonRefNativePtrCreatedByCtorMap::erase(iter); - cocos2d::renderer::Scene* cobj = (cocos2d::renderer::Scene*)s.nativeThisObject(); - delete cobj; - } return true; } SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Scene_finalize) @@ -3294,16 +1905,11 @@ bool js_register_renderer_Scene(se::Object* obj) cls->defineFunction("addCamera", _SE(js_renderer_Scene_addCamera)); cls->defineFunction("removeCamera", _SE(js_renderer_Scene_removeCamera)); cls->defineFunction("getLightCount", _SE(js_renderer_Scene_getLightCount)); - cls->defineFunction("getModel", _SE(js_renderer_Scene_getModel)); - cls->defineFunction("removeModel", _SE(js_renderer_Scene_removeModel)); - cls->defineFunction("getModelCount", _SE(js_renderer_Scene_getModelCount)); cls->defineFunction("getCamera", _SE(js_renderer_Scene_getCamera)); cls->defineFunction("getLight", _SE(js_renderer_Scene_getLight)); cls->defineFunction("getCameras", _SE(js_renderer_Scene_getCameras)); - cls->defineFunction("getModels", _SE(js_renderer_Scene_getModels)); cls->defineFunction("addView", _SE(js_renderer_Scene_addView)); cls->defineFunction("setDebugCamera", _SE(js_renderer_Scene_setDebugCamera)); - cls->defineFunction("addModel", _SE(js_renderer_Scene_addModel)); cls->defineFunction("removeView", _SE(js_renderer_Scene_removeView)); cls->defineFunction("addLight", _SE(js_renderer_Scene_addLight)); cls->defineFunction("removeLight", _SE(js_renderer_Scene_removeLight)); @@ -3332,14 +1938,10 @@ bool register_all_renderer(se::Object* obj) js_register_renderer_ProgramLib(ns); js_register_renderer_Light(ns); - js_register_renderer_Technique(ns); js_register_renderer_Effect(ns); js_register_renderer_Scene(ns); js_register_renderer_Camera(ns); js_register_renderer_BaseRenderer(ns); - js_register_renderer_Pass(ns); - js_register_renderer_InputAssembler(ns); - js_register_renderer_Model(ns); js_register_renderer_ForwardRenderer(ns); js_register_renderer_View(ns); return true; diff --git a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp index 6fcbd567dd..751dd0122e 100644 --- a/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp +++ b/native/cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp @@ -13,25 +13,6 @@ SE_DECLARE_FUNC(js_renderer_ProgramLib_define); SE_DECLARE_FUNC(js_renderer_ProgramLib_getKey); SE_DECLARE_FUNC(js_renderer_ProgramLib_ProgramLib); -extern se::Object* __jsb_cocos2d_renderer_Model_proto; -extern se::Class* __jsb_cocos2d_renderer_Model_class; - -bool js_register_cocos2d_renderer_Model(se::Object* obj); -bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_Model_getInputAssemblerCount); -SE_DECLARE_FUNC(js_renderer_Model_getDrawItemCount); -SE_DECLARE_FUNC(js_renderer_Model_getWorldMatrix); -SE_DECLARE_FUNC(js_renderer_Model_isDynamicIA); -SE_DECLARE_FUNC(js_renderer_Model_addEffect); -SE_DECLARE_FUNC(js_renderer_Model_setWorldMatix); -SE_DECLARE_FUNC(js_renderer_Model_clearEffects); -SE_DECLARE_FUNC(js_renderer_Model_setDynamicIA); -SE_DECLARE_FUNC(js_renderer_Model_getViewId); -SE_DECLARE_FUNC(js_renderer_Model_clearInputAssemblers); -SE_DECLARE_FUNC(js_renderer_Model_addInputAssembler); -SE_DECLARE_FUNC(js_renderer_Model_setViewId); -SE_DECLARE_FUNC(js_renderer_Model_Model); - extern se::Object* __jsb_cocos2d_renderer_BaseRenderer_proto; extern se::Class* __jsb_cocos2d_renderer_BaseRenderer_class; @@ -47,7 +28,6 @@ extern se::Class* __jsb_cocos2d_renderer_ForwardRenderer_class; bool js_register_cocos2d_renderer_ForwardRenderer(se::Object* obj); bool register_all_renderer(se::Object* obj); SE_DECLARE_FUNC(js_renderer_ForwardRenderer_init); -SE_DECLARE_FUNC(js_renderer_ForwardRenderer_render); SE_DECLARE_FUNC(js_renderer_ForwardRenderer_ForwardRenderer); extern se::Object* __jsb_cocos2d_renderer_View_proto; @@ -86,49 +66,15 @@ SE_DECLARE_FUNC(js_renderer_Camera_getNear); SE_DECLARE_FUNC(js_renderer_Camera_getClearFlags); SE_DECLARE_FUNC(js_renderer_Camera_Camera); -extern se::Object* __jsb_cocos2d_renderer_Technique_proto; -extern se::Class* __jsb_cocos2d_renderer_Technique_class; - -bool js_register_cocos2d_renderer_Technique(se::Object* obj); -bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_Technique_getStageIDs); -SE_DECLARE_FUNC(js_renderer_Technique_setPass); -SE_DECLARE_FUNC(js_renderer_Technique_setStages); -SE_DECLARE_FUNC(js_renderer_Technique_getPasses); -SE_DECLARE_FUNC(js_renderer_Technique_getParameters); -SE_DECLARE_FUNC(js_renderer_Technique_Technique); - extern se::Object* __jsb_cocos2d_renderer_Effect_proto; extern se::Class* __jsb_cocos2d_renderer_Effect_class; bool js_register_cocos2d_renderer_Effect(se::Object* obj); bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_Effect_getDefineValue); -SE_DECLARE_FUNC(js_renderer_Effect_getProperty); -SE_DECLARE_FUNC(js_renderer_Effect_clear); -SE_DECLARE_FUNC(js_renderer_Effect_getTechnique); SE_DECLARE_FUNC(js_renderer_Effect_setDefineValue); +SE_DECLARE_FUNC(js_renderer_Effect_clear); SE_DECLARE_FUNC(js_renderer_Effect_Effect); -extern se::Object* __jsb_cocos2d_renderer_InputAssembler_proto; -extern se::Class* __jsb_cocos2d_renderer_InputAssembler_class; - -bool js_register_cocos2d_renderer_InputAssembler(se::Object* obj); -bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_InputAssembler_setVertexBuffer); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getStart); -SE_DECLARE_FUNC(js_renderer_InputAssembler_setStart); -SE_DECLARE_FUNC(js_renderer_InputAssembler_setPrimitiveType); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getPrimitiveCount); -SE_DECLARE_FUNC(js_renderer_InputAssembler_setCount); -SE_DECLARE_FUNC(js_renderer_InputAssembler_init); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getVertexBuffer); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getIndexBuffer); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getCount); -SE_DECLARE_FUNC(js_renderer_InputAssembler_getPrimitiveType); -SE_DECLARE_FUNC(js_renderer_InputAssembler_setIndexBuffer); -SE_DECLARE_FUNC(js_renderer_InputAssembler_InputAssembler); - extern se::Object* __jsb_cocos2d_renderer_Light_proto; extern se::Class* __jsb_cocos2d_renderer_Light_class; @@ -170,20 +116,6 @@ SE_DECLARE_FUNC(js_renderer_Light_getShadowResolution); SE_DECLARE_FUNC(js_renderer_Light_setShadowBias); SE_DECLARE_FUNC(js_renderer_Light_Light); -extern se::Object* __jsb_cocos2d_renderer_Pass_proto; -extern se::Class* __jsb_cocos2d_renderer_Pass_class; - -bool js_register_cocos2d_renderer_Pass(se::Object* obj); -bool register_all_renderer(se::Object* obj); -SE_DECLARE_FUNC(js_renderer_Pass_getStencilTest); -SE_DECLARE_FUNC(js_renderer_Pass_setStencilBack); -SE_DECLARE_FUNC(js_renderer_Pass_setStencilTest); -SE_DECLARE_FUNC(js_renderer_Pass_setCullMode); -SE_DECLARE_FUNC(js_renderer_Pass_setBlend); -SE_DECLARE_FUNC(js_renderer_Pass_setStencilFront); -SE_DECLARE_FUNC(js_renderer_Pass_setDepth); -SE_DECLARE_FUNC(js_renderer_Pass_Pass); - extern se::Object* __jsb_cocos2d_renderer_Scene_proto; extern se::Class* __jsb_cocos2d_renderer_Scene_class; @@ -194,16 +126,11 @@ SE_DECLARE_FUNC(js_renderer_Scene_getCameraCount); SE_DECLARE_FUNC(js_renderer_Scene_addCamera); SE_DECLARE_FUNC(js_renderer_Scene_removeCamera); SE_DECLARE_FUNC(js_renderer_Scene_getLightCount); -SE_DECLARE_FUNC(js_renderer_Scene_getModel); -SE_DECLARE_FUNC(js_renderer_Scene_removeModel); -SE_DECLARE_FUNC(js_renderer_Scene_getModelCount); SE_DECLARE_FUNC(js_renderer_Scene_getCamera); SE_DECLARE_FUNC(js_renderer_Scene_getLight); SE_DECLARE_FUNC(js_renderer_Scene_getCameras); -SE_DECLARE_FUNC(js_renderer_Scene_getModels); SE_DECLARE_FUNC(js_renderer_Scene_addView); SE_DECLARE_FUNC(js_renderer_Scene_setDebugCamera); -SE_DECLARE_FUNC(js_renderer_Scene_addModel); SE_DECLARE_FUNC(js_renderer_Scene_removeView); SE_DECLARE_FUNC(js_renderer_Scene_addLight); SE_DECLARE_FUNC(js_renderer_Scene_removeLight); diff --git a/native/cocos/scripting/js-bindings/jswrapper/jsc/Utils.cpp b/native/cocos/scripting/js-bindings/jswrapper/jsc/Utils.cpp index 79eec58543..43d1f4ec3d 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/jsc/Utils.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/jsc/Utils.cpp @@ -82,7 +82,7 @@ namespace se { setter = JSObjectMakeFunctionWithCallback(__cx, nullptr, jsSetter); } - assert(getter != nullptr); + assert(getter != nullptr || setter != nullptr); if (getter != nullptr) { diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/HelperMacros.h b/native/cocos/scripting/js-bindings/jswrapper/v8/HelperMacros.h index f3af3aba92..222ae3051a 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/HelperMacros.h +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/HelperMacros.h @@ -51,6 +51,7 @@ v8::HandleScope _hs(_isolate); \ SE_UNUSED unsigned argc = (unsigned)_v8args.Length(); \ se::ValueArray args; \ + args.reserve(10); \ se::internal::jsToSeArgs(_v8args, &args); \ void* nativeThisObject = se::internal::getPrivate(_isolate, _v8args.This()); \ se::State state(nativeThisObject, args); \ @@ -87,6 +88,7 @@ v8::HandleScope _hs(_isolate); \ bool ret = true; \ se::ValueArray args; \ + args.reserve(10); \ se::internal::jsToSeArgs(_v8args, &args); \ se::Object* thisObject = se::Object::_createJSObject(cls, _v8args.This()); \ thisObject->_setFinalizeCallback(_SE(finalizeCb)); \ @@ -130,6 +132,7 @@ se::Value data; \ se::internal::jsToSeValue(_isolate, _value, &data); \ se::ValueArray args; \ + args.reserve(10); \ args.push_back(std::move(data)); \ se::State state(nativeThisObject, args); \ ret = funcName(state); \ diff --git a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp index 79c08e24d7..233cf2be67 100644 --- a/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp +++ b/native/cocos/scripting/js-bindings/jswrapper/v8/Object.cpp @@ -481,6 +481,7 @@ namespace se { } size_t argc = 0; std::vector> argv; + argv.reserve(10); argc = args.size(); internal::seToJsArgs(__isolate, args, &argv); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp index 704eb53036..1a525b973f 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_cocos2dx_manual.cpp @@ -419,7 +419,7 @@ static bool register_canvas_context2d(se::Object* obj) _SE_DEFINE_PROP(CanvasRenderingContext2D, strokeStyle) _SE_DEFINE_PROP(CanvasRenderingContext2D, globalCompositeOperation) - __jsb_cocos2d_CanvasRenderingContext2D_proto->defineFunction("setCanvasBufferUpdatedCallback", _SE(js_cocos2dx_CanvasRenderingContext2D_setCanvasBufferUpdatedCallback)); + __jsb_cocos2d_CanvasRenderingContext2D_proto->defineFunction("_setCanvasBufferUpdatedCallback", _SE(js_cocos2dx_CanvasRenderingContext2D_setCanvasBufferUpdatedCallback)); se::ScriptEngine::getInstance()->clearException(); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index 887f44f6ad..b76adce15c 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -8,6 +8,7 @@ #include "jsb_conversions.hpp" #include +#include // seval to native @@ -351,39 +352,14 @@ bool seval_to_Mat4(const se::Value& v, cocos2d::Mat4* mat) } else { - se::Value tmp; - obj->getProperty("m00", &tmp); - mat->m[0] = tmp.toFloat(); - obj->getProperty("m01", &tmp); - mat->m[1] = tmp.toFloat(); - obj->getProperty("m02", &tmp); - mat->m[2] = tmp.toFloat(); - obj->getProperty("m03", &tmp); - mat->m[3] = tmp.toFloat(); - obj->getProperty("m04", &tmp); - mat->m[4] = tmp.toFloat(); - obj->getProperty("m05", &tmp); - mat->m[5] = tmp.toFloat(); - obj->getProperty("m06", &tmp); - mat->m[6] = tmp.toFloat(); - obj->getProperty("m07", &tmp); - mat->m[7] = tmp.toFloat(); - obj->getProperty("m08", &tmp); - mat->m[8] = tmp.toFloat(); - obj->getProperty("m09", &tmp); - mat->m[9] = tmp.toFloat(); - obj->getProperty("m10", &tmp); - mat->m[10] = tmp.toFloat(); - obj->getProperty("m11", &tmp); - mat->m[11] = tmp.toFloat(); - obj->getProperty("m12", &tmp); - mat->m[12] = tmp.toFloat(); - obj->getProperty("m13", &tmp); - mat->m[13] = tmp.toFloat(); - obj->getProperty("m14", &tmp); - mat->m[14] = tmp.toFloat(); - obj->getProperty("m15", &tmp); - mat->m[15] = tmp.toFloat(); + // typed array + assert(obj->isTypedArray()); + + size_t length = 0; + uint8_t* ptr = nullptr; + obj->getTypedArrayData(&ptr, &length); + + memcpy(mat->m, ptr, length); } return true; @@ -880,6 +856,83 @@ bool seval_to_std_vector_Vec2(const se::Value& v, std::vector* re return false; } +bool seval_to_Pass(const se::Value& passVal, cocos2d::renderer::Pass& pass) +{ + se::Object* passObj = passVal.toObject(); + + // program name + se::Value programNameVal; + passObj->getProperty("_programName", &programNameVal); + pass.setProgramName(programNameVal.toString()); + + se::Value binaryVal; + passObj->getProperty("_binary", &binaryVal); + uint8_t* data = nullptr; + size_t length = 0; + binaryVal.toObject()->getTypedArrayData(&data, &length); + uint32_t* binary32 = (uint32_t*)data; + + // cull mode + pass.setCullMode(static_cast(*binary32)); + + // blend + pass.setBlend(static_cast(*(binary32 + 1)), // blendEq + static_cast(*(binary32 + 2)), // blendSrc + static_cast(*(binary32 + 3)), // blendDst + static_cast(*(binary32 + 4)), // blendAlphaEq + static_cast(*(binary32 + 5)), // blendSrcAlpha + static_cast(*(binary32 + 6)), // blendDstAlpha + *(binary32 + 7)); // blend color + + // depth + pass.setDepth(*(binary32 + 8), // depth test + *(binary32 + 9), // depth write + static_cast(*(binary32 + 10))); // depth func + + // stencil front + pass.setStencilFront(static_cast(*(binary32 + 11)), // stencilFuncFront + *(binary32 + 12), // stencilRefFront + *(binary32 + 13), // stencilMaskFront + static_cast(*(binary32 + 14)), // stencilFailOpFront + static_cast(*(binary32 + 15)), // stencilZFailOpFront + static_cast(*(binary32 + 16)), // stencilZPassOpFront + *(binary32 + 17)); // stencilWrtieMaskFront + + // stencil back + pass.setStencilBack(static_cast(*(binary32 + 18)), // stencilFuncBack + *(binary32 + 19), // stencilRefBack + *(binary32 + 20), // stencilMaskBack + static_cast(*(binary32 + 21)), // stencilFailOpBack + static_cast(*(binary32 + 22)), // stencilZFailOpBack + static_cast(*(binary32 + 23)), // stencilZFailOpBack + *(binary32 + 24)); // stencilWrtieMaskBack + + return true; +} + +bool seval_to_std_vector_Pass(const se::Value& v, std::vector* ret) +{ + assert(ret != nullptr); + assert(v.isObject()); + se::Object* obj = v.toObject(); + assert(obj->isArray()); + uint32_t len = 0; + if (obj->getArrayLength(&len)) + { + se::Value value; + cocos2d::renderer::Pass pt; + for (uint32_t i = 0; i < len; ++i) + { + SE_PRECONDITION3(obj->getArrayElement(i, &value) && seval_to_Pass(value, pt), false, ret->clear()); + ret->push_back(std::move(pt)); + } + return true; + } + + ret->clear(); + return false; +} + //bool seval_to_std_vector_Touch(const se::Value& v, std::vector* ret) //{ // assert(ret != nullptr); @@ -1874,10 +1927,10 @@ bool seval_to_TechniqueParameter(const se::Value& v, cocos2d::renderer::Techniqu if (obj->getProperty("type", &tmp)) { - uint8_t v = 0; - ok = seval_to_uint8(tmp, &v); + uint8_t typeValue = 0; + ok = seval_to_uint8(tmp, &typeValue); SE_PRECONDITION2(ok, false, "Convert Parameter type failed!"); - type = (cocos2d::renderer::Technique::Parameter::Type)v; + type = (cocos2d::renderer::Technique::Parameter::Type)typeValue; } if (obj->getProperty("size", &tmp)) @@ -2038,6 +2091,17 @@ bool seval_to_std_vector_TechniqueParameter(const se::Value& v, std::vectorvert); SE_PRECONDITION2(ok, false, "Convert vert failed!"); + adjustShaderSource(ret->vert); } if (obj->getProperty("frag", &tmp)) { ok = seval_to_std_string(tmp, &ret->frag); SE_PRECONDITION2(ok, false, "Convert frag failed!"); + adjustShaderSource(ret->frag); } if (obj->getProperty("defines", &tmp)) @@ -2572,6 +2638,204 @@ bool std_map_string_string_to_seval(const std::map& v, return ok; } +namespace +{ + enum class DataType + { + INT, + FLOAT + }; + + void toVec2(void* data, DataType type, se::Value* ret) + { + int32_t* intptr = (int32_t*)data; + float* floatptr = (float*)data; + cocos2d::Vec2 vec2; + if (DataType::INT == type) + { + vec2.x = *intptr; + vec2.y = *(intptr + 1); + } + else + { + vec2.x = *floatptr; + vec2.y = *(floatptr + 1); + } + + Vec2_to_seval(vec2, ret); + } + + void toVec3(void* data, DataType type, se::Value* ret) + { + int32_t* intptr = (int32_t*)data; + float* floatptr = (float*)data; + cocos2d::Vec3 vec3; + if (DataType::INT == type) + { + vec3.x = *intptr; + vec3.y = *(intptr + 1); + vec3.z = *(intptr + 2); + } + else + { + vec3.x = *floatptr; + vec3.y = *(floatptr + 1); + vec3.z = *(floatptr + 2); + } + + Vec3_to_seval(vec3, ret); + } + + void toVec4(void* data, DataType type, se::Value* ret) + { + int32_t* intptr = (int32_t*)data; + float* floatptr = (float*)data; + cocos2d::Vec4 vec4; + if (DataType::INT == type) + { + vec4.x = *intptr; + vec4.y = *(intptr + 1); + vec4.z = *(intptr + 2); + vec4.w = *(intptr + 3); + } + else + { + vec4.x = *floatptr; + vec4.y = *(floatptr + 1); + vec4.z = *(floatptr + 2); + vec4.w = *(floatptr + 3); + } + + Vec4_to_seval(vec4, ret); + } + + void toMat(float* data, int num, se::Value* ret) + { + se::HandleObject obj(se::Object::createPlainObject()); + + char propName[4] = {0}; + for (int i = 0; i < num; ++i) + { + if (i < 10) + snprintf(propName, 3, "m0%d", i); + else + snprintf(propName, 3, "m%d", i); + + obj->setProperty(propName, se::Value(*(data + i))); + } + ret->setObject(obj); + } +} + + +bool EffectProperty_to_seval(const cocos2d::renderer::Effect::Property& v, se::Value* ret) +{ + assert(ret != nullptr); + + auto type = v.getType(); + if (type == cocos2d::renderer::Technique::Parameter::Type::TEXTURE_2D || type == cocos2d::renderer::Technique::Parameter::Type::TEXTURE_CUBE) + { + auto count = v.getCount(); + if (0 == count) + { + *ret = se::Value::Null; + } + else if (1 == count) + { + se::Value val; + native_ptr_to_seval(v.getTexture(), &val); + *ret = val; + } + else + { + auto texArray = v.getTextureArray(); + se::HandleObject arr(se::Object::createArrayObject(count)); + for (uint8_t i = 0; i < count; ++i) + { + se::Value val; + native_ptr_to_seval(texArray[0], &val); + arr->setArrayElement(i, val); + } + ret->setObject(arr); + } + } + else + { + void* data = v.getValue(); + + switch (type) { + case cocos2d::renderer::Technique::Parameter::Type::INT: + ret->setInt32(*((int32_t*)data)); + break; + case cocos2d::renderer::Technique::Parameter::Type::INT2: + toVec2(data, DataType::INT, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::INT3: + toVec3(data, DataType::INT, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::INT4: + toVec4(data, DataType::INT, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::FLOAT: + ret->setFloat(*((float*)data)); + break; + case cocos2d::renderer::Technique::Parameter::Type::FLOAT2: + toVec2(data, DataType::FLOAT, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::FLOAT3: + toVec3(data, DataType::FLOAT, ret); + case cocos2d::renderer::Technique::Parameter::Type::FLOAT4: + toVec4(data, DataType::FLOAT, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::MAT2: + toMat((float*)data, 4, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::MAT3: + toMat((float*)data, 9, ret); + break; + case cocos2d::renderer::Technique::Parameter::Type::MAT4: + toMat((float*)data, 16, ret); + break; + default: + assert(false); + break; + } + } + + return true; +} + +bool std_unorderedmap_string_EffectProperty_to_seval(const std::unordered_map& v, se::Value* ret) +{ + assert(ret != nullptr); + + se::HandleObject obj(se::Object::createPlainObject()); + bool ok = true; + for (const auto& e : v) + { + const std::string& key = e.first; + const cocos2d::renderer::Effect::Property& value = e.second; + + if (key.empty()) + continue; + + se::Value tmp; + if (!EffectProperty_to_seval(value, &tmp)) + { + ok = false; + ret->setUndefined(); + break; + } + + obj->setProperty(key.c_str(), tmp); + } + + if (ok) + ret->setObject(obj); + + return ok; +} + //FIXME: why v has to be a pointer? //bool uniform_to_seval(const cocos2d::Uniform* v, se::Value* ret) //{ @@ -2704,9 +2968,15 @@ bool std_map_string_string_to_seval(const std::map& v, bool Data_to_seval(const cocos2d::Data& v, se::Value* ret) { assert(ret != nullptr); - assert(!v.isNull()); - se::HandleObject obj(se::Object::createTypedArray(se::Object::TypedArrayType::UINT8, v.getBytes(), v.getSize())); - ret->setObject(obj); + if (v.isNull()) + { + ret->setNull(); + } + else + { + se::HandleObject obj(se::Object::createTypedArray(se::Object::TypedArrayType::UINT8, v.getBytes(), v.getSize())); + ret->setObject(obj); + } return true; } @@ -3099,165 +3369,23 @@ bool VertexFormat_to_seval(const cocos2d::renderer::VertexFormat& v, se::Value* return true; } -namespace -{ - enum class DataType - { - INT, - FLOAT - }; - - void toVec2(void* data, DataType type, se::Value* ret) - { - int32_t* intptr = (int32_t*)data; - float* floatptr = (float*)data; - cocos2d::Vec2 vec2; - if (DataType::INT == type) - { - vec2.x = *intptr; - vec2.y = *(intptr + 1); - } - else - { - vec2.x = *floatptr; - vec2.y = *(floatptr + 1); - } - - Vec2_to_seval(vec2, ret); - } - - void toVec3(void* data, DataType type, se::Value* ret) - { - int32_t* intptr = (int32_t*)data; - float* floatptr = (float*)data; - cocos2d::Vec3 vec3; - if (DataType::INT == type) - { - vec3.x = *intptr; - vec3.y = *(intptr + 1); - vec3.z = *(intptr + 2); - } - else - { - vec3.x = *floatptr; - vec3.y = *(floatptr + 1); - vec3.z = *(floatptr + 2); - } - - Vec3_to_seval(vec3, ret); - } - - void toVec4(void* data, DataType type, se::Value* ret) - { - int32_t* intptr = (int32_t*)data; - float* floatptr = (float*)data; - cocos2d::Vec4 vec4; - if (DataType::INT == type) - { - vec4.x = *intptr; - vec4.y = *(intptr + 1); - vec4.z = *(intptr + 2); - vec4.w = *(intptr + 3); - } - else - { - vec4.x = *floatptr; - vec4.y = *(floatptr + 1); - vec4.z = *(floatptr + 2); - vec4.w = *(floatptr + 3); - } - - Vec4_to_seval(vec4, ret); - } - - void toMat(float* data, int num, se::Value* ret) - { - se::HandleObject obj(se::Object::createPlainObject()); - - char propName[4] = {0}; - for (int i = 0; i < num; ++i) - { - if (i < 10) - snprintf(propName, 3, "m0%d", i); - else - snprintf(propName, 3, "m%d", i); - - obj->setProperty(propName, se::Value(*(data + i))); - } - ret->setObject(obj); - } -} - bool TechniqueParameter_to_seval(const cocos2d::renderer::Technique::Parameter& v, se::Value* ret) { assert(ret != nullptr); + // type + se::Object* param = se::Object::createPlainObject(); + se::Value typeVal; auto type = v.getType(); - if (type == cocos2d::renderer::Technique::Parameter::Type::TEXTURE_2D || type == cocos2d::renderer::Technique::Parameter::Type::TEXTURE_CUBE) - { - auto count = v.getCount(); - if (count > 1) - { - auto texArray = v.getTextureArray(); - se::HandleObject arr(se::Object::createArrayObject(count)); - for (uint8_t i = 0; i < count; ++i) - { - se::Value val; - native_ptr_to_seval(texArray[0], &val); - arr->setArrayElement(i, val); - } - ret->setObject(arr); - } - else - { - se::Value val; - native_ptr_to_seval(v.getTexture(), &val); - *ret = val; - } - } - else - { - void* data = v.getValue(); - - switch (type) { - case cocos2d::renderer::Technique::Parameter::Type::INT: - ret->setInt32(*((int32_t*)data)); - break; - case cocos2d::renderer::Technique::Parameter::Type::INT2: - toVec2(data, DataType::INT, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::INT3: - toVec3(data, DataType::INT, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::INT4: - toVec4(data, DataType::INT, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::FLOAT: - ret->setFloat(*((float*)data)); - break; - case cocos2d::renderer::Technique::Parameter::Type::FLOAT2: - toVec2(data, DataType::FLOAT, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::FLOAT3: - toVec3(data, DataType::FLOAT, ret); - case cocos2d::renderer::Technique::Parameter::Type::FLOAT4: - toVec4(data, DataType::FLOAT, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::MAT2: - toMat((float*)data, 4, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::MAT3: - toMat((float*)data, 9, ret); - break; - case cocos2d::renderer::Technique::Parameter::Type::MAT4: - toMat((float*)data, 16, ret); - break; - default: - assert(false); - break; - } - } - + int32_to_seval((int32_t)type, &typeVal); + param->setProperty("type", typeVal); + + // name + se::Value nameVal; + std_string_to_seval(v.getName(), &nameVal); + param->setProperty("name", nameVal); + + ret->setObject(param); return true; } @@ -3270,16 +3398,33 @@ bool std_vector_TechniqueParameter_to_seval(const std::vectorsetArrayElement(i, out); - ++i; - } + se::Value out = se::Value::Null; + TechniqueParameter_to_seval(param, &out); + arr->setArrayElement(i, out); + ++i; } return true; } +bool std_vector_EffectDefine_to_seval(const std::vector& v, se::Value* ret) +{ + assert(ret != nullptr); + se::HandleObject arr(se::Object::createArrayObject(v.size())); + ret->setObject(arr); + + uint32_t i = 0; + for (const auto&valueMap : v) + { + se::Value out = se::Value::Null; + ccvaluemap_to_seval(valueMap, &out); + arr->setArrayElement(i, out); + + ++i; + } + + return true; +} + bool std_vector_RenderTarget_to_seval(const std::vector& v, se::Value* ret) { assert(false); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp index f79b74c1e2..393e258b40 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.hpp @@ -83,6 +83,8 @@ bool seval_to_std_vector_string(const se::Value& v, std::vector* re bool seval_to_std_vector_int(const se::Value& v, std::vector* ret); bool seval_to_std_vector_float(const se::Value& v, std::vector* ret); bool seval_to_std_vector_Vec2(const se::Value& v, std::vector* ret); +bool seval_to_Pass(const se::Value& val, cocos2d::renderer::Pass& pass); +bool seval_to_std_vector_Pass(const se::Value& v, std::vector* ret); //bool seval_to_std_vector_Touch(const se::Value& v, std::vector* ret); bool seval_to_std_map_string_string(const se::Value& v, std::map* ret); bool seval_to_FontDefinition(const se::Value& v, cocos2d::FontDefinition* ret); @@ -247,6 +249,8 @@ bool std_vector_int_to_seval(const std::vector& v, se::Value* ret); bool std_vector_float_to_seval(const std::vector& v, se::Value* ret); //bool std_vector_Touch_to_seval(const std::vector& v, se::Value* ret); bool std_map_string_string_to_seval(const std::map& v, se::Value* ret); +bool std_unorderedmap_string_EffectProperty_to_seval(const std::unordered_map& v, se::Value* ret); +bool EffectProperty_to_seval(const cocos2d::renderer::Effect::Property& v, se::Value* ret); //bool uniform_to_seval(const cocos2d::Uniform* v, se::Value* ret); //bool FontDefinition_to_seval(const cocos2d::FontDefinition& v, se::Value* ret); //bool Acceleration_to_seval(const cocos2d::Acceleration* v, se::Value* ret); @@ -260,6 +264,7 @@ bool DownloadTask_to_seval(const cocos2d::network::DownloadTask& v, se::Value* r bool VertexFormat_to_seval(const cocos2d::renderer::VertexFormat& v, se::Value* ret); bool TechniqueParameter_to_seval(const cocos2d::renderer::Technique::Parameter& v, se::Value* ret); bool std_vector_TechniqueParameter_to_seval(const std::vector& v, se::Value* ret); +bool std_vector_EffectDefine_to_seval(const std::vector& v, se::Value* ret); template bool recreate_seval_by_native_ptr(typename std::enable_if::value,T>::type* v, se::Class* cls, se::Value* ret) diff --git a/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp index 79d51ba889..3ad54d5faa 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp @@ -143,13 +143,11 @@ static bool js_gfx_DeviceGraphics_setUniform(se::State& s) } SE_BIND_FUNC(js_gfx_DeviceGraphics_setUniform) -static VertexFormat getVertexFormatFromValue(const se::Value& v) +static VertexFormat* getVertexFormatFromValue(const se::Value& elementVal) { std::vector formatInfos; - se::Object* vertexFmt = v.toObject(); - se::Value elementVal; - if (vertexFmt->getProperty("_elements", &elementVal) && elementVal.isObject() && elementVal.toObject()->isArray()) + if (elementVal.isObject() && elementVal.toObject()->isArray()) { se::Object* fmtArr = elementVal.toObject(); uint32_t length = 0; @@ -178,8 +176,10 @@ static VertexFormat getVertexFormatFromValue(const se::Value& v) } } } + + auto vertexFormat = new VertexFormat(formatInfos); - return formatInfos; + return vertexFormat; } static bool js_gfx_VertexBuffer_init(se::State& s) @@ -193,7 +193,8 @@ static bool js_gfx_VertexBuffer_init(se::State& s) cocos2d::renderer::DeviceGraphics* device; ok &= seval_to_native_ptr(args[0], &device); - VertexFormat format = getVertexFormatFromValue(args[1]); +// VertexFormat* format = getVertexFormatFromValue(args[1]); + VertexFormat* format = static_cast(args[1].toObject()->getPrivateData()); Usage usage = (Usage) args[2].toUint16(); uint8_t* data = nullptr; size_t dataByteLength = 0; @@ -204,8 +205,8 @@ static bool js_gfx_VertexBuffer_init(se::State& s) if (arg3.isObject()) { typedArr = arg3.toObject(); - assert(typedArr->isTypedArray()); - ok = typedArr->getTypedArrayData(&data, &dataByteLength); + assert(typedArr->isArrayBuffer()); + ok = typedArr->getArrayBufferData(&data, &dataByteLength); assert(ok); } @@ -213,6 +214,7 @@ static bool js_gfx_VertexBuffer_init(se::State& s) assert(ok); cobj->init(device, format, usage, data, dataByteLength, numVertices); +// delete format; se::Object* thisObj = s.thisObject(); cobj->setFetchDataCallback([thisObj](size_t* bytes) ->uint8_t* { @@ -235,6 +237,17 @@ static bool js_gfx_VertexBuffer_init(se::State& s) } SE_BIND_FUNC(js_gfx_VertexBuffer_init) +static bool js_gfx_VertexBuffer_self(se::State& s) +{ + cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_VertexBuffer_update : Invalid Native Object"); + + auto addr = (unsigned long)cobj; + s.rval().setNumber(addr); + return true; +} +SE_BIND_FUNC(js_gfx_VertexBuffer_self) + // uint32_t offset, const void* data, size_t dataByteLength static bool js_gfx_VertexBuffer_update(se::State& s) { @@ -288,9 +301,12 @@ static bool js_gfx_VertexBuffer_prop_setFormat(se::State& s) const auto& args = s.args(); size_t argc = args.size(); CC_UNUSED bool ok = true; - if (argc == 1) { - VertexFormat format = getVertexFormatFromValue(args[0]); - cobj->setFormat(std::move(format)); + if (argc == 1) + { + se::Value formatVal; + args[0].toObject()->getProperty("_nativeObj", &formatVal); + auto format = static_cast(formatVal.toObject()->getPrivateData()); + cobj->setFormat(format); return true; } @@ -299,22 +315,22 @@ static bool js_gfx_VertexBuffer_prop_setFormat(se::State& s) } SE_BIND_PROP_SET(js_gfx_VertexBuffer_prop_setFormat) -static bool js_gfx_VertexBuffer_prop_getFormat(se::State& s) -{ - cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_gfx_VertexBuffer_prop_getFormat : Invalid Native Object"); - const auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - assert(false); //FIXME: - if (argc == 0) { - return true; - } - - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_PROP_GET(js_gfx_VertexBuffer_prop_getFormat) +//static bool js_gfx_VertexBuffer_prop_getFormat(se::State& s) +//{ +// cocos2d::renderer::VertexBuffer* cobj = (cocos2d::renderer::VertexBuffer*)s.nativeThisObject(); +// SE_PRECONDITION2(cobj, false, "js_gfx_VertexBuffer_prop_getFormat : Invalid Native Object"); +// const auto& args = s.args(); +// size_t argc = args.size(); +// CC_UNUSED bool ok = true; +// assert(false); //FIXME: +// if (argc == 0) { +// return true; +// } +// +// SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); +// return false; +//} +//SE_BIND_PROP_GET(js_gfx_VertexBuffer_prop_getFormat) static bool js_gfx_VertexBuffer_prop_setUsage(se::State& s) { @@ -452,8 +468,8 @@ static bool js_gfx_IndexBuffer_init(se::State& s) if (arg3.isObject()) { se::Object* typedArr = args[3].toObject(); - assert(typedArr->isTypedArray()); - ok = typedArr->getTypedArrayData(&data, &dataByteLength); + assert(typedArr->isArrayBuffer()); + ok = typedArr->getArrayBufferData(&data, &dataByteLength); assert(ok); } @@ -483,6 +499,17 @@ static bool js_gfx_IndexBuffer_init(se::State& s) } SE_BIND_FUNC(js_gfx_IndexBuffer_init) +static bool js_gfx_IndexBuffer_self(se::State& s) +{ + cocos2d::renderer::IndexBuffer* cobj = (cocos2d::renderer::IndexBuffer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_VertexBuffer_update : Invalid Native Object"); + + auto addr = (unsigned long)cobj; + s.rval().setNumber(addr); + return true; +} +SE_BIND_FUNC(js_gfx_IndexBuffer_self); + // uint32_t offset, const void* data, size_t dataByteLength static bool js_gfx_IndexBuffer_update(se::State& s) { @@ -793,17 +820,73 @@ static bool js_gfx_FrameBuffer_init(se::State& s) } SE_BIND_FUNC(js_gfx_FrameBuffer_init) +se::Object* __jsb_cocos2d_renderer_VertexFormat_proto = nullptr; +se::Class* __jsb_cocos2d_renderer_VertexFormat_class = nullptr; + +static bool js_cocos2d_renderer_VertexFormat_finalize(se::State& s) +{ + cocos2d::renderer::VertexFormat* cobj = (cocos2d::renderer::VertexFormat*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_gfx_VertexFormat_getElement : Invalid Native Object"); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_VertexFormat_finalize) + +static bool js_gfx_VertexFormat_constructor(se::State& s) +{ + CC_UNUSED bool ok = true; + const auto& args = s.args(); + size_t argc = args.size(); + if (1 == argc) + { + auto vertexFormat = getVertexFormatFromValue(args[0]); + s.thisObject()->setPrivateData(vertexFormat); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d", (int)argc); + return false; +} +SE_BIND_CTOR(js_gfx_VertexFormat_constructor, __jsb_cocos2d_renderer_VertexFormat_class, js_cocos2d_renderer_VertexFormat_finalize) + + +bool js_register_gfx_VertexFormat(se::Object* obj) +{ + auto cls = se::Class::create("VertexFormatNative", obj, nullptr, _SE(js_gfx_VertexFormat_constructor)); + cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_VertexFormat_finalize)); + cls->install(); + JSBClassType::registerClass(cls); + + __jsb_cocos2d_renderer_VertexFormat_proto = cls->getProto(); + __jsb_cocos2d_renderer_VertexFormat_class = cls; + + se::ScriptEngine::getInstance()->clearException(); + return true; +} + bool jsb_register_gfx_manual(se::Object* global) { + // Get the ns + se::Value nsVal; + if (!global->getProperty("gfx", &nsVal)) + { + se::HandleObject jsobj(se::Object::createPlainObject()); + nsVal.setObject(jsobj); + global->setProperty("gfx", nsVal); + } + se::Object* ns = nsVal.toObject(); + + js_register_gfx_VertexFormat(ns); + __jsb_cocos2d_renderer_DeviceGraphics_proto->defineFunction("clear", _SE(js_gfx_DeviceGraphics_clear)); __jsb_cocos2d_renderer_DeviceGraphics_proto->defineFunction("setUniform", _SE(js_gfx_DeviceGraphics_setUniform)); __jsb_cocos2d_renderer_VertexBuffer_proto->defineFunction("init", _SE(js_gfx_VertexBuffer_init)); __jsb_cocos2d_renderer_VertexBuffer_proto->defineFunction("update", _SE(js_gfx_VertexBuffer_update)); - __jsb_cocos2d_renderer_VertexBuffer_proto->defineProperty("_format", _SE(js_gfx_VertexBuffer_prop_getFormat), _SE(js_gfx_VertexBuffer_prop_setFormat)); + __jsb_cocos2d_renderer_VertexBuffer_proto->defineProperty("_format", nullptr, _SE(js_gfx_VertexBuffer_prop_setFormat)); __jsb_cocos2d_renderer_VertexBuffer_proto->defineProperty("_usage", _SE(js_gfx_VertexBuffer_prop_getUsage), _SE(js_gfx_VertexBuffer_prop_setUsage)); __jsb_cocos2d_renderer_VertexBuffer_proto->defineProperty("_bytes", _SE(js_gfx_VertexBuffer_prop_getBytes), _SE(js_gfx_VertexBuffer_prop_setBytes)); __jsb_cocos2d_renderer_VertexBuffer_proto->defineProperty("_numVertices", _SE(js_gfx_VertexBuffer_prop_getNumVertices), _SE(js_gfx_VertexBuffer_prop_setNumVertices)); + __jsb_cocos2d_renderer_VertexBuffer_proto->defineFunction("self", _SE(js_gfx_VertexBuffer_self)); __jsb_cocos2d_renderer_IndexBuffer_proto->defineFunction("init", _SE(js_gfx_IndexBuffer_init)); __jsb_cocos2d_renderer_IndexBuffer_proto->defineFunction("update", _SE(js_gfx_IndexBuffer_update)); @@ -812,6 +895,7 @@ bool jsb_register_gfx_manual(se::Object* global) __jsb_cocos2d_renderer_IndexBuffer_proto->defineProperty("_bytesPerIndex", _SE(js_gfx_IndexBuffer_prop_getBytesPerIndex), _SE(js_gfx_IndexBuffer_prop_setBytesPerIndex)); __jsb_cocos2d_renderer_IndexBuffer_proto->defineProperty("_bytes", _SE(js_gfx_IndexBuffer_prop_getBytes), _SE(js_gfx_IndexBuffer_prop_setBytes)); __jsb_cocos2d_renderer_IndexBuffer_proto->defineProperty("_numIndices", _SE(js_gfx_IndexBuffer_prop_getNumIndices), _SE(js_gfx_IndexBuffer_prop_setNumIndices)); + __jsb_cocos2d_renderer_IndexBuffer_proto->defineFunction("self", _SE(js_gfx_IndexBuffer_self)); __jsb_cocos2d_renderer_Texture2D_proto->defineFunction("init", _SE(js_gfx_Texture2D_init)); __jsb_cocos2d_renderer_FrameBuffer_proto->defineFunction("init", _SE(js_gfx_FrameBuffer_init)); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp index fc826c12cb..f857dd600a 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_global.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_global.cpp @@ -599,6 +599,8 @@ static bool js_loadImage(se::State& s) } else { + if (0 == path.find("file://")) + path = path.substr(strlen("file://")); fullPath = FileUtils::getInstance()->fullPathForFilename(path); if (fullPath.empty()) { @@ -764,7 +766,13 @@ bool jsb_register_global_variables(se::Object* global) getOrCreatePlainObject_r("jsb", global, &__jsbObj); getOrCreatePlainObject_r("__jsc__", global, &__jscObj); - getOrCreatePlainObject_r("gl", global, &__glObj); + + auto glContextCls = se::Class::create("WebGLRenderingContext", global, nullptr, nullptr); + glContextCls->install(); + + SAFE_DEC_REF(__glObj); + __glObj = se::Object::createObjectWithClass(glContextCls); + global->setProperty("__gl", se::Value(__glObj)); __jscObj->defineFunction("garbageCollect", _SE(jsc_garbageCollect)); __jscObj->defineFunction("dumpNativePtrToSeObjectMap", _SE(jsc_dumpNativePtrToSeObjectMap)); diff --git a/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp index edd7fc6406..9e0a0f3472 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp @@ -29,15 +29,333 @@ #include "cocos/scripting/js-bindings/manual/jsb_global.h" #include "cocos/scripting/js-bindings/manual/jsb_opengl_utils.hpp" #include "platform/CCGL.h" +#include "cocos/base/CCGLUtils.h" #include +using namespace cocos2d; + namespace { + const uint32_t GL_COMMAND_ACTIVE_TEXTURE = 0; + const uint32_t GL_COMMAND_ATTACH_SHADER = 1; + const uint32_t GL_COMMAND_BIND_ATTRIB_LOCATION = 2; + const uint32_t GL_COMMAND_BIND_BUFFER = 3; + const uint32_t GL_COMMAND_BIND_FRAME_BUFFER = 4; + const uint32_t GL_COMMAND_BIND_RENDER_BUFFER = 5; + const uint32_t GL_COMMAND_BIND_TEXTURE = 6; + const uint32_t GL_COMMAND_BLEND_COLOR = 7; + const uint32_t GL_COMMAND_BLEND_EQUATION = 8; + const uint32_t GL_COMMAND_BLEND_EQUATION_SEPARATE = 9; + const uint32_t GL_COMMAND_BLEND_FUNC = 10; + const uint32_t GL_COMMAND_BLEND_FUNC_SEPARATE = 11; + const uint32_t GL_COMMAND_BUFFER_DATA = 12; + const uint32_t GL_COMMAND_BUFFER_SUB_DATA = 13; + const uint32_t GL_COMMAND_CLEAR = 14; + const uint32_t GL_COMMAND_CLEAR_COLOR = 15; + const uint32_t GL_COMMAND_CLEAR_DEPTH = 16; + const uint32_t GL_COMMAND_CLEAR_STENCIL = 17; + const uint32_t GL_COMMAND_COLOR_MASK = 18; + const uint32_t GL_COMMAND_COMMIT = 19; + const uint32_t GL_COMMAND_COMPILE_SHADER = 20; + const uint32_t GL_COMMAND_COMPRESSED_TEX_IMAGE_2D = 21; + const uint32_t GL_COMMAND_COMPRESSED_TEX_SUB_IMAGE_2D = 22; + const uint32_t GL_COMMAND_COPY_TEX_IMAGE_2D = 23; + const uint32_t GL_COMMAND_COPY_TEX_SUB_IMAGE_2D = 24; + const uint32_t GL_COMMAND_CULL_FACE = 25; + const uint32_t GL_COMMAND_DELETE_BUFFER = 26; + const uint32_t GL_COMMAND_DELETE_FRAME_BUFFER = 27; + const uint32_t GL_COMMAND_DELETE_PROGRAM = 28; + const uint32_t GL_COMMAND_DELETE_RENDER_BUFFER = 29; + const uint32_t GL_COMMAND_DELETE_SHADER = 30; + const uint32_t GL_COMMAND_DELETE_TEXTURE = 31; + const uint32_t GL_COMMAND_DEPTH_FUNC = 32; + const uint32_t GL_COMMAND_DEPTH_MASK = 33; + const uint32_t GL_COMMAND_DEPTH_RANGE = 34; + const uint32_t GL_COMMAND_DETACH_SHADER = 35; + const uint32_t GL_COMMAND_DISABLE = 36; + const uint32_t GL_COMMAND_DISABLE_VERTEX_ATTRIB_ARRAY = 37; + const uint32_t GL_COMMAND_DRAW_ARRAYS = 38; + const uint32_t GL_COMMAND_DRAW_ELEMENTS = 39; + const uint32_t GL_COMMAND_ENABLE = 40; + const uint32_t GL_COMMAND_ENABLE_VERTEX_ATTRIB_ARRAY = 41; + const uint32_t GL_COMMAND_FINISH = 42; + const uint32_t GL_COMMAND_FLUSH = 43; + const uint32_t GL_COMMAND_FRAME_BUFFER_RENDER_BUFFER = 44; + const uint32_t GL_COMMAND_FRAME_BUFFER_TEXTURE_2D = 45; + const uint32_t GL_COMMAND_FRONT_FACE = 46; + const uint32_t GL_COMMAND_GENERATE_MIPMAP = 47; + const uint32_t GL_COMMAND_HINT = 48; + const uint32_t GL_COMMAND_LINE_WIDTH = 49; + const uint32_t GL_COMMAND_LINK_PROGRAM = 50; + const uint32_t GL_COMMAND_PIXEL_STOREI = 51; + const uint32_t GL_COMMAND_POLYGON_OFFSET = 52; + const uint32_t GL_COMMAND_RENDER_BUFFER_STORAGE = 53; + const uint32_t GL_COMMAND_SAMPLE_COVERAGE = 54; + const uint32_t GL_COMMAND_SCISSOR = 55; + const uint32_t GL_COMMAND_SHADER_SOURCE = 56; + const uint32_t GL_COMMAND_STENCIL_FUNC = 57; + const uint32_t GL_COMMAND_STENCIL_FUNC_SEPARATE = 58; + const uint32_t GL_COMMAND_STENCIL_MASK = 59; + const uint32_t GL_COMMAND_STENCIL_MASK_SEPARATE = 60; + const uint32_t GL_COMMAND_STENCIL_OP = 61; + const uint32_t GL_COMMAND_STENCIL_OP_SEPARATE = 62; + const uint32_t GL_COMMAND_TEX_IMAGE_2D = 63; + const uint32_t GL_COMMAND_TEX_PARAMETER_F = 64; + const uint32_t GL_COMMAND_TEX_PARAMETER_I = 65; + const uint32_t GL_COMMAND_TEX_SUB_IMAGE_2D = 66; + const uint32_t GL_COMMAND_UNIFORM_1F = 67; + const uint32_t GL_COMMAND_UNIFORM_1FV = 68; + const uint32_t GL_COMMAND_UNIFORM_1I = 69; + const uint32_t GL_COMMAND_UNIFORM_1IV = 70; + const uint32_t GL_COMMAND_UNIFORM_2F = 71; + const uint32_t GL_COMMAND_UNIFORM_2FV = 72; + const uint32_t GL_COMMAND_UNIFORM_2I = 73; + const uint32_t GL_COMMAND_UNIFORM_2IV = 74; + const uint32_t GL_COMMAND_UNIFORM_3F = 75; + const uint32_t GL_COMMAND_UNIFORM_3FV = 76; + const uint32_t GL_COMMAND_UNIFORM_3I = 77; + const uint32_t GL_COMMAND_UNIFORM_3IV = 78; + const uint32_t GL_COMMAND_UNIFORM_4F = 79; + const uint32_t GL_COMMAND_UNIFORM_4FV = 80; + const uint32_t GL_COMMAND_UNIFORM_4I = 81; + const uint32_t GL_COMMAND_UNIFORM_4IV = 82; + const uint32_t GL_COMMAND_UNIFORM_MATRIX_2FV = 83; + const uint32_t GL_COMMAND_UNIFORM_MATRIX_3FV = 84; + const uint32_t GL_COMMAND_UNIFORM_MATRIX_4FV = 85; + const uint32_t GL_COMMAND_USE_PROGRAM = 86; + const uint32_t GL_COMMAND_VALIDATE_PROGRAM = 87; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_1F = 88; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_2F = 89; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_3F = 90; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_4F = 91; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_1FV = 92; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_2FV = 93; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_3FV = 94; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_4FV = 95; + const uint32_t GL_COMMAND_VERTEX_ATTRIB_POINTER = 96; + const uint32_t GL_COMMAND_VIEW_PORT = 97; + + GLint __defaultFbo = 0; + + se::Class* __jsb_WebGLObject_class = nullptr; + se::Class* __jsb_WebGLTexture_class = nullptr; + se::Class* __jsb_WebGLBuffer_class = nullptr; + se::Class* __jsb_WebGLRenderbuffer_class = nullptr; + se::Class* __jsb_WebGLFramebuffer_class = nullptr; + se::Class* __jsb_WebGLProgram_class = nullptr; + se::Class* __jsb_WebGLShader_class = nullptr; + se::Class* __jsb_WebGLActiveInfo_class = nullptr; + se::Class* __jsb_WebGLUniformLocation_class = nullptr; + + std::unordered_map __shaders; + + class WebGLObject; + + using WebGLObjectMap = std::unordered_map; + WebGLObjectMap __webglTextureMap; + WebGLObjectMap __webglBufferMap; + WebGLObjectMap __webglRenderbufferMap; + WebGLObjectMap __webglFramebufferMap; + WebGLObjectMap __webglProgramMap; + WebGLObjectMap __webglShaderMap; + bool __unpackFlipY = false; bool __premultiplyAlpha = false; - GLint __defaultFbo = 0; + inline void WEBGL_framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) + { + if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) + { + glFramebufferRenderbuffer(target, GL_DEPTH_ATTACHMENT, renderbuffertarget, renderbuffer); + glFramebufferRenderbuffer(target, GL_STENCIL_ATTACHMENT, renderbuffertarget, renderbuffer); + } + else + { + glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); + } + } + + inline void WEBGL_renderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) + { + if (internalformat == GL_DEPTH_STENCIL ) + internalformat = GL_DEPTH24_STENCIL8; + + glRenderbufferStorage(target, internalformat, width, height); + } + + inline void WEBGL_pixelStorei(GLenum pname, GLint param) + { + if (pname == GL_UNPACK_FLIP_Y_WEBGL) + { + __unpackFlipY = param == 0 ? false : true; + return; + } + else if (pname == GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL) + { + __premultiplyAlpha = param == 0 ? false : true; + return; + } + else if (pname == GL_UNPACK_COLORSPACE_CONVERSION_WEBGL) + { + SE_LOGE("Warning: UNPACK_COLORSPACE_CONVERSION_WEBGL is unsupported\n"); + return; + } + + glPixelStorei(pname, param); + } + + class WebGLObject + { + public: + enum class Type { + TEXTURE, + BUFFER, + RENDER_BUFFER, + FRAME_BUFFER, + PROGRAM, + SHADER + }; + + protected: + WebGLObject(Type type, GLuint id) + : _type(type) + , _id(id) + {} + + public: + virtual ~WebGLObject() + {} + + GLuint _id; + Type _type; + }; + + void safeRemoveElementFromGLObjectMap(WebGLObjectMap& map, GLuint id) + { + auto iter = map.find(id); + if (iter != map.end()) { + if (iter->second->_type == WebGLObject::Type::FRAME_BUFFER) + iter->second->_id = __defaultFbo; + else + iter->second->_id = 0; + map.erase(iter); + } + } + + class WebGLTexture final : public WebGLObject + { + public: + WebGLTexture(GLuint id) + : WebGLObject(Type::TEXTURE, id) + { + __webglTextureMap.emplace(id, this); + } + virtual ~WebGLTexture() + { + if (_id != 0) + { + SE_LOGD("Destroy WebGLTexture (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(ccDeleteTextures(1, &_id)); + safeRemoveElementFromGLObjectMap(__webglTextureMap, _id); + } + } + }; + + class WebGLBuffer final : public WebGLObject + { + public: + WebGLBuffer(GLuint id) + : WebGLObject(Type::BUFFER, id) + { + __webglBufferMap.emplace(id, this); + } + virtual ~WebGLBuffer() + { + if (_id != 0) + { + SE_LOGD("Destroy WebGLBuffer (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(ccDeleteBuffers(1, &_id)); + safeRemoveElementFromGLObjectMap(__webglBufferMap, _id); + } + } + }; + + class WebGLRenderbuffer final : public WebGLObject + { + public: + WebGLRenderbuffer(GLuint id) + : WebGLObject(Type::RENDER_BUFFER, id) + { + __webglRenderbufferMap.emplace(id, this); + } + virtual ~WebGLRenderbuffer() + { + if (_id != 0) + { + SE_LOGD("Destroy WebGLRenderbuffer (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(glDeleteRenderbuffers(1, &_id)); + safeRemoveElementFromGLObjectMap(__webglRenderbufferMap, _id); + } + } + }; + + class WebGLFramebuffer final : public WebGLObject + { + public: + WebGLFramebuffer(GLuint id) + : WebGLObject(Type::FRAME_BUFFER, id) + { + __webglFramebufferMap.emplace(id, this); + } + virtual ~WebGLFramebuffer() + { + if (_id != __defaultFbo) + { + SE_LOGD("Destroy WebGLFramebuffer (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(glDeleteFramebuffers(1, &_id)); + safeRemoveElementFromGLObjectMap(__webglFramebufferMap, _id); + } + } + }; + + class WebGLProgram final : public WebGLObject + { + public: + WebGLProgram(GLuint id) + : WebGLObject(Type::PROGRAM, id) + { + __webglProgramMap.emplace(id, this); + } + virtual ~WebGLProgram() + { + if (_id != 0) + { + SE_LOGD("Destroy WebGLProgram (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(glDeleteProgram(_id)); + safeRemoveElementFromGLObjectMap(__webglProgramMap, _id); + } + } + }; + + class WebGLShader final : public WebGLObject + { + public: + WebGLShader(GLuint id) + : WebGLObject(Type::SHADER, id) + { + __webglShaderMap.emplace(id, this); + } + virtual ~WebGLShader() + { + if (_id != 0) + { + SE_LOGD("Destroy WebGLShader (%u) by GC\n", _id); + JSB_GL_CHECK_VOID(glDeleteShader(_id)); + safeRemoveElementFromGLObjectMap(__webglShaderMap, _id); + } + } + }; //FIXME:cjh: ONLY SUPPORT RGBA format now. void flipPixelsY(GLubyte *pixels, int bytesPerRow, int rows) @@ -334,8 +652,8 @@ static bool JSB_glActiveTexture(se::State& s) { ok &= seval_to_uint32(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glActiveTexture((GLenum)arg0)); - s.rval().setUndefined(); + JSB_GL_CHECK(ccActiveTexture((GLenum)arg0)); + return true; } SE_BIND_FUNC(JSB_glActiveTexture) @@ -347,15 +665,16 @@ static bool JSB_glAttachShader(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; - - ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); + WebGLProgram* arg0; + WebGLShader* arg1; + ok &= seval_to_native_ptr(args[0], &arg0); + ok &= seval_to_native_ptr(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glAttachShader((GLuint)arg0 , (GLuint)arg1 )); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; + GLuint shaderId = arg1 != nullptr ? arg1->_id : 0; + JSB_GL_CHECK(glAttachShader(programId, shaderId)); - s.rval().setUndefined(); return true; } SE_BIND_FUNC(JSB_glAttachShader) @@ -367,34 +686,34 @@ static bool JSB_glBindAttribLocation(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 3, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; std::string arg2; + WebGLProgram* arg0; + uint32_t arg1; + std::string arg2; - ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); - ok &= seval_to_std_string(args[2], &arg2 ); + ok &= seval_to_native_ptr(args[0], &arg0); + ok &= seval_to_uint32(args[1], &arg1); + ok &= seval_to_std_string(args[2], &arg2); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glBindAttribLocation((GLuint)arg0 , (GLuint)arg1 , arg2.c_str() )); - s.rval().setUndefined(); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glBindAttribLocation(programId, (GLuint)arg1 , arg2.c_str())); + return true; } SE_BIND_FUNC(JSB_glBindAttribLocation) -// Arguments: GLenum, GLuint -// Ret value: void static bool JSB_glBindBuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; - + uint32_t arg0; + WebGLBuffer* arg1; ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); + ok &= seval_to_native_ptr(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glBindBuffer((GLenum)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + GLuint bufferId = arg1 != nullptr ? arg1->_id : 0; + JSB_GL_CHECK(ccBindBuffer((GLenum)arg0 , bufferId)); return true; } SE_BIND_FUNC(JSB_glBindBuffer) @@ -406,22 +725,14 @@ static bool JSB_glBindFramebuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; + uint32_t arg0; WebGLFramebuffer* arg1; ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[1], &arg1); + SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint frameBufferId = arg1 != nullptr ? arg1->_id : __defaultFbo; - if (args[1].isNullOrUndefined()) - { - arg1 = __defaultFbo; - } - else - { - ok &= seval_to_uint32(args[1], &arg1 ); - SE_PRECONDITION2(ok, false, "Error processing arguments"); - } - - JSB_GL_CHECK(glBindFramebuffer((GLenum)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + JSB_GL_CHECK(glBindFramebuffer((GLenum)arg0 , frameBufferId)); return true; } SE_BIND_FUNC(JSB_glBindFramebuffer) @@ -433,14 +744,14 @@ static bool JSB_glBindRenderbuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; + uint32_t arg0; + WebGLRenderbuffer* arg1; - ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); + ok &= seval_to_uint32(args[0], &arg0); + ok &= seval_to_native_ptr(args[1], &arg1); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glBindRenderbuffer((GLenum)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + GLuint renderBufferId = arg1 != nullptr ? arg1->_id : 0; + JSB_GL_CHECK(glBindRenderbuffer((GLenum)arg0, renderBufferId)); return true; } SE_BIND_FUNC(JSB_glBindRenderbuffer) @@ -452,14 +763,15 @@ static bool JSB_glBindTexture(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; + uint32_t arg0; + WebGLTexture* arg1 = nullptr; ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); + ok &= seval_to_native_ptr(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glBindTexture((GLenum)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + GLuint textureId = arg1 != nullptr ? arg1->_id : 0; + JSB_GL_CHECK(ccBindTexture((GLenum)arg0 , textureId)); return true; } SE_BIND_FUNC(JSB_glBindTexture) @@ -480,7 +792,7 @@ static bool JSB_glBlendColor(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBlendColor((GLclampf)arg0 , (GLclampf)arg1 , (GLclampf)arg2 , (GLclampf)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBlendColor) @@ -498,7 +810,7 @@ static bool JSB_glBlendEquation(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBlendEquation((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBlendEquation) @@ -517,7 +829,7 @@ static bool JSB_glBlendEquationSeparate(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBlendEquationSeparate((GLenum)arg0 , (GLenum)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBlendEquationSeparate) @@ -536,7 +848,7 @@ static bool JSB_glBlendFunc(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBlendFunc((GLenum)arg0 , (GLenum)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBlendFunc) @@ -557,7 +869,7 @@ static bool JSB_glBlendFuncSeparate(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBlendFuncSeparate((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , (GLenum)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBlendFuncSeparate) @@ -586,7 +898,7 @@ static bool JSB_glBufferData(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBufferData((GLenum)arg0 , count, (GLvoid*)arg1 , (GLenum)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBufferData) @@ -618,7 +930,7 @@ static bool JSB_glBufferSubData(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glBufferSubData((GLenum)arg0 , (GLintptr)arg1 , count, (GLvoid*)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glBufferSubData) @@ -654,8 +966,7 @@ static bool JSB_glClear(se::State& s) { ok &= seval_to_uint32(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glClear((GLbitfield)arg0 )); - s.rval().setUndefined(); + JSB_GL_CHECK(glClear((GLbitfield)arg0)); return true; } SE_BIND_FUNC(JSB_glClear) @@ -676,7 +987,7 @@ static bool JSB_glClearColor(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glClearColor((GLclampf)arg0 , (GLclampf)arg1 , (GLclampf)arg2 , (GLclampf)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glClearColor) @@ -694,7 +1005,7 @@ static bool JSB_glClearDepthf(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glClearDepthf((GLclampf)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glClearDepthf) @@ -712,7 +1023,7 @@ static bool JSB_glClearStencil(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glClearStencil((GLint)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glClearStencil) @@ -733,7 +1044,7 @@ static bool JSB_glColorMask(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glColorMask((GLboolean)arg0 , (GLboolean)arg1 , (GLboolean)arg2 , (GLboolean)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glColorMask) @@ -745,13 +1056,11 @@ static bool JSB_glCompileShader(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLShader* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glCompileShader((GLuint)arg0 )); - s.rval().setUndefined(); + GLuint shaderId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glCompileShader(shaderId)); return true; } SE_BIND_FUNC(JSB_glCompileShader) @@ -777,7 +1086,7 @@ static bool JSB_glCompressedTexImage2D(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glCompressedTexImage2D((GLenum)arg0 , (GLint)arg1 , (GLenum)arg2 , (GLsizei)arg3 , (GLsizei)arg4 , (GLint)arg5 , (GLsizei)arg6 , (GLvoid*)arg7 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glCompressedTexImage2D) @@ -804,7 +1113,7 @@ static bool JSB_glCompressedTexSubImage2D(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glCompressedTexSubImage2D((GLenum)arg0 , (GLint)arg1 , (GLint)arg2 , (GLint)arg3 , (GLsizei)arg4 , (GLsizei)arg5 , (GLenum)arg6 , (GLsizei)arg7 , (GLvoid*)arg8 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glCompressedTexSubImage2D) @@ -829,7 +1138,7 @@ static bool JSB_glCopyTexImage2D(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glCopyTexImage2D((GLenum)arg0 , (GLint)arg1 , (GLenum)arg2 , (GLint)arg3 , (GLint)arg4 , (GLsizei)arg5 , (GLsizei)arg6 , (GLint)arg7 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glCopyTexImage2D) @@ -854,25 +1163,35 @@ static bool JSB_glCopyTexSubImage2D(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glCopyTexSubImage2D((GLenum)arg0 , (GLint)arg1 , (GLint)arg2 , (GLint)arg3 , (GLint)arg4 , (GLint)arg5 , (GLsizei)arg6 , (GLsizei)arg7 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glCopyTexSubImage2D) -// Arguments: -// Ret value: GLuint static bool JSB_glCreateProgram(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2( argc == 0, false, "Invalid number of arguments" ); - GLuint ret_val; + GLuint id = glCreateProgram(); - ret_val = glCreateProgram(); - s.rval().setUint32((uint32_t)ret_val); + auto obj = se::Object::createObjectWithClass(__jsb_WebGLProgram_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(id)); + auto cobj = new (std::nothrow) WebGLProgram(id); + obj->setPrivateData(cobj); return true; } SE_BIND_FUNC(JSB_glCreateProgram) +static bool JSB_glProgramFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLProgram)", s.nativeThisObject()); + WebGLProgram* cobj = (WebGLProgram*) s.nativeThisObject(); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glProgramFinalize) + // Arguments: GLenum // Ret value: GLuint static bool JSB_glCreateShader(se::State& s) { @@ -884,14 +1203,30 @@ static bool JSB_glCreateShader(se::State& s) { ok &= seval_to_uint32(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLuint ret_val; + GLuint ret_val = glCreateShader((GLenum)arg0); - ret_val = glCreateShader((GLenum)arg0); - s.rval().setUint32((uint32_t)ret_val); + se::Object* obj = se::Object::createObjectWithClass(__jsb_WebGLShader_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(ret_val)); + WebGLShader* shader = new (std::nothrow) WebGLShader(ret_val); + obj->setPrivateData(shader); + __shaders.emplace(shader->_id, s.rval()); return true; } SE_BIND_FUNC(JSB_glCreateShader) +static bool JSB_glShaderFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLShader)", s.nativeThisObject()); + WebGLShader* cobj = (WebGLShader*) s.nativeThisObject(); + auto iter = __shaders.find(cobj->_id); + if (iter != __shaders.end()) + __shaders.erase(iter); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glShaderFinalize) + // Arguments: GLenum // Ret value: void static bool JSB_glCullFace(se::State& s) { @@ -905,7 +1240,7 @@ static bool JSB_glCullFace(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glCullFace((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glCullFace) @@ -917,13 +1252,14 @@ static bool JSB_glDeleteProgram(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLProgram* arg0; + ok &= seval_to_native_ptr(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glDeleteProgram((GLuint)arg0 )); - s.rval().setUndefined(); + GLuint id = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glDeleteProgram(id)); + safeRemoveElementFromGLObjectMap(__webglProgramMap, id); + arg0->_id = 0; return true; } SE_BIND_FUNC(JSB_glDeleteProgram) @@ -935,13 +1271,19 @@ static bool JSB_glDeleteShader(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLShader* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint shaderId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glDeleteShader(shaderId)); + arg0->_id = 0; + + auto iter = __shaders.find(shaderId); + if (iter != __shaders.end()) + __shaders.erase(iter); + + safeRemoveElementFromGLObjectMap(__webglShaderMap, shaderId); - JSB_GL_CHECK(glDeleteShader((GLuint)arg0 )); - s.rval().setUndefined(); return true; } SE_BIND_FUNC(JSB_glDeleteShader) @@ -959,7 +1301,7 @@ static bool JSB_glDepthFunc(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDepthFunc((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDepthFunc) @@ -977,7 +1319,7 @@ static bool JSB_glDepthMask(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDepthMask((GLboolean)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDepthMask) @@ -996,7 +1338,7 @@ static bool JSB_glDepthRangef(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDepthRangef((GLclampf)arg0 , (GLclampf)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDepthRangef) @@ -1015,7 +1357,7 @@ static bool JSB_glDetachShader(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDetachShader((GLuint)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDetachShader) @@ -1033,7 +1375,7 @@ static bool JSB_glDisable(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDisable((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDisable) @@ -1051,7 +1393,7 @@ static bool JSB_glDisableVertexAttribArray(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDisableVertexAttribArray((GLuint)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDisableVertexAttribArray) @@ -1071,7 +1413,7 @@ static bool JSB_glDrawArrays(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDrawArrays((GLenum)arg0 , (GLint)arg1 , (GLsizei)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDrawArrays) @@ -1105,7 +1447,7 @@ static bool JSB_glDrawElements(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glDrawElements) @@ -1123,7 +1465,7 @@ static bool JSB_glEnable(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glEnable((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glEnable) @@ -1141,7 +1483,7 @@ static bool JSB_glEnableVertexAttribArray(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glEnableVertexAttribArray((GLuint)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glEnableVertexAttribArray) @@ -1153,7 +1495,7 @@ static bool JSB_glFinish(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 0, false, "Invalid number of arguments" ); JSB_GL_CHECK(glFinish( )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glFinish) @@ -1165,7 +1507,7 @@ static bool JSB_glFlush(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 0, false, "Invalid number of arguments" ); JSB_GL_CHECK(glFlush( )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glFlush) @@ -1177,24 +1519,15 @@ static bool JSB_glFramebufferRenderbuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 4, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; uint32_t arg2; uint32_t arg3; + uint32_t arg0; uint32_t arg1; uint32_t arg2; WebGLRenderbuffer* arg3; ok &= seval_to_uint32(args[0], &arg0 ); ok &= seval_to_uint32(args[1], &arg1 ); ok &= seval_to_uint32(args[2], &arg2 ); - ok &= seval_to_uint32(args[3], &arg3 ); + ok &= seval_to_native_ptr(args[3], &arg3 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - if( arg1 == GL_DEPTH_STENCIL_ATTACHMENT) { - JSB_GL_CHECK(glFramebufferRenderbuffer((GLenum)arg0, GL_DEPTH_ATTACHMENT, (GLenum)arg2 , (GLuint)arg3)); - JSB_GL_CHECK(glFramebufferRenderbuffer((GLenum)arg0, GL_STENCIL_ATTACHMENT, (GLenum)arg2 , (GLuint)arg3)); - } - else - { - JSB_GL_CHECK(glFramebufferRenderbuffer((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , (GLuint)arg3)); - } - - s.rval().setUndefined(); + GLuint renderBufferId = arg3 != nullptr ? arg3->_id : 0; + JSB_GL_CHECK(WEBGL_framebufferRenderbuffer((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , renderBufferId)); return true; } SE_BIND_FUNC(JSB_glFramebufferRenderbuffer) @@ -1206,17 +1539,18 @@ static bool JSB_glFramebufferTexture2D(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 5, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; uint32_t arg1; uint32_t arg2; uint32_t arg3; int32_t arg4; + uint32_t arg0; uint32_t arg1; uint32_t arg2; WebGLTexture* arg3; int32_t arg4; ok &= seval_to_uint32(args[0], &arg0 ); ok &= seval_to_uint32(args[1], &arg1 ); ok &= seval_to_uint32(args[2], &arg2 ); - ok &= seval_to_uint32(args[3], &arg3 ); + ok &= seval_to_native_ptr(args[3], &arg3 ); ok &= seval_to_int32(args[4], &arg4 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glFramebufferTexture2D((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , (GLuint)arg3 , (GLint)arg4 )); - s.rval().setUndefined(); + GLuint textureId = arg3 != nullptr ? arg3->_id : 0; + JSB_GL_CHECK(glFramebufferTexture2D((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , textureId , (GLint)arg4 )); + return true; } SE_BIND_FUNC(JSB_glFramebufferTexture2D) @@ -1234,7 +1568,7 @@ static bool JSB_glFrontFace(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glFrontFace((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glFrontFace) @@ -1252,7 +1586,7 @@ static bool JSB_glGenerateMipmap(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glGenerateMipmap((GLenum)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glGenerateMipmap) @@ -1264,12 +1598,13 @@ static bool JSB_glGetAttribLocation(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; std::string arg1; - - ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_std_string(args[1], &arg1 ); + WebGLProgram* arg0; + std::string arg1; + ok &= seval_to_native_ptr(args[0], &arg0); + ok &= seval_to_std_string(args[1], &arg1); SE_PRECONDITION2(ok, false, "Error processing arguments"); - int ret_val = glGetAttribLocation((GLuint)arg0 , arg1.c_str()); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; + int ret_val = glGetAttribLocation(programId, arg1.c_str()); JSB_GL_CHECK_ERROR(); s.rval().setInt32(ret_val); return true; @@ -1297,15 +1632,17 @@ static bool JSB_glGetUniformLocation(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; std::string arg1; + WebGLProgram* arg0; + std::string arg1; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0 ); ok &= seval_to_std_string(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); int ret_val; - ret_val = glGetUniformLocation((GLuint)arg0 , arg1.c_str()); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; + ret_val = glGetUniformLocation(programId , arg1.c_str()); JSB_GL_CHECK_ERROR(); s.rval().setInt32(ret_val); return true; @@ -1326,7 +1663,7 @@ static bool JSB_glHint(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glHint((GLenum)arg0 , (GLenum)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glHint) @@ -1338,14 +1675,15 @@ static bool JSB_glIsBuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; + GLboolean ret_val = GL_FALSE; - ret_val = glIsBuffer((GLuint)arg0); - s.rval().setInt32((int32_t)ret_val); + if (dynamic_cast(arg0)) + ret_val = glIsBuffer(arg0->_id); + + s.rval().setBoolean(ret_val == GL_TRUE); return true; } SE_BIND_FUNC(JSB_glIsBuffer) @@ -1376,13 +1714,17 @@ static bool JSB_glIsFramebuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; + GLboolean ret_val = GL_FALSE; + + if (dynamic_cast(arg0)) + { + GLuint frameBufferId = arg0 != nullptr ? arg0->_id : __defaultFbo; + ret_val = glIsFramebuffer(frameBufferId); + } - ret_val = glIsFramebuffer((GLuint)arg0); s.rval().setInt32((int32_t)ret_val); return true; } @@ -1395,14 +1737,16 @@ static bool JSB_glIsProgram(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0; + ok &= seval_to_native_ptr(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; - - ret_val = glIsProgram((GLuint)arg0); - s.rval().setInt32((int32_t)ret_val); + GLboolean ret_val = GL_FALSE; + if (dynamic_cast(arg0)) + { + GLuint id = arg0 != nullptr ? arg0->_id : 0; + ret_val = glIsProgram(id); + } + s.rval().setBoolean(ret_val == GL_TRUE); return true; } SE_BIND_FUNC(JSB_glIsProgram) @@ -1414,14 +1758,16 @@ static bool JSB_glIsRenderbuffer(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; - ret_val = glIsRenderbuffer((GLuint)arg0); - s.rval().setInt32((int32_t)ret_val); + GLboolean ret_val = GL_FALSE; + + if (dynamic_cast(arg0)) + ret_val = glIsRenderbuffer(arg0->_id); + + s.rval().setBoolean(ret_val == GL_TRUE); return true; } SE_BIND_FUNC(JSB_glIsRenderbuffer) @@ -1433,14 +1779,16 @@ static bool JSB_glIsShader(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; - - ret_val = glIsShader((GLuint)arg0); - s.rval().setInt32((int32_t)ret_val); + GLboolean ret_val = GL_FALSE; + if (dynamic_cast(arg0) != nullptr) + { + GLuint id = arg0 != nullptr ? arg0->_id : 0; + ret_val = glIsShader(id); + } + s.rval().setBoolean(ret_val == GL_TRUE); return true; } SE_BIND_FUNC(JSB_glIsShader) @@ -1452,14 +1800,17 @@ static bool JSB_glIsTexture(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLObject* arg0 = nullptr; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - GLboolean ret_val; + GLboolean ret_val = GL_FALSE; - ret_val = glIsTexture((GLuint)arg0); - s.rval().setInt32((int32_t)ret_val); + if (dynamic_cast(arg0)) + { + GLuint textureId = arg0 != nullptr ? arg0->_id : 0; + ret_val = glIsTexture(textureId); + } + s.rval().setBoolean(ret_val == GL_TRUE); return true; } SE_BIND_FUNC(JSB_glIsTexture) @@ -1477,7 +1828,7 @@ static bool JSB_glLineWidth(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glLineWidth((GLfloat)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glLineWidth) @@ -1489,13 +1840,11 @@ static bool JSB_glLinkProgram(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLProgram* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glLinkProgram((GLuint)arg0 )); - s.rval().setUndefined(); + GLuint id = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glLinkProgram(id)); return true; } SE_BIND_FUNC(JSB_glLinkProgram) @@ -1513,24 +1862,7 @@ static bool JSB_glPixelStorei(se::State& s) { ok &= seval_to_int32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - if (arg0 == GL_UNPACK_FLIP_Y_WEBGL) - { - __unpackFlipY = arg1 == 0 ? false : true; - return true; - } - else if (arg0 == GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL) - { - __premultiplyAlpha = arg1 == 0 ? false : true; - return true; - } - else if (arg0 == GL_UNPACK_COLORSPACE_CONVERSION_WEBGL) - { - SE_LOGE("Warning: UNPACK_COLORSPACE_CONVERSION_WEBGL is unsupported\n"); - return true; - } - - JSB_GL_CHECK(glPixelStorei((GLenum)arg0 , (GLint)arg1 )); - s.rval().setUndefined(); + JSB_GL_CHECK(WEBGL_pixelStorei((GLenum)arg0 , (GLint)arg1 )); return true; } SE_BIND_FUNC(JSB_glPixelStorei) @@ -1549,7 +1881,7 @@ static bool JSB_glPolygonOffset(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glPolygonOffset((GLfloat)arg0 , (GLfloat)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glPolygonOffset) @@ -1574,7 +1906,7 @@ static bool JSB_glReadPixels(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glReadPixels((GLint)arg0 , (GLint)arg1 , (GLsizei)arg2 , (GLsizei)arg3 , (GLenum)arg4 , (GLenum)arg5 , (GLvoid*)arg6 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glReadPixels) @@ -1586,7 +1918,7 @@ static bool JSB_glReleaseShaderCompiler(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 0, false, "Invalid number of arguments" ); JSB_GL_CHECK(glReleaseShaderCompiler( )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glReleaseShaderCompiler) @@ -1606,12 +1938,8 @@ static bool JSB_glRenderbufferStorage(se::State& s) { ok &= seval_to_int32(args[3], &arg3 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - if( arg1 == GL_DEPTH_STENCIL ) { - arg1 = GL_DEPTH24_STENCIL8; - } + JSB_GL_CHECK(WEBGL_renderbufferStorage((GLenum)arg0 , (GLenum)arg1 , (GLsizei)arg2 , (GLsizei)arg3)); - JSB_GL_CHECK(glRenderbufferStorage((GLenum)arg0 , (GLenum)arg1 , (GLsizei)arg2 , (GLsizei)arg3 )); - s.rval().setUndefined(); return true; } SE_BIND_FUNC(JSB_glRenderbufferStorage) @@ -1630,7 +1958,7 @@ static bool JSB_glSampleCoverage(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glSampleCoverage((GLclampf)arg0 , (GLboolean)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glSampleCoverage) @@ -1651,7 +1979,7 @@ static bool JSB_glScissor(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glScissor((GLint)arg0 , (GLint)arg1 , (GLsizei)arg2 , (GLsizei)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glScissor) @@ -1671,7 +1999,7 @@ static bool JSB_glStencilFunc(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilFunc((GLenum)arg0 , (GLint)arg1 , (GLuint)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilFunc) @@ -1692,7 +2020,7 @@ static bool JSB_glStencilFuncSeparate(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilFuncSeparate((GLenum)arg0 , (GLenum)arg1 , (GLint)arg2 , (GLuint)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilFuncSeparate) @@ -1710,7 +2038,7 @@ static bool JSB_glStencilMask(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilMask((GLuint)arg0 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilMask) @@ -1729,7 +2057,7 @@ static bool JSB_glStencilMaskSeparate(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilMaskSeparate((GLenum)arg0 , (GLuint)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilMaskSeparate) @@ -1749,7 +2077,7 @@ static bool JSB_glStencilOp(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilOp((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilOp) @@ -1770,7 +2098,7 @@ static bool JSB_glStencilOpSeparate(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glStencilOpSeparate((GLenum)arg0 , (GLenum)arg1 , (GLenum)arg2 , (GLenum)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glStencilOpSeparate) @@ -1793,42 +2121,48 @@ static bool JSB_glTexImage2D(se::State& s) { ok &= seval_to_int32(args[5], &border ); ok &= seval_to_uint32(args[6], &format ); ok &= seval_to_uint32(args[7], &type ); + GLsizei count; ok &= JSB_get_arraybufferview_dataptr(args[8], &count, &pixels); + SE_PRECONDITION2(ok, false, "Error processing arguments"); - if (__unpackFlipY) + if (pixels != nullptr) { - if (format == GL_RGBA) + if (__unpackFlipY) { - flipPixelsY((GLubyte*)pixels, width * 4, height); - } - else if (format == GL_RGB) - { - flipPixelsY((GLubyte*)pixels, width * 3, height); - } - else - { - SE_LOGE("JSB_glTexImage2D: format: %d doesn't support upackFlipY!\n", format); - return false; - } - } - - if (__premultiplyAlpha) - { - if (format == GL_RGBA || format == GL_LUMINANCE_ALPHA) - { - int byteLength = 0; if (format == GL_RGBA) - byteLength = width * height * 4; + { + flipPixelsY((GLubyte*)pixels, width * 4, height); + } + else if (format == GL_RGB) + { + flipPixelsY((GLubyte*)pixels, width * 3, height); + } else - byteLength = width * height * 2; - premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, byteLength, format); + { + SE_LOGE("JSB_glTexImage2D: format: %d doesn't support upackFlipY!\n", format); + return true; + } + } + + if (__premultiplyAlpha) + { + if (format == GL_RGBA || format == GL_LUMINANCE_ALPHA) + { + int byteLength = 0; + if (format == GL_RGBA) + byteLength = width * height * 4; + else + byteLength = width * height * 2; + assert(count == byteLength); + premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, byteLength, format); + } } } JSB_GL_CHECK(glTexImage2D((GLenum)target , (GLint)level , (GLint)internalformat , (GLsizei)width , (GLsizei)height , (GLint)border , (GLenum)format , (GLenum)type , (GLvoid*)pixels)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glTexImage2D) @@ -1848,7 +2182,7 @@ static bool JSB_glTexParameterf(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glTexParameterf((GLenum)arg0 , (GLenum)arg1 , (GLfloat)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glTexParameterf) @@ -1866,9 +2200,7 @@ static bool JSB_glTexParameteri(se::State& s) { ok &= seval_to_uint32(args[1], &arg1 ); ok &= seval_to_int32(args[2], &arg2 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glTexParameteri((GLenum)arg0 , (GLenum)arg1 , (GLint)arg2 )); - s.rval().setUndefined(); return true; } SE_BIND_FUNC(JSB_glTexParameteri) @@ -1894,25 +2226,42 @@ static bool JSB_glTexSubImage2D(se::State& s) { ok &= JSB_get_arraybufferview_dataptr(args[8], &count, &pixels); SE_PRECONDITION2(ok, false, "Error processing arguments"); - if (__unpackFlipY) + if (pixels != nullptr) { - if (format == GL_RGBA) + if (__unpackFlipY) { - flipPixelsY((GLubyte*)pixels, width * 4, height); + if (format == GL_RGBA) + { + flipPixelsY((GLubyte*)pixels, width * 4, height); + } + else if (format == GL_RGB) + { + flipPixelsY((GLubyte*)pixels, width * 3, height); + } + else + { + SE_LOGE("glTexSubImage2D: format: %d doesn't support upackFlipY!\n", format); + return true; + } } - else if (format == GL_RGB) + + if (__premultiplyAlpha) { - flipPixelsY((GLubyte*)pixels, width * 3, height); - } - else - { - SE_LOGE("JSB_glTexImage2D: format: %d doesn't support upackFlipY!\n", format); - return false; + if (format == GL_RGBA || format == GL_LUMINANCE_ALPHA) + { + int byteLength = 0; + if (format == GL_RGBA) + byteLength = width * height * 4; + else + byteLength = width * height * 2; + assert(count == byteLength); + premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, byteLength, format); + } } } JSB_GL_CHECK(glTexSubImage2D((GLenum)target , (GLint)level , (GLint)xoffset , (GLint)yoffset , (GLsizei)width , (GLsizei)height , (GLenum)format , (GLenum)type , (GLvoid*)pixels)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glTexSubImage2D) @@ -1931,7 +2280,7 @@ static bool JSB_glUniform1f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform1f(arg0, arg1)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform1f) @@ -1951,7 +2300,7 @@ static bool JSB_glUniform1fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform1fv((GLint)arg0 , (GLsizei)data.count() , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform1fv) @@ -1970,7 +2319,7 @@ static bool JSB_glUniform1i(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform1i((GLint)arg0 , (GLint)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform1i) @@ -1990,7 +2339,7 @@ static bool JSB_glUniform1iv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform1iv((GLint)arg0 , (GLsizei)data.count() , (GLint*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform1iv) @@ -2010,7 +2359,7 @@ static bool JSB_glUniform2f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform2f(arg0 , arg1 , arg2)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform2f) @@ -2030,7 +2379,7 @@ static bool JSB_glUniform2fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform2fv((GLint)arg0 , (GLsizei)(data.count()/2) , (GLfloat*)data.data() )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform2fv) @@ -2050,7 +2399,7 @@ static bool JSB_glUniform2i(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform2i((GLint)arg0 , (GLint)arg1 , (GLint)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform2i) @@ -2070,7 +2419,7 @@ static bool JSB_glUniform2iv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform2iv((GLint)arg0 , (GLsizei)(data.count()/2) , (GLint*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform2iv) @@ -2091,7 +2440,7 @@ static bool JSB_glUniform3f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform3f(arg0 , arg1 , arg2 , arg3)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform3f) @@ -2111,7 +2460,7 @@ static bool JSB_glUniform3fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform3fv((GLint)arg0 , (GLsizei)(data.count()/3) , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform3fv) @@ -2132,7 +2481,7 @@ static bool JSB_glUniform3i(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform3i((GLint)arg0 , (GLint)arg1 , (GLint)arg2 , (GLint)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform3i) @@ -2152,7 +2501,7 @@ static bool JSB_glUniform3iv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform3iv((GLint)arg0 , (GLsizei)(data.count()/3) , (GLint*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform3iv) @@ -2174,7 +2523,7 @@ static bool JSB_glUniform4f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform4f((GLint)arg0 , (GLfloat)arg1 , (GLfloat)arg2 , (GLfloat)arg3 , (GLfloat)arg4)); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform4f) @@ -2194,7 +2543,7 @@ static bool JSB_glUniform4fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform4fv((GLint)arg0 , (GLsizei)(data.count()/4) , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform4fv) @@ -2216,7 +2565,7 @@ static bool JSB_glUniform4i(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform4i((GLint)arg0 , (GLint)arg1 , (GLint)arg2 , (GLint)arg3 , (GLint)arg4 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform4i) @@ -2236,7 +2585,7 @@ static bool JSB_glUniform4iv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniform4iv((GLint)arg0 , (GLsizei)(data.count()/4) , (GLint*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniform4iv) @@ -2257,7 +2606,7 @@ static bool JSB_glUniformMatrix2fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniformMatrix2fv(arg0, (GLsizei)(data.count()/4), (GLboolean)arg1 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniformMatrix2fv) @@ -2278,7 +2627,7 @@ static bool JSB_glUniformMatrix3fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniformMatrix3fv(arg0, (GLsizei)(data.count()/9), (GLboolean)arg1 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniformMatrix3fv) @@ -2299,7 +2648,7 @@ static bool JSB_glUniformMatrix4fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glUniformMatrix4fv(arg0, (GLsizei)(data.count()/16), (GLboolean)arg1 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glUniformMatrix4fv) @@ -2311,13 +2660,11 @@ static bool JSB_glUseProgram(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLProgram* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glUseProgram((GLuint)arg0 )); - s.rval().setUndefined(); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glUseProgram(programId)); return true; } SE_BIND_FUNC(JSB_glUseProgram) @@ -2329,13 +2676,12 @@ static bool JSB_glValidateProgram(se::State& s) { int argc = (int)args.size(); SE_PRECONDITION2( argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLProgram* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glValidateProgram((GLuint)arg0 )); - s.rval().setUndefined(); + GLuint id = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glValidateProgram(id)); return true; } SE_BIND_FUNC(JSB_glValidateProgram) @@ -2354,7 +2700,7 @@ static bool JSB_glVertexAttrib1f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib1f((GLuint)arg0 , (GLfloat)arg1 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib1f) @@ -2374,7 +2720,7 @@ static bool JSB_glVertexAttrib1fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib1fv((GLuint)arg0 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib1fv) @@ -2394,7 +2740,7 @@ static bool JSB_glVertexAttrib2f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib2f((GLuint)arg0 , (GLfloat)arg1 , (GLfloat)arg2 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib2f) @@ -2414,7 +2760,7 @@ static bool JSB_glVertexAttrib2fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib2fv((GLuint)arg0 , (GLfloat*)data.data() )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib2fv) @@ -2435,7 +2781,7 @@ static bool JSB_glVertexAttrib3f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib3f((GLuint)arg0 , (GLfloat)arg1 , (GLfloat)arg2 , (GLfloat)arg3 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib3f) @@ -2455,7 +2801,7 @@ static bool JSB_glVertexAttrib3fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib3fv((GLuint)arg0 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib3fv) @@ -2477,7 +2823,7 @@ static bool JSB_glVertexAttrib4f(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib4f((GLuint)arg0 , (GLfloat)arg1 , (GLfloat)arg2 , (GLfloat)arg3 , (GLfloat)arg4 )); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib4f) @@ -2497,7 +2843,7 @@ static bool JSB_glVertexAttrib4fv(se::State& s) { SE_PRECONDITION2(ok, false, "Error processing arguments"); JSB_GL_CHECK(glVertexAttrib4fv((GLuint)arg0 , (GLfloat*)data.data())); - s.rval().setUndefined(); + return true; } SE_BIND_FUNC(JSB_glVertexAttrib4fv) @@ -2519,12 +2865,80 @@ static bool JSB_glVertexAttribPointer(se::State& s) { ok &= seval_to_int32(args[5], &arg5 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glVertexAttribPointer((GLuint)arg0 , (GLint)arg1 , (GLenum)arg2 , (GLboolean)arg3 , (GLsizei)arg4 , (GLvoid*)arg5 )); - s.rval().setUndefined(); + JSB_GL_CHECK(glVertexAttribPointer((GLuint)arg0 , (GLint)arg1 , (GLenum)arg2 , (GLboolean)arg3 , (GLsizei)arg4 , (GLvoid*)(intptr_t)arg5 )); + return true; } SE_BIND_FUNC(JSB_glVertexAttribPointer) +// (index, pname) +static bool JSB_glGetVertexAttrib(se::State& s) +{ + const auto& args = s.args(); + int argc = (int)args.size(); + SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); + bool ok = true; + uint32_t index; uint32_t pname; + + ok &= seval_to_uint32(args[0], &index ); + ok &= seval_to_uint32(args[1], &pname ); + SE_PRECONDITION2(ok, false, "Error processing arguments"); + + if( pname == GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING ) { + GLint buffer; + JSB_GL_CHECK(glGetVertexAttribiv(index, pname, &buffer)); + auto iter = __webglBufferMap.find(buffer); + if (iter != __webglBufferMap.end()) { + WebGLBuffer* obj = static_cast(iter->second); + auto seObjIter = se::NativePtrToObjectMap::find(obj); + if (seObjIter != se::NativePtrToObjectMap::end()) { + s.rval().setObject(seObjIter->second); + } + } + } + else if( pname == GL_CURRENT_VERTEX_ATTRIB ) { + float vertexAttrib[4] = {0.0f}; + JSB_GL_CHECK(glGetVertexAttribfv(index, pname, vertexAttrib)); + se::Object* arr = se::Object::createTypedArray(se::Object::TypedArrayType::FLOAT32, vertexAttrib, sizeof(vertexAttrib)); + s.rval().setObject(arr); + } + else { + GLint value; + JSB_GL_CHECK(glGetVertexAttribiv(index, pname, &value)); + + if (pname == GL_VERTEX_ATTRIB_ARRAY_ENABLED || pname == GL_VERTEX_ATTRIB_ARRAY_NORMALIZED) { + s.rval().setBoolean(value == 0 ? false : true); + } + else if (pname == GL_VERTEX_ATTRIB_ARRAY_SIZE) { + s.rval().setNumber(value); + } + } + return true; +} +SE_BIND_FUNC(JSB_glGetVertexAttrib) + +// (index, pname) +static bool JSB_glGetVertexAttribOffset(se::State& s) +{ + const auto& args = s.args(); + int argc = (int)args.size(); + SE_PRECONDITION2( argc == 2, false, "Invalid number of arguments" ); + bool ok = true; + uint32_t index; uint32_t pname; + + ok &= seval_to_uint32(args[0], &index ); + ok &= seval_to_uint32(args[1], &pname ); + SE_PRECONDITION2(ok, false, "Error processing arguments"); + + if( pname == GL_VERTEX_ATTRIB_ARRAY_POINTER ) { + GLvoid* pointer; + JSB_GL_CHECK(glGetVertexAttribPointerv(index, pname, &pointer)); + s.rval().setNumber((double)(intptr_t)pointer); + } + return true; +} +SE_BIND_FUNC(JSB_glGetVertexAttribOffset) + // Arguments: GLint, GLint, GLsizei, GLsizei // Ret value: void static bool JSB_glViewport(se::State& s) { @@ -2540,15 +2954,14 @@ static bool JSB_glViewport(se::State& s) { ok &= seval_to_int32(args[3], &arg3 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(glViewport((GLint)arg0 , (GLint)arg1 , (GLsizei)arg2 , (GLsizei)arg3 )); - s.rval().setUndefined(); + JSB_GL_CHECK(glViewport((GLint)arg0 , (GLint)arg1, (GLsizei)arg2 , (GLsizei)arg3)); return true; } SE_BIND_FUNC(JSB_glViewport) // Helper functions that link "glGenXXXs" (OpenGL ES 2.0 spec), with "gl.createXXX" (WebGL spec) -static bool JSB_glGenTextures(se::State& s) { +static bool JSB_glCreateTexture(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 0, false, "Invalid number of arguments" ); @@ -2556,46 +2969,99 @@ static bool JSB_glGenTextures(se::State& s) { GLuint texture; JSB_GL_CHECK(glGenTextures(1, &texture)); - s.rval().setUint32(texture); + auto obj = se::Object::createObjectWithClass(__jsb_WebGLTexture_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(texture)); + auto cobj = new (std::nothrow) WebGLTexture(texture); + obj->setPrivateData(cobj); return true; } -SE_BIND_FUNC(JSB_glGenTextures) +SE_BIND_FUNC(JSB_glCreateTexture) -static bool JSB_glGenBuffers(se::State& s) { +static bool JSB_glTextureFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLTexture)", s.nativeThisObject()); + WebGLTexture* cobj = (WebGLTexture*) s.nativeThisObject(); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glTextureFinalize) + +static bool JSB_glCreateBuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 0, false, "Invalid number of arguments" ); GLuint buffer; JSB_GL_CHECK(glGenBuffers(1, &buffer)); - s.rval().setUint32(buffer); + + auto obj = se::Object::createObjectWithClass(__jsb_WebGLBuffer_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(buffer)); + auto cobj = new (std::nothrow) WebGLBuffer(buffer); + obj->setPrivateData(cobj); return true; } -SE_BIND_FUNC(JSB_glGenBuffers) +SE_BIND_FUNC(JSB_glCreateBuffer) -static bool JSB_glGenRenderbuffers(se::State& s) { +static bool JSB_glBufferFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLBuffer)", s.nativeThisObject()); + WebGLBuffer* cobj = (WebGLBuffer*) s.nativeThisObject(); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glBufferFinalize) + +static bool JSB_glCreateRenderbuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 0, false, "Invalid number of arguments" ); - GLuint renderbuffers; - JSB_GL_CHECK(glGenRenderbuffers(1, &renderbuffers)); - s.rval().setUint32(renderbuffers); + GLuint renderbuffer; + JSB_GL_CHECK(glGenRenderbuffers(1, &renderbuffer)); + auto obj = se::Object::createObjectWithClass(__jsb_WebGLRenderbuffer_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(renderbuffer)); + auto cobj = new (std::nothrow) WebGLRenderbuffer(renderbuffer); + obj->setPrivateData(cobj); return true; } -SE_BIND_FUNC(JSB_glGenRenderbuffers) +SE_BIND_FUNC(JSB_glCreateRenderbuffer) -static bool JSB_glGenFramebuffers(se::State& s) { +static bool JSB_glRenderbufferFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLRenderBuffer)", s.nativeThisObject()); + WebGLRenderbuffer* cobj = (WebGLRenderbuffer*) s.nativeThisObject(); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glRenderbufferFinalize) + +static bool JSB_glCreateFramebuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 0, false, "Invalid number of arguments" ); - GLuint framebuffers; - JSB_GL_CHECK(glGenFramebuffers(1, &framebuffers)); - s.rval().setUint32(framebuffers); + GLuint framebuffer; + JSB_GL_CHECK(glGenFramebuffers(1, &framebuffer)); + auto obj = se::Object::createObjectWithClass(__jsb_WebGLFramebuffer_class); + s.rval().setObject(obj, true); + obj->setProperty("_id", se::Value(framebuffer)); + auto cobj = new (std::nothrow) WebGLFramebuffer(framebuffer); + obj->setPrivateData(cobj); return true; } -SE_BIND_FUNC(JSB_glGenFramebuffers) +SE_BIND_FUNC(JSB_glCreateFramebuffer) + +static bool JSB_glFramebufferFinalize(se::State& s) +{ + CCLOGINFO("jsbindings: finalizing JS object %p (WebGLFramebuffer)", s.nativeThisObject()); + WebGLFramebuffer* cobj = (WebGLFramebuffer*) s.nativeThisObject(); + delete cobj; + return true; +} +SE_BIND_FINALIZE_FUNC(JSB_glFramebufferFinalize) static bool JSB_glDeleteTextures(se::State& s) { const auto& args = s.args(); @@ -2603,74 +3069,67 @@ static bool JSB_glDeleteTextures(se::State& s) { SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLTexture* arg0 = nullptr; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glDeleteTextures(1, &arg0)); - + GLuint id = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(ccDeleteTextures(1, &id)); + safeRemoveElementFromGLObjectMap(__webglTextureMap, id); + arg0->_id = 0; return true; } SE_BIND_FUNC(JSB_glDeleteTextures) -static bool JSB_glDeleteBuffers(se::State& s) { +static bool JSB_glDeleteBuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLBuffer* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glDeleteBuffers(1, &arg0)); - + GLuint bufferId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(ccDeleteBuffers(1, &bufferId)); + safeRemoveElementFromGLObjectMap(__webglBufferMap, bufferId); + arg0->_id = 0; return true; } -SE_BIND_FUNC(JSB_glDeleteBuffers) +SE_BIND_FUNC(JSB_glDeleteBuffer) -static bool JSB_glDeleteRenderbuffers(se::State& s) { +static bool JSB_glDeleteRenderbuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLRenderbuffer* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); - - JSB_GL_CHECK(glDeleteRenderbuffers(1, &arg0)); - + GLuint renderBufferId = arg0 != nullptr ? arg0->_id : 0; + JSB_GL_CHECK(glDeleteRenderbuffers(1, &renderBufferId)); + safeRemoveElementFromGLObjectMap(__webglRenderbufferMap, renderBufferId); + arg0->_id = 0; return true; } -SE_BIND_FUNC(JSB_glDeleteRenderbuffers) +SE_BIND_FUNC(JSB_glDeleteRenderbuffer) -static bool JSB_glDeleteFramebuffers(se::State& s) { +static bool JSB_glDeleteFramebuffer(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - if (args[0].isNullOrUndefined()) - { - arg0 = __defaultFbo; - } - else - { - ok &= seval_to_uint32(args[0], &arg0 ); - SE_PRECONDITION2(ok, false, "Error processing arguments"); - } - - JSB_GL_CHECK(glDeleteFramebuffers(1, &arg0)); - + WebGLFramebuffer* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); + SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint frameBufferId = arg0 != nullptr ? arg0->_id : __defaultFbo; + JSB_GL_CHECK(glDeleteFramebuffers(1, &frameBufferId)); + safeRemoveElementFromGLObjectMap(__webglFramebufferMap, frameBufferId); + arg0->_id = __defaultFbo; return true; } -SE_BIND_FUNC(JSB_glDeleteFramebuffers) +SE_BIND_FUNC(JSB_glDeleteFramebuffer) static bool JSB_glShaderSource(se::State& s) { const auto& args = s.args(); @@ -2678,12 +3137,15 @@ static bool JSB_glShaderSource(se::State& s) { SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; std::string shaderSource; + WebGLShader* arg0; + std::string shaderSource; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0); ok &= seval_to_std_string(args[1], &shaderSource); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint shaderId = arg0 != nullptr ? arg0->_id : 0; + #if CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 size_t firstLinePos = shaderSource.find("\n"); if (firstLinePos != std::string::npos) @@ -2699,26 +3161,28 @@ static bool JSB_glShaderSource(se::State& s) { #endif const GLchar* sources[] = { shaderSource.c_str() }; - JSB_GL_CHECK(glShaderSource(arg0, 1, sources, nullptr)); + JSB_GL_CHECK(glShaderSource(shaderId, 1, sources, nullptr)); return true; } SE_BIND_FUNC(JSB_glShaderSource) -static bool JSB_glGetShaderiv(se::State& s) { +static bool JSB_glGetShaderParameter(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0, arg1; + WebGLShader* arg0; + uint32_t arg1; - ok &= seval_to_uint32(args[0], &arg0 ); - ok &= seval_to_uint32(args[1], &arg1 ); + ok &= seval_to_native_ptr(args[0], &arg0); + ok &= seval_to_uint32(args[1], &arg1); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint shaderId = arg0 != nullptr ? arg0->_id : 0; GLint ret = 0; - JSB_GL_CHECK(glGetShaderiv(arg0, arg1, &ret)); + JSB_GL_CHECK(glGetShaderiv(shaderId, arg1, &ret)); if (arg1 == GL_DELETE_STATUS || arg1 == GL_COMPILE_STATUS) { @@ -2730,26 +3194,28 @@ static bool JSB_glGetShaderiv(se::State& s) { } return true; } -SE_BIND_FUNC(JSB_glGetShaderiv) +SE_BIND_FUNC(JSB_glGetShaderParameter) -static bool JSB_glGetProgramiv(se::State& s) { +static bool JSB_glGetProgramParameter(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0, arg1; + WebGLProgram* arg0; + uint32_t arg1; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0 ); ok &= seval_to_uint32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; GLint ret; - JSB_GL_CHECK(glGetProgramiv(arg0, arg1, &ret)); + JSB_GL_CHECK(glGetProgramiv(programId, arg1, &ret)); s.rval().setInt32(ret); return true; } -SE_BIND_FUNC(JSB_glGetProgramiv) +SE_BIND_FUNC(JSB_glGetProgramParameter) static bool JSB_glGetProgramInfoLog(se::State& s) { const auto& args = s.args(); @@ -2757,16 +3223,15 @@ static bool JSB_glGetProgramInfoLog(se::State& s) { SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLProgram* arg0; + ok &= seval_to_native_ptr(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; GLsizei length; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_INFO_LOG_LENGTH, &length)); + JSB_GL_CHECK(glGetProgramiv(programId, GL_INFO_LOG_LENGTH, &length)); GLchar* src = new (std::nothrow) GLchar[length]; - JSB_GL_CHECK(glGetProgramInfoLog(arg0, length, NULL, src)); - + JSB_GL_CHECK(glGetProgramInfoLog(programId, length, nullptr, src)); s.rval().setString(src); CC_SAFE_DELETE_ARRAY(src); return true; @@ -2780,15 +3245,15 @@ static bool JSB_glGetShaderInfoLog(se::State& s) { SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; - - ok &= seval_to_uint32(args[0], &arg0 ); + WebGLShader* arg0; + ok &= seval_to_native_ptr(args[0], &arg0); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint shaderId = arg0 != nullptr ? arg0->_id : 0; GLsizei length; - JSB_GL_CHECK(glGetShaderiv(arg0, GL_INFO_LOG_LENGTH, &length)); + JSB_GL_CHECK(glGetShaderiv(shaderId, GL_INFO_LOG_LENGTH, &length)); GLchar* src = new (std::nothrow) GLchar[length]; - JSB_GL_CHECK(glGetShaderInfoLog(arg0, length, NULL, src)); + JSB_GL_CHECK(glGetShaderInfoLog(shaderId, length, NULL, src)); s.rval().setString(src); CC_SAFE_DELETE_ARRAY(src); @@ -2830,26 +3295,28 @@ static bool JSB_glGetActiveAttrib(se::State& s) { SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0, arg1; + WebGLProgram* arg0; + uint32_t arg1; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0); ok &= seval_to_uint32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint programId = arg0 != nullptr ? arg0->_id : 0; GLsizei length; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &length)); + JSB_GL_CHECK(glGetProgramiv(programId, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, &length)); GLchar* buffer = new (std::nothrow) GLchar[length]; GLint size = -1; GLenum type = -1; - JSB_GL_CHECK(glGetActiveAttrib(arg0, arg1, length, NULL, &size, &type, buffer)); + JSB_GL_CHECK(glGetActiveAttrib(programId, arg1, length, NULL, &size, &type, buffer)); + + se::Object* object = se::Object::createObjectWithClass(__jsb_WebGLActiveInfo_class); + s.rval().setObject(object, true); - se::HandleObject object(se::Object::createPlainObject()); object->setProperty("size", se::Value((int32_t)size)); object->setProperty("type", se::Value((int32_t)type)); object->setProperty("name", se::Value((char*)buffer)); - s.rval().setObject(object.get()); - CC_SAFE_DELETE_ARRAY(buffer); return true; @@ -2869,19 +3336,21 @@ static bool JSB_glGetActiveUniform(se::State& s) { SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0, arg1; + WebGLProgram* arg0; + uint32_t arg1; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0 ); ok &= seval_to_uint32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint id = arg0 != nullptr ? arg0->_id : 0; GLsizei length; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_ACTIVE_UNIFORM_MAX_LENGTH, &length)); + JSB_GL_CHECK(glGetProgramiv(id, GL_ACTIVE_UNIFORM_MAX_LENGTH, &length)); GLchar* buffer = new (std::nothrow) GLchar[length]; GLint size = -1; GLenum type = -1; - JSB_GL_CHECK(glGetActiveUniform(arg0, arg1, length, NULL, &size, &type, buffer)); + JSB_GL_CHECK(glGetActiveUniform(id, arg1, length, NULL, &size, &type, buffer)); se::HandleObject object(se::Object::createPlainObject()); object->setProperty("size", se::Value((int32_t)size)); @@ -2901,23 +3370,30 @@ static bool JSB_glGetAttachedShaders(se::State& s) { SE_PRECONDITION2(argc == 1, false, "Invalid number of arguments" ); bool ok = true; - uint32_t arg0; + WebGLProgram* arg0; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); + GLuint id = arg0 != nullptr ? arg0->_id : 0; GLsizei length; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_ATTACHED_SHADERS, &length)); + JSB_GL_CHECK(glGetProgramiv(id, GL_ATTACHED_SHADERS, &length)); GLuint* buffer = new (std::nothrow) GLuint[length]; memset(buffer, 0, length * sizeof(GLuint)); //Fix bug 2448, it seems that glGetAttachedShaders will crash if we send NULL to the third parameter (eg Windows), same as in lua binding GLsizei realShaderCount = 0; - JSB_GL_CHECK(glGetAttachedShaders(arg0, length, &realShaderCount, buffer)); + JSB_GL_CHECK(glGetAttachedShaders(id, length, &realShaderCount, buffer)); se::HandleObject jsobj(se::Object::createArrayObject(length)); - for( int i=0; isetArrayElement(i, se::Value(buffer[i])); + auto iter = __shaders.find(buffer[i]); + if (iter != __shaders.end()) + { + jsobj->setArrayElement(index, iter->second); + ++index; + } } s.rval().setObject(jsobj.get()); @@ -2993,18 +3469,21 @@ static bool JSB_glGetUniformfv(se::State& s) { SE_PRECONDITION2(argc == 2, false,"JSB_glGetUniformfv: Invalid number of arguments" ); bool ok = true; - uint32_t arg0, arg1; + WebGLProgram* arg0; + uint32_t arg1; - ok &= seval_to_uint32(args[0], &arg0 ); + ok &= seval_to_native_ptr(args[0], &arg0 ); ok &= seval_to_uint32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "JSB_glGetUniformfv: Error processing arguments"); + SE_PRECONDITION2(arg0 != nullptr, false, "WebGLProgram is null!"); + GLuint id = arg0 != nullptr ? arg0->_id : 0; GLint activeUniforms; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_ACTIVE_UNIFORMS, &activeUniforms)); + JSB_GL_CHECK(glGetProgramiv(id, GL_ACTIVE_UNIFORMS, &activeUniforms)); GLsizei length; - JSB_GL_CHECK(glGetProgramiv(arg0, GL_ACTIVE_UNIFORM_MAX_LENGTH, &length)); + JSB_GL_CHECK(glGetProgramiv(id, GL_ACTIVE_UNIFORM_MAX_LENGTH, &length)); GLchar* namebuffer = new (std::nothrow) GLchar[length+1]; GLint size = -1; GLenum type = -1; @@ -3012,8 +3491,8 @@ static bool JSB_glGetUniformfv(se::State& s) { bool isLocationFound = false; for (int i = 0; i < activeUniforms; ++i) { - JSB_GL_CHECK(glGetActiveUniform(arg0, i, length, NULL, &size, &type, namebuffer)); - if(arg1 == glGetUniformLocation(arg0, namebuffer)) + JSB_GL_CHECK(glGetActiveUniform(id, i, length, NULL, &size, &type, namebuffer)); + if(arg1 == glGetUniformLocation(id, namebuffer)) { isLocationFound = true; break; @@ -3087,7 +3566,7 @@ static bool JSB_glGetUniformfv(se::State& s) { if( utype == GL_FLOAT) { GLfloat* param = new (std::nothrow) GLfloat[usize]; - JSB_GL_CHECK(glGetUniformfv(arg0, arg1, param)); + JSB_GL_CHECK(glGetUniformfv(id, arg1, param)); se::HandleObject obj(se::Object::createTypedArray(se::Object::TypedArrayType::FLOAT32, param, usize * sizeof(GLfloat))); s.rval().setObject(obj); @@ -3097,7 +3576,7 @@ static bool JSB_glGetUniformfv(se::State& s) { else if( utype == GL_INT ) { GLint* param = new (std::nothrow) GLint[usize]; - JSB_GL_CHECK(glGetUniformiv(arg0, arg1, param)); + JSB_GL_CHECK(glGetUniformiv(id, arg1, param)); se::HandleObject obj(se::Object::createTypedArray(se::Object::TypedArrayType::INT32, param, usize * sizeof(GLint))); s.rval().setObject(obj); @@ -3360,19 +3839,490 @@ static bool JSB_glGetShaderPrecisionFormat(se::State& s) } SE_BIND_FUNC(JSB_glGetShaderPrecisionFormat) +static bool JSB_glFlushCommand(se::State& s) { + const auto& args = s.args(); + int argc = (int)args.size(); + SE_PRECONDITION2(argc == 2, false, "Invalid number of arguments" ); + + bool ok = false; + uint32_t floatValueCount = 0; + ok = seval_to_uint32(args[0], &floatValueCount); + SE_PRECONDITION2(ok, false, "arg0 isn't a number!"); + GLsizei count = 0; + GLvoid* data = nullptr; + ok = JSB_get_arraybufferview_dataptr(args[1], &count, &data); + SE_PRECONDITION2(ok, false, "Convert arg1 as typed array failed!"); + float* p = (float*)data; + float* end = p + floatValueCount; + int testindex = 0; + while (p < end) { + testindex++; + uint32_t commandID = (uint32_t)p[0]; + if (commandID == GL_COMMAND_ACTIVE_TEXTURE) { + JSB_GL_CHECK_VOID(ccActiveTexture((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_ATTACH_SHADER) { + JSB_GL_CHECK_VOID(glAttachShader((GLuint)p[1], (GLuint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_BIND_BUFFER) { + GLuint bufferId = (GLuint)p[2]; + JSB_GL_CHECK_VOID(ccBindBuffer((GLenum)p[1], bufferId)); + p += 3; + } + else if (commandID == GL_COMMAND_BIND_FRAME_BUFFER) { + GLuint fbo = (GLuint)p[2]; + if (fbo == 0) + fbo = __defaultFbo; + JSB_GL_CHECK_VOID(glBindFramebuffer((GLenum)p[1], fbo)); + p += 3; + } + else if (commandID == GL_COMMAND_BIND_RENDER_BUFFER) { + JSB_GL_CHECK_VOID(glBindRenderbuffer((GLenum)p[1], (GLuint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_BIND_TEXTURE) { + JSB_GL_CHECK_VOID(ccBindTexture((GLenum)p[1], (GLuint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_BLEND_COLOR) { + JSB_GL_CHECK_VOID(glBlendColor((GLclampf)p[1], (GLclampf)p[2], (GLclampf)p[3], (GLclampf)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_BLEND_EQUATION) { + JSB_GL_CHECK_VOID(glBlendEquation((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_BLEND_EQUATION_SEPARATE) { + JSB_GL_CHECK_VOID(glBlendEquationSeparate((GLenum)p[1], (GLenum)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_BLEND_FUNC) { + JSB_GL_CHECK_VOID(glBlendFunc((GLenum)p[1], (GLenum)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_BLEND_FUNC_SEPARATE) { + JSB_GL_CHECK_VOID(glBlendFuncSeparate((GLenum)p[1], (GLenum)p[2], (GLenum)p[3], (GLenum)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_CLEAR) { + JSB_GL_CHECK_VOID(glClear((GLbitfield)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_CLEAR_COLOR) { + JSB_GL_CHECK_VOID(glClearColor((GLclampf)p[1], (GLclampf)p[2], (GLclampf)p[3], (GLclampf)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_CLEAR_DEPTH) { + JSB_GL_CHECK_VOID(glClearDepthf(p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_CLEAR_STENCIL) { + JSB_GL_CHECK_VOID(glClearStencil((GLint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_COLOR_MASK) { + JSB_GL_CHECK_VOID(glColorMask((GLboolean)p[1], (GLboolean)p[2], (GLboolean)p[3], (GLboolean)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_COMPILE_SHADER) { + JSB_GL_CHECK_VOID(glCompileShader((GLuint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_COPY_TEX_IMAGE_2D) { + JSB_GL_CHECK_VOID(glCopyTexImage2D((GLenum)p[1], (GLint)p[2], (GLenum)p[3], (GLint)p[4], (GLint)p[5], (GLsizei)p[6], (GLsizei)p[7], (GLint)p[8])); + p += 9; + } + else if (commandID == GL_COMMAND_COPY_TEX_SUB_IMAGE_2D) { + JSB_GL_CHECK_VOID(glCopyTexSubImage2D((GLenum)p[1], (GLint)p[2], (GLint)p[3], (GLint)p[4], (GLint)p[5], (GLint)p[6], (GLsizei)p[7], (GLsizei)p[8])); + p += 9; + } + else if (commandID == GL_COMMAND_CULL_FACE) { + JSB_GL_CHECK_VOID(glCullFace((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_BUFFER) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(ccDeleteBuffers(1, &id)); + safeRemoveElementFromGLObjectMap(__webglBufferMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_FRAME_BUFFER) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(glDeleteFramebuffers(1, &id)); + safeRemoveElementFromGLObjectMap(__webglFramebufferMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_PROGRAM) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(glDeleteProgram(id)); + safeRemoveElementFromGLObjectMap(__webglProgramMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_RENDER_BUFFER) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(glDeleteRenderbuffers(1, &id)); + safeRemoveElementFromGLObjectMap(__webglRenderbufferMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_SHADER) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(glDeleteShader(id)); + safeRemoveElementFromGLObjectMap(__webglShaderMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DELETE_TEXTURE) { + GLuint id = (GLuint)p[1]; + JSB_GL_CHECK_VOID(ccDeleteTextures(1, &id)); + safeRemoveElementFromGLObjectMap(__webglTextureMap, id); + p += 2; + } + else if (commandID == GL_COMMAND_DEPTH_FUNC) { + JSB_GL_CHECK_VOID(glDepthFunc((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_DEPTH_MASK) { + JSB_GL_CHECK_VOID(glDepthMask((GLboolean)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_DEPTH_RANGE) { + JSB_GL_CHECK_VOID(glDepthRangef(p[1], p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_DETACH_SHADER) { + JSB_GL_CHECK_VOID(glDetachShader((GLuint)p[1], (GLuint) p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_DISABLE) { + JSB_GL_CHECK_VOID(glDisable((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_DISABLE_VERTEX_ATTRIB_ARRAY) { + JSB_GL_CHECK_VOID(glDisableVertexAttribArray((GLuint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_DRAW_ARRAYS) { + JSB_GL_CHECK_VOID(glDrawArrays((GLenum)p[1], (GLint)p[2], (GLsizei)p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_DRAW_ELEMENTS) { + JSB_GL_CHECK_VOID(glDrawElements((GLenum)p[1], (GLsizei)p[2], (GLenum)p[3], (const GLvoid*)(intptr_t)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_ENABLE) { + JSB_GL_CHECK_VOID(glEnable((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_ENABLE_VERTEX_ATTRIB_ARRAY) { + JSB_GL_CHECK_VOID(glEnableVertexAttribArray((GLuint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_FINISH) { + JSB_GL_CHECK_VOID(glFinish()); + p += 1; + } + else if (commandID == GL_COMMAND_FLUSH) { + JSB_GL_CHECK_VOID(glFlush()); + p += 1; + } + else if (commandID == GL_COMMAND_FRAME_BUFFER_RENDER_BUFFER) { + JSB_GL_CHECK_VOID(WEBGL_framebufferRenderbuffer((GLenum)p[1], (GLenum)p[2], (GLenum)p[3], (GLuint)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_FRAME_BUFFER_TEXTURE_2D) { + JSB_GL_CHECK_VOID(glFramebufferTexture2D((GLenum)p[1], (GLenum)p[2], (GLenum)p[3], (GLuint)p[4], (GLint)p[5])); + p += 6; + } + else if (commandID == GL_COMMAND_FRONT_FACE) { + JSB_GL_CHECK_VOID(glFrontFace((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_GENERATE_MIPMAP) { + JSB_GL_CHECK_VOID(glGenerateMipmap((GLenum)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_HINT) { + JSB_GL_CHECK_VOID(glHint((GLenum)p[1], (GLenum)p[2]));; + p += 3; + } + else if (commandID == GL_COMMAND_LINE_WIDTH) { + JSB_GL_CHECK_VOID(glLineWidth(p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_LINK_PROGRAM) { + JSB_GL_CHECK_VOID(glLinkProgram((GLuint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_PIXEL_STOREI) { + JSB_GL_CHECK_VOID(WEBGL_pixelStorei((GLenum)p[1], (GLint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_POLYGON_OFFSET) { + JSB_GL_CHECK_VOID(glPolygonOffset(p[1], p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_RENDER_BUFFER_STORAGE) { + JSB_GL_CHECK_VOID(WEBGL_renderbufferStorage((GLenum)p[1], (GLenum)p[2], (GLsizei)p[3], (GLsizei)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_SAMPLE_COVERAGE) { + JSB_GL_CHECK_VOID(glSampleCoverage(p[1], (GLboolean)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_SCISSOR) { + JSB_GL_CHECK_VOID(glScissor((GLint)p[1], (GLint)p[2], (GLsizei)p[3], (GLsizei)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_STENCIL_FUNC) { + JSB_GL_CHECK_VOID(glStencilFunc((GLenum)p[1], (GLint)p[2], (GLuint)p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_STENCIL_FUNC_SEPARATE) { + JSB_GL_CHECK_VOID(glStencilFuncSeparate((GLenum)p[1], (GLenum)p[2], (GLint)p[3], (GLuint)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_STENCIL_MASK) { + JSB_GL_CHECK_VOID(glStencilMask((GLuint)p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_STENCIL_MASK_SEPARATE) { + JSB_GL_CHECK_VOID(glStencilMaskSeparate((GLenum)p[1], (GLuint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_STENCIL_OP) { + JSB_GL_CHECK_VOID(glStencilOp((GLenum)p[1], (GLenum)p[2], (GLenum)p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_STENCIL_OP_SEPARATE) { + JSB_GL_CHECK_VOID(glStencilOpSeparate((GLenum)p[1], (GLenum)p[2], (GLenum)p[3], (GLenum)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_TEX_PARAMETER_F) { + JSB_GL_CHECK_VOID(glTexParameterf((GLenum)p[1], (GLenum)p[2], p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_TEX_PARAMETER_I) { + JSB_GL_CHECK_VOID(glTexParameteri((GLenum)p[1], (GLenum)p[2], (GLint)p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_UNIFORM_1F) { + JSB_GL_CHECK_VOID(glUniform1f((GLint)p[1], p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_UNIFORM_2F) { + JSB_GL_CHECK_VOID(glUniform2f((GLint)p[1], p[2], p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_UNIFORM_3F) { + JSB_GL_CHECK_VOID(glUniform3f((GLint)p[1], p[2], p[3], p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_UNIFORM_4F) { + JSB_GL_CHECK_VOID(glUniform4f((GLint)p[1], p[2], p[3], p[4], p[5])); + p += 6; + } + else if (commandID == GL_COMMAND_UNIFORM_1I) { + JSB_GL_CHECK_VOID(glUniform1i((GLint)p[1], (GLint)p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_UNIFORM_2I) { + JSB_GL_CHECK_VOID(glUniform2i((GLint)p[1], (GLint)p[2], (GLint)p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_UNIFORM_3I) { + JSB_GL_CHECK_VOID(glUniform3i((GLint)p[1], (GLint)p[2], (GLint)p[3], (GLint)p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_UNIFORM_4I) { + JSB_GL_CHECK_VOID(glUniform4i((GLint)p[1], (GLint)p[2], (GLint)p[3], (GLint)p[4], (GLint)p[5])); + p += 6; + } + else if (commandID == GL_COMMAND_UNIFORM_1FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glUniform1fv((GLint)p[1], elementCount, &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_2FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glUniform2fv((GLint)p[1], elementCount / 2, &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_3FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glUniform3fv((GLint)p[1], elementCount / 3, &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_4FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glUniform4fv((GLint)p[1], elementCount / 3, &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_1IV) { + GLsizei elementCount = (GLsizei)p[2]; + GLint* intBuf = (GLint*)malloc(elementCount); + for (GLsizei i = 0; i < elementCount; ++i) + { + intBuf[i] = p[3+i]; + } + JSB_GL_CHECK_VOID(glUniform1iv((GLint)p[1], elementCount, intBuf)); + free(intBuf); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_2IV) { + GLsizei elementCount = (GLsizei)p[2]; + GLint* intBuf = (GLint*)malloc(elementCount); + for (GLsizei i = 0; i < elementCount; ++i) + { + intBuf[i] = p[3+i]; + } + JSB_GL_CHECK_VOID(glUniform2iv((GLint)p[1], elementCount / 2, intBuf)); + free(intBuf); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_3IV) { + GLsizei elementCount = (GLsizei)p[2]; + GLint* intBuf = (GLint*)malloc(elementCount); + for (GLsizei i = 0; i < elementCount; ++i) + { + intBuf[i] = p[3+i]; + } + JSB_GL_CHECK_VOID(glUniform3iv((GLint)p[1], elementCount / 3, intBuf)); + free(intBuf); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_4IV) { + GLsizei elementCount = (GLsizei)p[2]; + GLint* intBuf = (GLint*)malloc(elementCount); + for (GLsizei i = 0; i < elementCount; ++i) + { + intBuf[i] = p[3+i]; + } + JSB_GL_CHECK_VOID(glUniform4iv((GLint)p[1], elementCount / 4, intBuf)); + free(intBuf); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_UNIFORM_MATRIX_2FV) { + GLsizei elementCount = (GLsizei)p[3]; + JSB_GL_CHECK_VOID(glUniformMatrix2fv((GLint)p[1], elementCount / 4, (GLboolean)p[2], &p[4])); + p += (elementCount + 4); + } + else if (commandID == GL_COMMAND_UNIFORM_MATRIX_3FV) { + GLsizei elementCount = (GLsizei)p[3]; + JSB_GL_CHECK_VOID(glUniformMatrix3fv((GLint)p[1], elementCount / 9, (GLboolean)p[2], &p[4])); + p += (elementCount + 4); + } + else if (commandID == GL_COMMAND_UNIFORM_MATRIX_4FV) { + GLsizei elementCount = (GLsizei)p[3]; + JSB_GL_CHECK_VOID(glUniformMatrix4fv((GLint)p[1], elementCount / 16, (GLboolean)p[2], &p[4])); + p += (elementCount + 4); + } + else if (commandID == GL_COMMAND_USE_PROGRAM) { + JSB_GL_CHECK_VOID(glUseProgram((GLuint) p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_VALIDATE_PROGRAM) { + JSB_GL_CHECK_VOID(glValidateProgram((GLuint) p[1])); + p += 2; + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_1F) { + JSB_GL_CHECK_VOID(glVertexAttrib1f((GLuint)p[1], p[2])); + p += 3; + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_2F) { + JSB_GL_CHECK_VOID(glVertexAttrib2f((GLuint)p[1], p[2], p[3])); + p += 4; + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_3F) { + JSB_GL_CHECK_VOID(glVertexAttrib3f((GLuint)p[1], p[2], p[3], p[4])); + p += 5; + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_4F) { + JSB_GL_CHECK_VOID(glVertexAttrib4f((GLuint)p[1], p[2], p[3], p[4], p[5])); + p += 6; + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_1FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glVertexAttrib1fv((GLint)p[1], &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_2FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glVertexAttrib2fv((GLint)p[1], &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_3FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glVertexAttrib3fv((GLint)p[1], &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_4FV) { + GLsizei elementCount = (GLsizei)p[2]; + JSB_GL_CHECK_VOID(glVertexAttrib4fv((GLint)p[1], &p[3])); + p += (elementCount + 3); + } + else if (commandID == GL_COMMAND_VERTEX_ATTRIB_POINTER) { + JSB_GL_CHECK_VOID(glVertexAttribPointer((GLuint)p[1], (GLint)p[2], (GLenum)p[3], (GLboolean)p[4], (GLsizei)p[5], (const GLvoid*)(GLintptr)p[6])); + p += 7; + } + else if (commandID == GL_COMMAND_VIEW_PORT) { + JSB_GL_CHECK_VOID(glViewport((GLint)p[1], (GLint)p[2], (GLsizei)p[3], (GLsizei)p[4])); + p += 5; + } + else { + assert(false); + } + } + + return true; +} +SE_BIND_FUNC(JSB_glFlushCommand) + bool JSB_register_opengl(se::Object* obj) { glGetIntegerv(GL_FRAMEBUFFER_BINDING, &__defaultFbo); + __jsb_WebGLObject_class = se::Class::create("WebGLObject", obj, nullptr, nullptr); + __jsb_WebGLObject_class->install(); + + se::Object* glObjectProto = __jsb_WebGLObject_class->getProto(); + + __jsb_WebGLTexture_class = se::Class::create("WebGLTexture", obj, glObjectProto, nullptr); + __jsb_WebGLTexture_class->defineFinalizeFunction(_SE(JSB_glTextureFinalize)); + __jsb_WebGLTexture_class->install(); + + __jsb_WebGLProgram_class = se::Class::create("WebGLProgram", obj, glObjectProto, nullptr); + __jsb_WebGLProgram_class->defineFinalizeFunction(_SE(JSB_glProgramFinalize)); + __jsb_WebGLProgram_class->install(); + + __jsb_WebGLBuffer_class = se::Class::create("WebGLBuffer", obj, glObjectProto, nullptr); + __jsb_WebGLBuffer_class->defineFinalizeFunction(_SE(JSB_glBufferFinalize)); + __jsb_WebGLBuffer_class->install(); + + __jsb_WebGLRenderbuffer_class = se::Class::create("WebGLRenderbuffer", obj, glObjectProto, nullptr); + __jsb_WebGLRenderbuffer_class->defineFinalizeFunction(_SE(JSB_glRenderbufferFinalize)); + __jsb_WebGLRenderbuffer_class->install(); + + __jsb_WebGLFramebuffer_class = se::Class::create("WebGLFramebuffer", obj, glObjectProto, nullptr); + __jsb_WebGLFramebuffer_class->defineFinalizeFunction(_SE(JSB_glFramebufferFinalize)); + __jsb_WebGLFramebuffer_class->install(); + + __jsb_WebGLShader_class = se::Class::create("WebGLShader", obj, glObjectProto, nullptr); + __jsb_WebGLShader_class->defineFinalizeFunction(_SE(JSB_glShaderFinalize)); + __jsb_WebGLShader_class->install(); + + __jsb_WebGLActiveInfo_class = se::Class::create("WebGLActiveInfo", obj, nullptr, nullptr); + __jsb_WebGLActiveInfo_class->install(); + // New WebGL functions, not present on OpenGL ES 2.0 __glObj->defineFunction("getSupportedExtensions", _SE(JSB_glGetSupportedExtensions)); __glObj->defineFunction("activeTexture", _SE(JSB_glActiveTexture)); - __glObj->defineFunction("_attachShader", _SE(JSB_glAttachShader)); - __glObj->defineFunction("_bindAttribLocation", _SE(JSB_glBindAttribLocation)); - __glObj->defineFunction("_bindBuffer", _SE(JSB_glBindBuffer)); - __glObj->defineFunction("_bindFramebuffer", _SE(JSB_glBindFramebuffer)); - __glObj->defineFunction("_bindRenderbuffer", _SE(JSB_glBindRenderbuffer)); - __glObj->defineFunction("_bindTexture", _SE(JSB_glBindTexture)); + __glObj->defineFunction("attachShader", _SE(JSB_glAttachShader)); + __glObj->defineFunction("bindAttribLocation", _SE(JSB_glBindAttribLocation)); + __glObj->defineFunction("bindBuffer", _SE(JSB_glBindBuffer)); + __glObj->defineFunction("bindFramebuffer", _SE(JSB_glBindFramebuffer)); + __glObj->defineFunction("bindRenderbuffer", _SE(JSB_glBindRenderbuffer)); + __glObj->defineFunction("bindTexture", _SE(JSB_glBindTexture)); __glObj->defineFunction("blendColor", _SE(JSB_glBlendColor)); __glObj->defineFunction("blendEquation", _SE(JSB_glBlendEquation)); __glObj->defineFunction("blendEquationSeparate", _SE(JSB_glBlendEquationSeparate)); @@ -3386,20 +4336,20 @@ bool JSB_register_opengl(se::Object* obj) __glObj->defineFunction("clearDepth", _SE(JSB_glClearDepthf)); __glObj->defineFunction("clearStencil", _SE(JSB_glClearStencil)); __glObj->defineFunction("colorMask", _SE(JSB_glColorMask)); - __glObj->defineFunction("_compileShader", _SE(JSB_glCompileShader)); + __glObj->defineFunction("compileShader", _SE(JSB_glCompileShader)); __glObj->defineFunction("compressedTexImage2D", _SE(JSB_glCompressedTexImage2D)); __glObj->defineFunction("compressedTexSubImage2D", _SE(JSB_glCompressedTexSubImage2D)); __glObj->defineFunction("copyTexImage2D", _SE(JSB_glCopyTexImage2D)); __glObj->defineFunction("copyTexSubImage2D", _SE(JSB_glCopyTexSubImage2D)); - __glObj->defineFunction("_createProgram", _SE(JSB_glCreateProgram)); - __glObj->defineFunction("_createShader", _SE(JSB_glCreateShader)); + __glObj->defineFunction("createProgram", _SE(JSB_glCreateProgram)); + __glObj->defineFunction("createShader", _SE(JSB_glCreateShader)); __glObj->defineFunction("cullFace", _SE(JSB_glCullFace)); - __glObj->defineFunction("_deleteBuffer", _SE(JSB_glDeleteBuffers)); - __glObj->defineFunction("_deleteFramebuffer", _SE(JSB_glDeleteFramebuffers)); - __glObj->defineFunction("_deleteProgram", _SE(JSB_glDeleteProgram)); - __glObj->defineFunction("_deleteRenderbuffer", _SE(JSB_glDeleteRenderbuffers)); - __glObj->defineFunction("_deleteShader", _SE(JSB_glDeleteShader)); - __glObj->defineFunction("_deleteTexture", _SE(JSB_glDeleteTextures)); + __glObj->defineFunction("deleteBuffer", _SE(JSB_glDeleteBuffer)); + __glObj->defineFunction("deleteFramebuffer", _SE(JSB_glDeleteFramebuffer)); + __glObj->defineFunction("deleteProgram", _SE(JSB_glDeleteProgram)); + __glObj->defineFunction("deleteRenderbuffer", _SE(JSB_glDeleteRenderbuffer)); + __glObj->defineFunction("deleteShader", _SE(JSB_glDeleteShader)); + __glObj->defineFunction("deleteTexture", _SE(JSB_glDeleteTextures)); __glObj->defineFunction("depthFunc", _SE(JSB_glDepthFunc)); __glObj->defineFunction("depthMask", _SE(JSB_glDepthMask)); __glObj->defineFunction("depthRange", _SE(JSB_glDepthRangef)); @@ -3412,37 +4362,37 @@ bool JSB_register_opengl(se::Object* obj) __glObj->defineFunction("enableVertexAttribArray", _SE(JSB_glEnableVertexAttribArray)); __glObj->defineFunction("finish", _SE(JSB_glFinish)); __glObj->defineFunction("flush", _SE(JSB_glFlush)); - __glObj->defineFunction("_framebufferRenderbuffer", _SE(JSB_glFramebufferRenderbuffer)); - __glObj->defineFunction("_framebufferTexture2D", _SE(JSB_glFramebufferTexture2D)); + __glObj->defineFunction("framebufferRenderbuffer", _SE(JSB_glFramebufferRenderbuffer)); + __glObj->defineFunction("framebufferTexture2D", _SE(JSB_glFramebufferTexture2D)); __glObj->defineFunction("frontFace", _SE(JSB_glFrontFace)); - __glObj->defineFunction("_createBuffer", _SE(JSB_glGenBuffers)); - __glObj->defineFunction("_createFramebuffer", _SE(JSB_glGenFramebuffers)); - __glObj->defineFunction("_createRenderbuffer", _SE(JSB_glGenRenderbuffers)); - __glObj->defineFunction("_createTexture", _SE(JSB_glGenTextures)); + __glObj->defineFunction("createBuffer", _SE(JSB_glCreateBuffer)); + __glObj->defineFunction("createFramebuffer", _SE(JSB_glCreateFramebuffer)); + __glObj->defineFunction("createRenderbuffer", _SE(JSB_glCreateRenderbuffer)); + __glObj->defineFunction("createTexture", _SE(JSB_glCreateTexture)); __glObj->defineFunction("generateMipmap", _SE(JSB_glGenerateMipmap)); - __glObj->defineFunction("_getActiveAttrib", _SE(JSB_glGetActiveAttrib)); - __glObj->defineFunction("_getActiveUniform", _SE(JSB_glGetActiveUniform)); - __glObj->defineFunction("_getAttachedShaders", _SE(JSB_glGetAttachedShaders)); - __glObj->defineFunction("_getAttribLocation", _SE(JSB_glGetAttribLocation)); + __glObj->defineFunction("getActiveAttrib", _SE(JSB_glGetActiveAttrib)); + __glObj->defineFunction("getActiveUniform", _SE(JSB_glGetActiveUniform)); + __glObj->defineFunction("getAttachedShaders", _SE(JSB_glGetAttachedShaders)); + __glObj->defineFunction("getAttribLocation", _SE(JSB_glGetAttribLocation)); __glObj->defineFunction("getError", _SE(JSB_glGetError)); - __glObj->defineFunction("_getProgramInfoLog", _SE(JSB_glGetProgramInfoLog)); - __glObj->defineFunction("_getProgramParameter", _SE(JSB_glGetProgramiv)); - __glObj->defineFunction("_getShaderInfoLog", _SE(JSB_glGetShaderInfoLog)); - __glObj->defineFunction("_getShaderSource", _SE(JSB_glGetShaderSource)); - __glObj->defineFunction("_getShaderParameter", _SE(JSB_glGetShaderiv)); + __glObj->defineFunction("getProgramInfoLog", _SE(JSB_glGetProgramInfoLog)); + __glObj->defineFunction("getProgramParameter", _SE(JSB_glGetProgramParameter)); + __glObj->defineFunction("getShaderInfoLog", _SE(JSB_glGetShaderInfoLog)); + __glObj->defineFunction("getShaderSource", _SE(JSB_glGetShaderSource)); + __glObj->defineFunction("getShaderParameter", _SE(JSB_glGetShaderParameter)); __glObj->defineFunction("getTexParameter", _SE(JSB_glGetTexParameterfv)); - __glObj->defineFunction("_getUniformLocation", _SE(JSB_glGetUniformLocation)); - __glObj->defineFunction("_getUniform", _SE(JSB_glGetUniformfv)); + __glObj->defineFunction("getUniformLocation", _SE(JSB_glGetUniformLocation)); + __glObj->defineFunction("getUniform", _SE(JSB_glGetUniformfv)); __glObj->defineFunction("hint", _SE(JSB_glHint)); __glObj->defineFunction("isBuffer", _SE(JSB_glIsBuffer)); __glObj->defineFunction("isEnabled", _SE(JSB_glIsEnabled)); - __glObj->defineFunction("_isFramebuffer", _SE(JSB_glIsFramebuffer)); - __glObj->defineFunction("_isProgram", _SE(JSB_glIsProgram)); - __glObj->defineFunction("_isRenderbuffer", _SE(JSB_glIsRenderbuffer)); - __glObj->defineFunction("_isShader", _SE(JSB_glIsShader)); - __glObj->defineFunction("_isTexture", _SE(JSB_glIsTexture)); + __glObj->defineFunction("isFramebuffer", _SE(JSB_glIsFramebuffer)); + __glObj->defineFunction("isProgram", _SE(JSB_glIsProgram)); + __glObj->defineFunction("isRenderbuffer", _SE(JSB_glIsRenderbuffer)); + __glObj->defineFunction("isShader", _SE(JSB_glIsShader)); + __glObj->defineFunction("isTexture", _SE(JSB_glIsTexture)); __glObj->defineFunction("lineWidth", _SE(JSB_glLineWidth)); - __glObj->defineFunction("_linkProgram", _SE(JSB_glLinkProgram)); + __glObj->defineFunction("linkProgram", _SE(JSB_glLinkProgram)); __glObj->defineFunction("pixelStorei", _SE(JSB_glPixelStorei)); __glObj->defineFunction("polygonOffset", _SE(JSB_glPolygonOffset)); __glObj->defineFunction("readPixels", _SE(JSB_glReadPixels)); @@ -3450,7 +4400,7 @@ bool JSB_register_opengl(se::Object* obj) __glObj->defineFunction("renderbufferStorage", _SE(JSB_glRenderbufferStorage)); __glObj->defineFunction("sampleCoverage", _SE(JSB_glSampleCoverage)); __glObj->defineFunction("scissor", _SE(JSB_glScissor)); - __glObj->defineFunction("_shaderSource", _SE(JSB_glShaderSource)); + __glObj->defineFunction("shaderSource", _SE(JSB_glShaderSource)); __glObj->defineFunction("stencilFunc", _SE(JSB_glStencilFunc)); __glObj->defineFunction("stencilFuncSeparate", _SE(JSB_glStencilFuncSeparate)); __glObj->defineFunction("stencilMask", _SE(JSB_glStencilMask)); @@ -3480,8 +4430,8 @@ bool JSB_register_opengl(se::Object* obj) __glObj->defineFunction("uniformMatrix2fv", _SE(JSB_glUniformMatrix2fv)); __glObj->defineFunction("uniformMatrix3fv", _SE(JSB_glUniformMatrix3fv)); __glObj->defineFunction("uniformMatrix4fv", _SE(JSB_glUniformMatrix4fv)); - __glObj->defineFunction("_useProgram", _SE(JSB_glUseProgram)); - __glObj->defineFunction("_validateProgram", _SE(JSB_glValidateProgram)); + __glObj->defineFunction("useProgram", _SE(JSB_glUseProgram)); + __glObj->defineFunction("validateProgram", _SE(JSB_glValidateProgram)); __glObj->defineFunction("vertexAttrib1f", _SE(JSB_glVertexAttrib1f)); __glObj->defineFunction("vertexAttrib1fv", _SE(JSB_glVertexAttrib1fv)); __glObj->defineFunction("vertexAttrib2f", _SE(JSB_glVertexAttrib2f)); @@ -3491,10 +4441,19 @@ bool JSB_register_opengl(se::Object* obj) __glObj->defineFunction("vertexAttrib4f", _SE(JSB_glVertexAttrib4f)); __glObj->defineFunction("vertexAttrib4fv", _SE(JSB_glVertexAttrib4fv)); __glObj->defineFunction("vertexAttribPointer", _SE(JSB_glVertexAttribPointer)); + __glObj->defineFunction("getVertexAttrib", _SE(JSB_glGetVertexAttrib)); + __glObj->defineFunction("getVertexAttribOffset", _SE(JSB_glGetVertexAttribOffset)); __glObj->defineFunction("viewport", _SE(JSB_glViewport)); __glObj->defineFunction("getParameter", _SE(JSB_glGetParameter)); __glObj->defineFunction("getShaderPrecisionFormat", _SE(JSB_glGetShaderPrecisionFormat)); + // NOT WEBGL standard functions + __glObj->defineFunction("_flushCommands", _SE(JSB_glFlushCommand)); + + se::ScriptEngine::getInstance()->addBeforeCleanupHook([](){ + __shaders.clear(); + }); + return true; } diff --git a/native/cocos/scripting/js-bindings/manual/jsb_opengl_utils.hpp b/native/cocos/scripting/js-bindings/manual/jsb_opengl_utils.hpp index 95b4af34c4..d2049f6719 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_opengl_utils.hpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_opengl_utils.hpp @@ -37,10 +37,19 @@ } \ } while(false) +#define _JSB_GL_CHECK_VOID(_call) \ + do { \ + _call; \ + GLenum gl_err = glGetError(); \ + if (0 != gl_err) { \ + SE_REPORT_ERROR(#_call "; GL error 0x%x: %s", gl_err, glEnumName(gl_err)); \ + } \ + } while(false) #if COCOS2D_DEBUG > 0 -# define JSB_GL_CHECK(_call) _JSB_GL_CHECK(_call) -# define JSB_GL_CHECK_ERROR() \ + #define JSB_GL_CHECK(_call) _JSB_GL_CHECK(_call) + #define JSB_GL_CHECK_VOID(_call) _JSB_GL_CHECK_VOID(_call) + #define JSB_GL_CHECK_ERROR() \ do { \ GLenum gl_err = glGetError(); \ if (0 != gl_err) { \ @@ -49,6 +58,7 @@ } \ } while(false) #else -# define JSB_GL_CHECK(_call) _call -# define JSB_GL_CHECK_ERROR() + #define JSB_GL_CHECK(_call) _call + #define JSB_GL_CHECK_VOID(_call) _call + #define JSB_GL_CHECK_ERROR() #endif // BRENDERER_CONFIG_DEBUG diff --git a/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp index ebd1fa87b6..a378b14a2c 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_renderer_manual.cpp @@ -53,31 +53,6 @@ static bool js_renderer_Camera_getRect(se::State& s) } SE_BIND_FUNC(js_renderer_Camera_getRect) -static bool js_renderer_Camera_extractView(se::State& s) -{ - cocos2d::renderer::Camera* cobj = (cocos2d::renderer::Camera*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Camera_extractView : Invalid Native Object"); - auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 3) { - cocos2d::renderer::View* view = nullptr; - ok = seval_to_native_ptr(args[0], &view); - SE_PRECONDITION2(ok, false, "Convert arg0 failed!"); - int32_t width = 0; - ok = seval_to_int32(args[1], &width); - SE_PRECONDITION2(ok, false, "Convert arg1 failed!"); - int32_t height = 0; - ok = seval_to_int32(args[2], &height); - SE_PRECONDITION2(ok, false, "Convert arg2 failed!"); - cobj->extractView(*view, width, height); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 3); - return false; -} -SE_BIND_FUNC(js_renderer_Camera_extractView) - static bool js_renderer_Camera_screenToWorld(se::State& s) { cocos2d::renderer::Camera* cobj = (cocos2d::renderer::Camera*)s.nativeThisObject(); @@ -140,48 +115,6 @@ static bool js_renderer_Camera_worldToScreen(se::State& s) } SE_BIND_FUNC(js_renderer_Camera_worldToScreen) -static void fillObjectWithValueMap(const cocos2d::ValueMap& v, se::Object* obj) -{ - bool ok = true; - for (const auto& e : v) - { - const std::string& key = e.first; - const cocos2d::Value& value = e.second; - - if (key.empty()) - continue; - - se::Value tmp; - if (!ccvalue_to_seval(value, &tmp)) - { - ok = false; - break; - } - - obj->setProperty(key.c_str(), tmp); - } -} - -static bool js_renderer_Effect_extractDefines(se::State& s) -{ - cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Effect_extractDefines : Invalid Native Object"); - auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - se::Object* out = args[0].toObject(); - cocos2d::ValueMap valueMap; - cobj->extractDefines(valueMap); - fillObjectWithValueMap(valueMap, out); - s.rval().setObject(out); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Effect_extractDefines) - static bool js_renderer_Effect_setProperty(se::State& s) { cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); @@ -221,6 +154,16 @@ static bool js_renderer_Effect_setProperty(se::State& s) } SE_BIND_FUNC(js_renderer_Effect_setProperty) +static bool js_renderer_Effect_self(se::State& s) +{ + cocos2d::renderer::Effect* cobj = (cocos2d::renderer::Effect*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_Effect_setProperty : Invalid Native Object"); + auto addr = (unsigned long)cobj; + s.rval().setNumber(addr); + return true; +} +SE_BIND_FUNC(js_renderer_Effect_self); + static bool js_renderer_Light_extractView(se::State& s) { cocos2d::renderer::Light* cobj = (cocos2d::renderer::Light*)s.nativeThisObject(); @@ -306,6 +249,42 @@ static bool js_renderer_addStage(se::State& s) } SE_BIND_FUNC(js_renderer_addStage) +static bool js_renderer_getStageIDs(se::State& s) +{ + auto& args = s.args(); + size_t argc = args.size(); + if (argc == 1) + { + std::vector stageNames; + CC_UNUSED bool ok = seval_to_std_vector_string(args[0], &stageNames); + SE_PRECONDITION2(ok, false, "Convert arg0 failed!"); + unsigned int stageIDs = cocos2d::renderer::Config::getStageIDs(stageNames); + uint32_to_seval(stageIDs, &s.rval()); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_getStageIDs); + +static bool js_renderer_getStageID(se::State& s) +{ + auto& args = s.args(); + size_t argc = args.size(); + if (argc == 1) + { + std::string stageName; + CC_UNUSED bool ok = seval_to_std_string(args[0], &stageName); + SE_PRECONDITION2(ok, false, "Convert arg0 failed!"); + int stageID = cocos2d::renderer::Config::getStageID(stageName); + int32_to_seval(stageID, &s.rval()); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_getStageID); + class JSNode : public INode { public: @@ -318,14 +297,11 @@ public: { Mat4 worldMatrix; se::Value func; - if (_jsNode.toObject()->getProperty("getWorldMatrix", &func)) + if (_jsNode.toObject()->getProperty("_getWorldMatrix4Native", &func)) { se::Value ret; - se::ValueArray args; - se::HandleObject obj(se::Object::createPlainObject()); - args.push_back(se::Value(obj)); - func.toObject()->call(args, _jsNode.toObject(), &ret); - seval_to_Mat4(se::Value(obj), &worldMatrix); + func.toObject()->call(se::EmptyValueArray, _jsNode.toObject(), &ret); + seval_to_Mat4(ret, &worldMatrix); } return worldMatrix; } @@ -334,13 +310,10 @@ public: { Mat4 worldRT; se::Value func; - if (_jsNode.toObject()->getProperty("getWorldRT", &func)) + if (_jsNode.toObject()->getProperty("_getWorldRT4Native", &func)) { se::Value ret; - se::ValueArray args; - se::HandleObject obj(se::Object::createPlainObject()); - args.push_back(se::Value(obj)); - func.toObject()->call(args, _jsNode.toObject(), &ret); + func.toObject()->call(se::EmptyValueArray, _jsNode.toObject(), &ret); seval_to_Mat4(ret, &worldRT); } return worldRT; @@ -385,107 +358,6 @@ static bool js_renderer_Camera_setNode(se::State& s) } SE_BIND_FUNC(js_renderer_Camera_setNode) -static bool js_renderer_Model_setNode(se::State& s) -{ - cocos2d::renderer::Model* cobj = (cocos2d::renderer::Model*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Model_setNode : Invalid Native Object"); - auto& args = s.args(); - size_t argc = args.size(); - CC_UNUSED bool ok = true; - if (argc == 1) { - INode* node = cobj->getNode(); - delete node; - node = new JSNode(args[0]); - cobj->setNode(node); - return true; - } - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); - return false; -} -SE_BIND_FUNC(js_renderer_Model_setNode) - -static bool js_renderer_Technique_prop_getPasses(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_getPasses: Invalid Native Object."); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) - { - const auto& passes = cobj->getPasses(); - Vector_to_seval(passes, &s.rval()); - return true; - } - - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_PROP_GET(js_renderer_Technique_prop_getPasses); - -static bool js_renderer_Tehchnique_setPass(se::State& s) -{ - cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Technique_getPasses: Invalid Native Object."); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 2) - { - int arg0 = 0; - cocos2d::renderer::Pass* arg1 = nullptr; - - bool ok = seval_to_int32(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Tehchnique_setPass: Can not convert arg1 to int."); - - ok |= seval_to_native_ptr(args[1], &arg1); - SE_PRECONDITION2(ok, false, "js_renderer_Tehchnique_setPass: Can not convert arg0 to Pass*."); - - cobj->setPass(arg0, arg1); - return true; - } - - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_FUNC(js_renderer_Tehchnique_setPass); - -static bool js_renderer_Pass_prop_getStencilTest(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_getStencilTest: Invalid Native Object."); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 0) - { - bool stencilTest = cobj->getStencilTest(); - boolean_to_seval(stencilTest, &s.rval()); - return true; - } - - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_PROP_GET(js_renderer_Pass_prop_getStencilTest); - -static bool js_renderer_Pass_prop_setStencilTest(se::State& s) -{ - cocos2d::renderer::Pass* cobj = (cocos2d::renderer::Pass*)s.nativeThisObject(); - SE_PRECONDITION2(cobj, false, "js_renderer_Pass_sStencilTest: Invalid Native Object."); - const auto& args = s.args(); - size_t argc = args.size(); - if (argc == 1) - { - bool arg0 = false; - bool ok = seval_to_boolean(args[0], &arg0); - SE_PRECONDITION2(ok, false, "js_renderer_Pass_prop_setStencilTest : can not convert arg0 to bool"); - cobj->setStencilTest(arg0); - return true; - } - - SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 0); - return false; -} -SE_BIND_PROP_SET(js_renderer_Pass_prop_setStencilTest); - static bool js_renderer_Config_addStage(se::State& s) { const auto& args = s.args(); @@ -533,18 +405,192 @@ static bool js_register_renderer_Config(se::Object* obj) return true; } +static bool js_renderer_ForwardRenderer_render(se::State& s) +{ + cocos2d::renderer::ForwardRenderer* cobj = (cocos2d::renderer::ForwardRenderer*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_ForwardRenderer_render : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 2) { + cocos2d::renderer::Scene* arg0 = nullptr; + ok &= seval_to_native_ptr(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_ForwardRenderer_render : Error processing arguments"); + + uint8_t* ptr = nullptr; + size_t length = 0; + args[1].toObject()->getTypedArrayData(&ptr, &length); + double* realPtr = (double*)ptr; + + int numOfModels = (int)*realPtr++; + cocos2d::Mat4 worldMatrix; + cocos2d::renderer::InputAssembler ia; + for (size_t i = 0; i < numOfModels; ++i) + { + auto model = cocos2d::renderer::ModelPool::getOrCreateModel(); + model->setDynamicIA((bool)*realPtr++); + model->setViewId((int)*realPtr++); + + // because the data is 64 bits but the data type of Mat4 is float, so can not memcpy + worldMatrix.m[0] = *realPtr++; + worldMatrix.m[1] = *realPtr++; + worldMatrix.m[2] = *realPtr++; + worldMatrix.m[3] = *realPtr++; + worldMatrix.m[4] = *realPtr++; + worldMatrix.m[5] = *realPtr++; + worldMatrix.m[6] = *realPtr++; + worldMatrix.m[7] = *realPtr++; + worldMatrix.m[8] = *realPtr++; + worldMatrix.m[9] = *realPtr++; + worldMatrix.m[10] = *realPtr++; + worldMatrix.m[11] = *realPtr++; + worldMatrix.m[12] = *realPtr++; + worldMatrix.m[13] = *realPtr++; + worldMatrix.m[14] = *realPtr++; + worldMatrix.m[15] = *realPtr++; + + // ia + unsigned long addr = (unsigned long)(*realPtr++); + ia.setVertexBuffer(reinterpret_cast(addr)); + addr = (unsigned long)(*realPtr++); + ia.setIndexBuffer(reinterpret_cast(addr)); + ia.setStart(*realPtr++); + ia.setCount(*realPtr++); + model->addInputAssembler(ia); + + // effect + addr = (unsigned long)(*realPtr++); + model->addEffect(reinterpret_cast(addr)); + + arg0->addModel(model); + } + + cobj->render(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_ForwardRenderer_render); + +se::Object* __jsb_cocos2d_renderer_Technique_proto = nullptr; +se::Class* __jsb_cocos2d_renderer_Technique_class = nullptr; + +static bool js_renderer_Technique_setPass(se::State& s) +{ + cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_Technique_setPass : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 2) { + int arg0 = 0; + cocos2d::renderer::Pass arg1; + do { int32_t tmp = 0; ok &= seval_to_int32(args[0], &tmp); arg0 = (int)tmp; } while(false); + ok &= seval_to_Pass(args[1], arg1); + SE_PRECONDITION2(ok, false, "js_renderer_Technique_setPass : Error processing arguments"); + cobj->setPass(arg0, arg1); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 2); + return false; +} +SE_BIND_FUNC(js_renderer_Technique_setPass) + +static bool js_renderer_Technique_setStages(se::State& s) +{ + cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); + SE_PRECONDITION2(cobj, false, "js_renderer_Technique_setStages : Invalid Native Object"); + const auto& args = s.args(); + size_t argc = args.size(); + CC_UNUSED bool ok = true; + if (argc == 1) { + std::vector arg0; + ok &= seval_to_std_vector_string(args[0], &arg0); + SE_PRECONDITION2(ok, false, "js_renderer_Technique_setStages : Error processing arguments"); + cobj->setStages(arg0); + return true; + } + SE_REPORT_ERROR("wrong number of arguments: %d, was expecting %d", (int)argc, 1); + return false; +} +SE_BIND_FUNC(js_renderer_Technique_setStages) + +SE_DECLARE_FINALIZE_FUNC(js_cocos2d_renderer_Technique_finalize) + +static bool js_renderer_Technique_constructor(se::State& s) +{ + CC_UNUSED bool ok = true; + const auto& args = s.args(); + std::vector arg0; + std::vector arg1; + std::vector arg2; + ok &= seval_to_std_vector_string(args[0], &arg0); + ok &= seval_to_std_vector_TechniqueParameter(args[1], &arg1); + ok &= seval_to_std_vector_Pass(args[2], &arg2); + SE_PRECONDITION2(ok, false, "js_renderer_Technique_constructor : Error processing arguments"); + cocos2d::renderer::Technique* cobj = new (std::nothrow) cocos2d::renderer::Technique(arg0, arg1, arg2); + s.thisObject()->setPrivateData(cobj); + return true; +} +SE_BIND_CTOR(js_renderer_Technique_constructor, __jsb_cocos2d_renderer_Technique_class, js_cocos2d_renderer_Technique_finalize) + +static bool js_cocos2d_renderer_Technique_finalize(se::State& s) +{ + + CCLOGINFO("jsbindings: finalizing JS object %p (cocos2d::renderer::Technique)", s.nativeThisObject()); + cocos2d::renderer::Technique* cobj = (cocos2d::renderer::Technique*)s.nativeThisObject(); + if (cobj->getReferenceCount() == 1) + cobj->autorelease(); + else + cobj->release(); + + return true; +} +SE_BIND_FINALIZE_FUNC(js_cocos2d_renderer_Technique_finalize) + +bool js_register_renderer_Technique(se::Object* obj) +{ + auto cls = se::Class::create("TechniqueNative", obj, nullptr, _SE(js_renderer_Technique_constructor)); + + cls->defineFunction("setPass", _SE(js_renderer_Technique_setPass)); + cls->defineFunction("setStages", _SE(js_renderer_Technique_setStages)); + cls->defineFinalizeFunction(_SE(js_cocos2d_renderer_Technique_finalize)); + cls->install(); + JSBClassType::registerClass(cls); + + __jsb_cocos2d_renderer_Technique_proto = cls->getProto(); + __jsb_cocos2d_renderer_Technique_class = cls; + + se::ScriptEngine::getInstance()->clearException(); + return true; +} + bool jsb_register_renderer_manual(se::Object* global) { + // Get the ns + se::Value nsVal; + if (!global->getProperty("renderer", &nsVal)) + { + se::HandleObject jsobj(se::Object::createPlainObject()); + nsVal.setObject(jsobj); + global->setProperty("renderer", nsVal); + } + se::Object* ns = nsVal.toObject(); + + js_register_renderer_Config(ns); + js_register_renderer_Technique(ns); + // Camera - __jsb_cocos2d_renderer_Camera_proto->defineFunction("getColor", _SE(js_renderer_Camera_getColor)); - __jsb_cocos2d_renderer_Camera_proto->defineFunction("getRect", _SE(js_renderer_Camera_getRect)); - __jsb_cocos2d_renderer_Camera_proto->defineFunction("extractView", _SE(js_renderer_Camera_extractView)); - __jsb_cocos2d_renderer_Camera_proto->defineFunction("screenToWorld", _SE(js_renderer_Camera_screenToWorld)); - __jsb_cocos2d_renderer_Camera_proto->defineFunction("worldToScreen", _SE(js_renderer_Camera_worldToScreen)); +// __jsb_cocos2d_renderer_Camera_proto->defineFunction("getColor", _SE(js_renderer_Camera_getColor)); +// __jsb_cocos2d_renderer_Camera_proto->defineFunction("getRect", _SE(js_renderer_Camera_getRect)); +// __jsb_cocos2d_renderer_Camera_proto->defineFunction("extractView", _SE(js_renderer_Camera_extractView)); +// __jsb_cocos2d_renderer_Camera_proto->defineFunction("screenToWorld", _SE(js_renderer_Camera_screenToWorld)); +// __jsb_cocos2d_renderer_Camera_proto->defineFunction("worldToScreen", _SE(js_renderer_Camera_worldToScreen)); // Effect - __jsb_cocos2d_renderer_Effect_proto->defineFunction("extractDefines", _SE(js_renderer_Effect_extractDefines)); __jsb_cocos2d_renderer_Effect_proto->defineFunction("setProperty", _SE(js_renderer_Effect_setProperty)); + __jsb_cocos2d_renderer_Effect_proto->defineFunction("self", _SE(js_renderer_Effect_self)); // Light __jsb_cocos2d_renderer_Light_proto->defineFunction("extractView", _SE(js_renderer_Light_extractView)); @@ -557,32 +603,20 @@ bool jsb_register_renderer_manual(se::Object* global) se::Value rendererVal; global->getProperty("renderer", &rendererVal); rendererVal.toObject()->defineFunction("addStage", _SE(js_renderer_addStage)); + rendererVal.toObject()->defineFunction("stageIDs", _SE(js_renderer_getStageIDs)); + rendererVal.toObject()->defineFunction("stageID", _SE(js_renderer_getStageID)); // Camera __jsb_cocos2d_renderer_Camera_proto->defineFunction("setNode", _SE(js_renderer_Camera_setNode)); - // Model - __jsb_cocos2d_renderer_Model_proto->defineFunction("setNode", _SE(js_renderer_Model_setNode)); - - // Technique - __jsb_cocos2d_renderer_Technique_proto->defineProperty("_passes", _SE(js_renderer_Technique_prop_getPasses), nullptr); - // BaseRenderer __jsb_cocos2d_renderer_BaseRenderer_proto->defineProperty("_programLib", _SE(js_renderer_BaseRenderer_prop_getProgramLib), nullptr); + + // Scene +// __jsb_cocos2d_renderer_Scene_proto->defineFunction("addModelNative", _SE(js_renderer_Scene_addModel)); - // Config - - // Get the ns - se::Value nsVal; - if (!global->getProperty("renderer", &nsVal)) - { - se::HandleObject jsobj(se::Object::createPlainObject()); - nsVal.setObject(jsobj); - global->setProperty("renderer", nsVal); - } - se::Object* ns = nsVal.toObject(); - - js_register_renderer_Config(ns); + // ForwardRenderer + __jsb_cocos2d_renderer_ForwardRenderer_proto->defineFunction("renderNative", _SE(js_renderer_ForwardRenderer_render)); return true; } diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/native/templates/js-template-binary/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp index 554332d780..0f24ce6d6e 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } extern "C" diff --git a/native/templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp b/native/templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp index ee23258e2e..78b4ee3cb3 100755 --- a/native/templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp index 554332d780..68bd579b43 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } extern "C" diff --git a/native/templates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp b/native/templates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp index 554332d780..68bd579b43 100755 --- a/native/templates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } extern "C" diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp index 554332d780..68bd579b43 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } extern "C" diff --git a/native/templates/js-template-link/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp b/native/templates/js-template-link/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp index 554332d780..68bd579b43 100755 --- a/native/templates/js-template-link/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp +++ b/native/templates/js-template-link/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp @@ -41,7 +41,7 @@ using namespace cocos2d; using namespace anysdk::framework; #endif -void cocos_android_app_init (JNIEnv* env) { +Application* cocos_android_app_init (JNIEnv* env) { LOGD("cocos_android_app_init"); AppDelegate *pAppDelegate = new AppDelegate(); #if PACKAGE_AS @@ -49,6 +49,7 @@ void cocos_android_app_init (JNIEnv* env) { env->GetJavaVM(&vm); PluginJniHelper::setJavaVM(vm); #endif + return pAppDelegate; } extern "C" diff --git a/native/tools/tojs/gfx.ini b/native/tools/tojs/gfx.ini index 5d1c7abe80..52fc4bc8eb 100644 --- a/native/tools/tojs/gfx.ini +++ b/native/tools/tojs/gfx.ini @@ -48,7 +48,8 @@ skip = DeviceGraphics::[clear setUniform.*], FrameBuffer::[create init (g|s)et.*Buffer] -rename_functions = DeviceGraphics::[setBlendFuncSeparate=setBlendFuncSep setBlendEquationSeparate=setBlendEqSep] +rename_functions = DeviceGraphics::[setBlendFuncSeparate=setBlendFuncSep setBlendEquationSeparate=setBlendEqSep], + Texture2D::[update=updateBinding] rename_classes = DeviceGraphics::Device diff --git a/native/tools/tojs/renderer.ini b/native/tools/tojs/renderer.ini index 7cf1e6ae56..4d7a8e4068 100644 --- a/native/tools/tojs/renderer.ini +++ b/native/tools/tojs/renderer.ini @@ -30,7 +30,7 @@ replace_headers = # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = ForwardRenderer BaseRenderer Camera Effect InputAssembler Light Model Pass Scene Technique View ProgramLib +classes = ForwardRenderer BaseRenderer Camera Light Scene View ProgramLib Effect classes_need_extend = @@ -43,15 +43,16 @@ classes_need_extend = skip = BaseRenderer::[registerStage], Camera::[getColor getRect extractView screenToWorld worldToScreen setNode getNode], - Effect::[extractDefines setProperty getTechniques], Light::[extractView], - Model::[extractDrawItem setNode getNode], - View::[getForward getPosition] + View::[getForward getPosition], + Scene::[getModel removeModel addModel removeModels], + Effect::[getProperty getDefine extractDefines getTechnique getProperties setProperty], + ForwardRenderer::[render] +rename_classes = BaseRenderer::Base, + Effect::EffectNative -rename_functions = Effect::[setDefineValue=define] - -rename_classes = BaseRenderer::Base +rename_functions = # for all class names, should we remove something when registering in the target VM? remove_prefix = @@ -65,7 +66,7 @@ base_classes_to_skip = Ref Clonable # classes that create no constructor # Set is special and we will use a hand-written constructor -abstract_classes = +abstract_classes = persistent_classes =