mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 08:02:39 +08:00
Merge pull request #1200 from dumganhar/runtime
Merge new-renderer and some optimizations.
This commit is contained in:
@@ -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 = "<group>"; };
|
||||
1A14FD902080B4E300E10ABE /* CCGLUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCGLUtils.h; sourceTree = "<group>"; };
|
||||
1A28FF1F1F20AFAB007A1D9D /* SRDelegateController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRDelegateController.h; sourceTree = "<group>"; };
|
||||
1A28FF201F20AFAB007A1D9D /* SRDelegateController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SRDelegateController.m; sourceTree = "<group>"; };
|
||||
1A28FF221F20AFAB007A1D9D /* SRIOConsumer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SRIOConsumer.h; sourceTree = "<group>"; };
|
||||
@@ -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";
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 <stdio.h>
|
||||
|
||||
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
|
||||
@@ -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
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -24,13 +24,16 @@
|
||||
****************************************************************************/
|
||||
|
||||
#import "CCApplication.h"
|
||||
#import <UIKit/UIKit.h>
|
||||
#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 <UIKit/UIKit.h>
|
||||
|
||||
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();
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -69,6 +69,8 @@ public:
|
||||
return _fetchDataCallback(bytes);
|
||||
}
|
||||
|
||||
void destroy();
|
||||
|
||||
private:
|
||||
DeviceGraphics* _device;
|
||||
IndexFormat _format;
|
||||
|
||||
@@ -83,6 +83,8 @@ State::State()
|
||||
State::State(const State& o)
|
||||
{
|
||||
*this = o;
|
||||
|
||||
_textureUnits.reserve(10);
|
||||
}
|
||||
|
||||
State::State(State&& o)
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -24,15 +24,16 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "../Types.h"
|
||||
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <unordered_map>
|
||||
|
||||
#include "base/CCRef.h"
|
||||
#include "../Types.h"
|
||||
|
||||
RENDERER_BEGIN
|
||||
|
||||
class VertexFormat
|
||||
class VertexFormat : public Ref
|
||||
{
|
||||
public:
|
||||
struct Info
|
||||
|
||||
@@ -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<StageItem> stageItems;
|
||||
for (const auto& stage : view.stages)
|
||||
{
|
||||
std::vector<StageItem> 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<std::string, StageCallback>::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<int> 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()
|
||||
|
||||
@@ -57,7 +57,7 @@ public:
|
||||
Technique* technique = nullptr;
|
||||
int sortKey = -1;
|
||||
};
|
||||
typedef std::function<void(const View*, const std::vector<StageItem>&)> StageCallback;
|
||||
typedef std::function<void(const View&, const std::vector<StageItem>&)> 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<StageItem> items;
|
||||
std::vector<StageItem>* items;
|
||||
std::string stage = "";
|
||||
};
|
||||
|
||||
|
||||
@@ -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<std::string>& 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<Camera*>(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
|
||||
|
||||
@@ -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<std::string>& getStages() const { return _stages; }
|
||||
inline void setStages(const std::vector<std::string>& stages) { _stages = stages; }
|
||||
void setStages(const std::vector<std::string>& 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
|
||||
|
||||
@@ -35,11 +35,16 @@ Effect::Effect(const Vector<Technique*>& 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
|
||||
|
||||
@@ -43,23 +43,26 @@ public:
|
||||
const std::unordered_map<std::string, Property>& properties,
|
||||
const std::vector<ValueMap>& defineTemplates);
|
||||
|
||||
virtual ~Effect();
|
||||
~Effect();
|
||||
|
||||
void clear();
|
||||
|
||||
Technique* getTechnique(const std::string& stage) const;
|
||||
const Vector<Technique*>& getTechniques() const { return _techniques; }
|
||||
|
||||
Value getDefineValue(const std::string& name) const;
|
||||
const std::vector<ValueMap>& 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<std::string, Property>& getProperties() const { return _properties; }
|
||||
|
||||
private:
|
||||
Vector<Technique*> _techniques;
|
||||
std::vector<ValueMap> _defineTemplates;
|
||||
ValueMap _cachedNameValues;
|
||||
std::unordered_map<std::string, Property> _properties;
|
||||
};
|
||||
|
||||
|
||||
@@ -54,49 +54,26 @@ bool ForwardRenderer::init(DeviceGraphics* device, std::vector<ProgramLib::Templ
|
||||
|
||||
void ForwardRenderer::render(Scene* scene)
|
||||
{
|
||||
reset();
|
||||
// reset();
|
||||
|
||||
const auto& cameras = scene->getCameras();
|
||||
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<StageItem>& items)
|
||||
void ForwardRenderer::transparentStage(const View& view, const std::vector<StageItem>& 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
|
||||
|
||||
@@ -37,7 +37,7 @@ public:
|
||||
void render(Scene* scene);
|
||||
|
||||
private:
|
||||
void transparentStage(const View* view, const std::vector<StageItem>& items);
|
||||
void transparentStage(const View& view, const std::vector<StageItem>& items);
|
||||
|
||||
int _width = 0;
|
||||
int _height = 0;
|
||||
|
||||
@@ -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*/)
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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<Model*>(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<Model*>(this);
|
||||
out.node = _node;
|
||||
out.ia = nullptr;
|
||||
out.effect = _effects.at(0);
|
||||
out.defines = out.effect->extractDefines(const_cast<ValueMap&>(_defines[0]));
|
||||
out.effect = static_cast<Effect*>(_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<Model*>(this);
|
||||
out.node = _node;
|
||||
out.ia = _inputAssemblers.at(index);
|
||||
out.ia = const_cast<InputAssembler*>(&(_inputAssemblers[index]));
|
||||
|
||||
auto effectsSize = _effects.size();
|
||||
auto effectsSize = _effects->num;
|
||||
if (index >= effectsSize)
|
||||
index = (uint32_t)(effectsSize - 1);
|
||||
|
||||
out.effect = const_cast<Effect*>(_effects.at(index));
|
||||
out.defines = out.effect->extractDefines(const_cast<ValueMap&>(_defines[index]));
|
||||
out.effect = static_cast<Effect*>(_effects->arr[index]);
|
||||
|
||||
out.defines = out.effect->extractDefines();
|
||||
}
|
||||
|
||||
void Model::reset()
|
||||
{
|
||||
ccCArrayRemoveAllValues(_effects);
|
||||
_inputAssemblers.clear();
|
||||
|
||||
_defines.clear();
|
||||
}
|
||||
|
||||
RENDERER_END
|
||||
|
||||
@@ -25,8 +25,10 @@
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#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<Effect*> _effects;
|
||||
Vector<InputAssembler*> _inputAssemblers;
|
||||
std::vector<ValueMap> _defines;
|
||||
ccCArray* _effects = ccCArrayNew(2);
|
||||
|
||||
std::vector<InputAssembler> _inputAssemblers;
|
||||
std::vector<ValueMap*> _defines;
|
||||
bool _dynamicIA = false;
|
||||
int _viewID = -1;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
#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<Model*>& getModels() const { return _models; }
|
||||
void removeModels();
|
||||
inline const std::vector<Model*>& getModels() const { return _models; }
|
||||
|
||||
// light
|
||||
inline uint32_t getLightCount() const { return (uint32_t)_lights.size(); }
|
||||
@@ -71,7 +73,7 @@ private:
|
||||
//TODO: optimize speed.
|
||||
Vector<Camera*> _cameras;
|
||||
Vector<Light*> _lights;
|
||||
Vector<Model*> _models;
|
||||
std::vector<Model*> _models;
|
||||
Vector<View*> _views;
|
||||
Camera* _debugCamera = nullptr;
|
||||
};
|
||||
|
||||
@@ -359,7 +359,7 @@ uint32_t Technique::_genID = 0;
|
||||
|
||||
Technique::Technique(const std::vector<std::string>& stages,
|
||||
const std::vector<Parameter>& parameters,
|
||||
const Vector<Pass*>& passes,
|
||||
const std::vector<Pass>& passes,
|
||||
int layer)
|
||||
: _id(_genID++)
|
||||
, _stageIDs(Config::getStageIDs(stages))
|
||||
@@ -380,9 +380,9 @@ void Technique::setStages(const std::vector<std::string>& 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
|
||||
|
||||
@@ -109,16 +109,16 @@ public:
|
||||
|
||||
Technique(const std::vector<std::string>& stages,
|
||||
const std::vector<Parameter>& parameters,
|
||||
const Vector<Pass*>& passes,
|
||||
const std::vector<Pass>& passes,
|
||||
int layer = 0);
|
||||
|
||||
virtual ~Technique();
|
||||
~Technique();
|
||||
|
||||
void setStages(const std::vector<std::string>& stages);
|
||||
void setPass(int index, Pass* pass);
|
||||
void setPass(int index, const Pass& pass);
|
||||
|
||||
const std::vector<Parameter>& getParameters() const { return _parameters; }
|
||||
const Vector<Pass*>& getPasses() const { return _passes; }
|
||||
const std::vector<Pass>& 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<Parameter> _parameters;
|
||||
Vector<Pass*> _passes;
|
||||
std::vector<Pass> _passes;
|
||||
};
|
||||
|
||||
RENDERER_END
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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);
|
||||
|
||||
@@ -82,7 +82,7 @@ namespace se {
|
||||
setter = JSObjectMakeFunctionWithCallback(__cx, nullptr, jsSetter);
|
||||
}
|
||||
|
||||
assert(getter != nullptr);
|
||||
assert(getter != nullptr || setter != nullptr);
|
||||
|
||||
if (getter != nullptr)
|
||||
{
|
||||
|
||||
@@ -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); \
|
||||
|
||||
@@ -481,6 +481,7 @@ namespace se {
|
||||
}
|
||||
size_t argc = 0;
|
||||
std::vector<v8::Local<v8::Value>> argv;
|
||||
argv.reserve(10);
|
||||
argc = args.size();
|
||||
internal::seToJsArgs(__isolate, args, &argv);
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "jsb_conversions.hpp"
|
||||
#include <sstream>
|
||||
#include <regex>
|
||||
|
||||
// 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<cocos2d::Vec2>* 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<cocos2d::renderer::CullMode>(*binary32));
|
||||
|
||||
// blend
|
||||
pass.setBlend(static_cast<cocos2d::renderer::BlendOp>(*(binary32 + 1)), // blendEq
|
||||
static_cast<cocos2d::renderer::BlendFactor>(*(binary32 + 2)), // blendSrc
|
||||
static_cast<cocos2d::renderer::BlendFactor>(*(binary32 + 3)), // blendDst
|
||||
static_cast<cocos2d::renderer::BlendOp>(*(binary32 + 4)), // blendAlphaEq
|
||||
static_cast<cocos2d::renderer::BlendFactor>(*(binary32 + 5)), // blendSrcAlpha
|
||||
static_cast<cocos2d::renderer::BlendFactor>(*(binary32 + 6)), // blendDstAlpha
|
||||
*(binary32 + 7)); // blend color
|
||||
|
||||
// depth
|
||||
pass.setDepth(*(binary32 + 8), // depth test
|
||||
*(binary32 + 9), // depth write
|
||||
static_cast<cocos2d::renderer::DepthFunc>(*(binary32 + 10))); // depth func
|
||||
|
||||
// stencil front
|
||||
pass.setStencilFront(static_cast<cocos2d::renderer::StencilFunc>(*(binary32 + 11)), // stencilFuncFront
|
||||
*(binary32 + 12), // stencilRefFront
|
||||
*(binary32 + 13), // stencilMaskFront
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 14)), // stencilFailOpFront
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 15)), // stencilZFailOpFront
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 16)), // stencilZPassOpFront
|
||||
*(binary32 + 17)); // stencilWrtieMaskFront
|
||||
|
||||
// stencil back
|
||||
pass.setStencilBack(static_cast<cocos2d::renderer::StencilFunc>(*(binary32 + 18)), // stencilFuncBack
|
||||
*(binary32 + 19), // stencilRefBack
|
||||
*(binary32 + 20), // stencilMaskBack
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 21)), // stencilFailOpBack
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 22)), // stencilZFailOpBack
|
||||
static_cast<cocos2d::renderer::StencilOp>(*(binary32 + 23)), // stencilZFailOpBack
|
||||
*(binary32 + 24)); // stencilWrtieMaskBack
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool seval_to_std_vector_Pass(const se::Value& v, std::vector<cocos2d::renderer::Pass>* 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<cocos2d::Touch*>* 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::vector<coco
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
void adjustShaderSource(std::string& shaderSource)
|
||||
{
|
||||
#if CC_TARGET_PLATFORM == CC_PLATFORM_MAC || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
||||
shaderSource = std::regex_replace(shaderSource, std::regex("precision\\s+(lowp|mediump|highp)\\s+float\\s*?;"), "");
|
||||
shaderSource = std::regex_replace(shaderSource, std::regex("\\s(lowp|mediump|highp)\\s"), " ");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
bool seval_to_ProgramLib_Template(const se::Value& v, cocos2d::renderer::ProgramLib::Template* ret)
|
||||
{
|
||||
assert(ret != nullptr);
|
||||
@@ -2063,12 +2127,14 @@ bool seval_to_ProgramLib_Template(const se::Value& v, cocos2d::renderer::Program
|
||||
{
|
||||
ok = seval_to_std_string(tmp, &ret->vert);
|
||||
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<std::string, std::string>& 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<cocos2d::renderer::Texture>(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<cocos2d::renderer::Texture>(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<std::string, cocos2d::renderer::Effect::Property>& 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<std::string, std::string>& 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<cocos2d::renderer::Texture>(texArray[0], &val);
|
||||
arr->setArrayElement(i, val);
|
||||
}
|
||||
ret->setObject(arr);
|
||||
}
|
||||
else
|
||||
{
|
||||
se::Value val;
|
||||
native_ptr_to_seval<cocos2d::renderer::Texture>(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::vector<cocos2d::renderer:
|
||||
uint32_t i = 0;
|
||||
for (const auto& param : v)
|
||||
{
|
||||
se::Value out;
|
||||
if (TechniqueParameter_to_seval(param, &out))
|
||||
{
|
||||
arr->setArrayElement(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<cocos2d::ValueMap>& 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<cocos2d::renderer::RenderTarget*>& v, se::Value* ret)
|
||||
{
|
||||
assert(false);
|
||||
|
||||
@@ -83,6 +83,8 @@ bool seval_to_std_vector_string(const se::Value& v, std::vector<std::string>* re
|
||||
bool seval_to_std_vector_int(const se::Value& v, std::vector<int>* ret);
|
||||
bool seval_to_std_vector_float(const se::Value& v, std::vector<float>* ret);
|
||||
bool seval_to_std_vector_Vec2(const se::Value& v, std::vector<cocos2d::Vec2>* 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<cocos2d::renderer::Pass>* ret);
|
||||
//bool seval_to_std_vector_Touch(const se::Value& v, std::vector<cocos2d::Touch*>* ret);
|
||||
bool seval_to_std_map_string_string(const se::Value& v, std::map<std::string, std::string>* 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<int>& v, se::Value* ret);
|
||||
bool std_vector_float_to_seval(const std::vector<float>& v, se::Value* ret);
|
||||
//bool std_vector_Touch_to_seval(const std::vector<cocos2d::Touch*>& v, se::Value* ret);
|
||||
bool std_map_string_string_to_seval(const std::map<std::string, std::string>& v, se::Value* ret);
|
||||
bool std_unorderedmap_string_EffectProperty_to_seval(const std::unordered_map<std::string, cocos2d::renderer::Effect::Property>& 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<cocos2d::renderer::Technique::Parameter>& v, se::Value* ret);
|
||||
bool std_vector_EffectDefine_to_seval(const std::vector<cocos2d::ValueMap>& v, se::Value* ret);
|
||||
|
||||
template<typename T>
|
||||
bool recreate_seval_by_native_ptr(typename std::enable_if<!std::is_base_of<cocos2d::Ref,T>::value,T>::type* v, se::Class* cls, se::Value* ret)
|
||||
|
||||
@@ -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<VertexFormat::Info> 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<cocos2d::renderer::VertexFormat*>(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<VertexFormat*>(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<cocos2d::renderer::VertexFormat>(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));
|
||||
|
||||
@@ -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));
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -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
|
||||
|
||||
@@ -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<std::string> 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<cocos2d::renderer::Pass>(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<cocos2d::renderer::VertexBuffer*>(addr));
|
||||
addr = (unsigned long)(*realPtr++);
|
||||
ia.setIndexBuffer(reinterpret_cast<cocos2d::renderer::IndexBuffer*>(addr));
|
||||
ia.setStart(*realPtr++);
|
||||
ia.setCount(*realPtr++);
|
||||
model->addInputAssembler(ia);
|
||||
|
||||
// effect
|
||||
addr = (unsigned long)(*realPtr++);
|
||||
model->addEffect(reinterpret_cast<cocos2d::renderer::Effect*>(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<std::string> 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<std::string> arg0;
|
||||
std::vector<cocos2d::renderer::Technique::Parameter> arg1;
|
||||
std::vector<cocos2d::renderer::Pass> 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<cocos2d::renderer::Technique>(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;
|
||||
}
|
||||
|
||||
+2
-1
@@ -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"
|
||||
|
||||
+2
-1
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
+2
-1
@@ -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"
|
||||
|
||||
+2
-1
@@ -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"
|
||||
|
||||
+2
-1
@@ -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"
|
||||
|
||||
+2
-1
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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 =
|
||||
|
||||
|
||||
Reference in New Issue
Block a user