support Windows and Mac platform for editor

native/cocos/application/CocosApplication.cpp

@@ -89,8 +89,12 @@ int CocosApplication::init() {
                   std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 
     jsb_register_all_modules();
-
+#if CC_EDITOR
+    auto isolate = v8::Isolate::GetCurrent();
+    se->start(isolate);
+#else
     se->start();
+#endif
 
 #if (CC_PLATFORM == CC_PLATFORM_IOS)
     auto logicSize = _systemWindow->getViewSize();

native/cocos/bindings/jswrapper/v8/Object.cpp

@@ -27,6 +27,11 @@
 #include "Object.h"
 #include "v8/HelperMacros.h"
 
+// Use node::Buffer to replace v8 api,to avoid link err in editor platform.
+#if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    #include <node_buffer.h>
+#endif
+
 #if SCRIPT_ENGINE_TYPE == SCRIPT_ENGINE_V8
     #include "../MappingUtils.h"
     #include "Class.h"
@@ -217,21 +222,37 @@ Object *Object::createArrayObject(size_t length) {
 }
 
 Object *Object::createArrayBufferObject(const void *data, size_t byteLength) {
+    #if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    auto nodeBuffer = node::Buffer::New(__isolate, byteLength);
+    auto *srcData = node::Buffer::Data(nodeBuffer.ToLocalChecked());
+    v8::Local<v8::ArrayBuffer> jsobj = nodeBuffer.ToLocalChecked().As<v8::TypedArray>()->Buffer();
+    #else
     v8::Local<v8::ArrayBuffer> jsobj = v8::ArrayBuffer::New(__isolate, byteLength);
+    auto *srcData = jsobj->GetBackingStore()->Data();
+    #endif
     if (data) {
-        memcpy(jsobj->GetBackingStore()->Data(), data, byteLength);
+        memcpy(srcData, data, byteLength);
     } else {
-        memset(jsobj->GetBackingStore()->Data(), 0, byteLength);
+        memset(srcData, 0, byteLength);
     }
     Object *obj = Object::_createJSObject(nullptr, jsobj);
     return obj;
 }
 
 /* static */
 Object *Object::createExternalArrayBufferObject(void *contents, size_t byteLength, BufferContentsFreeFunc freeFunc, void *freeUserData /* = nullptr*/) {
-    std::shared_ptr<v8::BackingStore> backingStore = v8::ArrayBuffer::NewBackingStore(contents, byteLength, freeFunc, freeUserData);
     Object *obj = nullptr;
+    #if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    auto nodeBuffer = node::Buffer::New(
+                        __isolate, (char *)contents, byteLength, [](char *data, void *hint) {}, nullptr)
+                        .ToLocalChecked()
+                        .As<v8::TypedArray>();
+    v8::Local<v8::ArrayBuffer> jsobj = nodeBuffer.As<v8::TypedArray>()->Buffer();
+    #else
+    std::shared_ptr<v8::BackingStore> backingStore = v8::ArrayBuffer::NewBackingStore(contents, byteLength, freeFunc, freeUserData);
     v8::Local<v8::ArrayBuffer> jsobj = v8::ArrayBuffer::New(__isolate, backingStore);
+    #endif
+
     if (!jsobj.IsEmpty()) {
         obj = Object::_createJSObject(nullptr, jsobj);
     }
@@ -248,13 +269,20 @@ Object *Object::createTypedArray(TypedArrayType type, const void *data, size_t b
         SE_LOGE("Doesn't support to create Uint8ClampedArray with Object::createTypedArray API!");
         return nullptr;
     }
-
+    #if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    auto nodeBuffer = node::Buffer::New(__isolate, byteLength);
+    auto *srcData = node::Buffer::Data(nodeBuffer.ToLocalChecked());
+    v8::Local<v8::ArrayBuffer> jsobj = nodeBuffer.ToLocalChecked().As<v8::TypedArray>()->Buffer();
+    #else
     v8::Local<v8::ArrayBuffer> jsobj = v8::ArrayBuffer::New(__isolate, byteLength);
+    auto *srcData = jsobj->GetBackingStore()->Data();
+    #endif
+
     // If data has content,then will copy data into buffer,or will only clear buffer.
     if (data) {
-        memcpy(jsobj->GetBackingStore()->Data(), data, byteLength);
+        memcpy(srcData, data, byteLength);
     } else {
-        memset(jsobj->GetBackingStore()->Data(), 0, byteLength);
+        memset(srcData, 0, byteLength);
     }
 
     v8::Local<v8::Object> arr;
@@ -299,7 +327,7 @@ Object *Object::createTypedArrayWithBuffer(TypedArrayType type, const Object *ob
 Object *Object::createTypedArrayWithBuffer(TypedArrayType type, const Object *obj, size_t offset) {
     size_t byteLength{0};
     uint8_t *skip{nullptr};
-    obj->getTypedArrayData(&skip, &byteLength);
+    obj->getArrayBufferData(&skip, &byteLength);
     return Object::createTypedArrayWithBuffer(type, obj, offset, byteLength - offset);
 }
 
@@ -555,12 +583,21 @@ Object::TypedArrayType Object::getTypedArrayType() const {
 bool Object::getTypedArrayData(uint8_t **ptr, size_t *length) const {
     CC_ASSERT(isTypedArray());
     v8::Local<v8::Object> obj = const_cast<Object *>(this)->_obj.handle(__isolate);
+    #if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    char *data = node::Buffer::Data(obj);
+    *ptr = reinterpret_cast<uint8_t *>(data);
+    if (length) {
+        *length = node::Buffer::Length(obj);
+    }
+    #else
     v8::Local<v8::TypedArray> arr = v8::Local<v8::TypedArray>::Cast(obj);
     const auto &backingStore = arr->Buffer()->GetBackingStore();
     *ptr = static_cast<uint8_t *>(backingStore->Data()) + arr->ByteOffset();
     if (length) {
         *length = arr->ByteLength();
     }
+    #endif
+
     return true;
 }
 
@@ -571,14 +608,23 @@ bool Object::isArrayBuffer() const {
 
 bool Object::getArrayBufferData(uint8_t **ptr, size_t *length) const {
     CC_ASSERT(isArrayBuffer());
+    #if CC_EDITOR && CC_PLATFORM == CC_PLATFORM_WINDOWS
+    v8::Local<v8::ArrayBuffer> jsobj = _getJSObject().As<v8::ArrayBuffer>();
+    auto obj = v8::Int8Array::New(jsobj, 0, jsobj->ByteLength());
+    char *data = node::Buffer::Data(obj.As<v8::Value>());
+    *ptr = reinterpret_cast<uint8_t *>(data);
+    if (length) {
+        *length = node::Buffer::Length(obj.As<v8::Value>());
+    }
+    #else
     v8::Local<v8::Object> obj = const_cast<Object *>(this)->_obj.handle(__isolate);
     v8::Local<v8::ArrayBuffer> arrBuf = v8::Local<v8::ArrayBuffer>::Cast(obj);
     const auto &backingStore = arrBuf->GetBackingStore();
     *ptr = static_cast<uint8_t *>(backingStore->Data());
     if (length) {
         *length = backingStore->ByteLength();
     }
-
+    #endif
     return true;
 }
 

native/cocos/bindings/jswrapper/v8/Utils.cpp

@@ -199,7 +199,7 @@ void setPrivate(v8::Isolate *isolate, ObjectWrap &wrap, Object *thizObj) {
     v8::Local<v8::Object> obj = wrap.handle(isolate);
     int c = obj->InternalFieldCount();
     CC_ASSERT(c > 0);
-    if (c > 0) {
+    if (c == 1) {
         wrap.wrap(thizObj, 0);
     }
 }
@@ -213,7 +213,7 @@ Object *getPrivate(v8::Isolate *isolate, v8::Local<v8::Value> value) {
 
     v8::Local<v8::Object> objChecked = obj.ToLocalChecked();
     int c = objChecked->InternalFieldCount();
-    if (c > 0) {
+    if (c == 1) {
         return static_cast<Object *>(ObjectWrap::unwrap(objChecked, 0));
     }
 
@@ -223,7 +223,7 @@ Object *getPrivate(v8::Isolate *isolate, v8::Local<v8::Value> value) {
 void clearPrivate(v8::Isolate *isolate, ObjectWrap &wrap) {
     v8::Local<v8::Object> obj = wrap.handle(isolate);
     int c = obj->InternalFieldCount();
-    if (c > 0) {
+    if (c == 1) {
         wrap.wrap(nullptr, 0);
     }
 }

native/cocos/platform/mac/MacPlatform.mm

@@ -67,7 +67,12 @@ - (instancetype)initWithApp:(cc::MacPlatform *)platform fps:(int)fps {
     }
     return self;
 }
-
+#if CC_EDITOR
+    - (void)start { }
+    - (void)changeFPS { }
+    - (void)pause { }
+    - (void)resume { }
+#else
 - (void)start {
     int32_t fps = _platform->getFps();
     _timer = [NSTimer scheduledTimerWithTimeInterval:1.0f / fps
@@ -93,7 +98,7 @@ - (void)changeFPS {
 - (void)renderScene {
     _platform->runTask();
 }
-
+#endif
 @end
 
 namespace {
@@ -119,6 +124,10 @@ - (void)renderScene {
 }
 
 int32_t MacPlatform::loop(void) {
+#if CC_EDITOR
+    runTask();
+    return 1;
+#else
     [_timer start];
     NSArray *arguments = [[NSProcessInfo processInfo] arguments];
     int argc = static_cast<int>(arguments.count);
@@ -129,6 +138,7 @@ - (void)renderScene {
     }
 
     return cocos_main(argc, argv.data());
+#endif
 }
 
 int32_t MacPlatform::run(int argc, const char **argv) {

native/cocos/platform/mac/modules/Screen.mm

@@ -44,7 +44,14 @@ of this software and associated engine source code (the "Software"), a limited,
 }
 
 float Screen::getDevicePixelRatio() const {
+#if CC_EDITOR
+    auto* global = se::ScriptEngine::getInstance()->getGlobalObject();
+    se::Value devicePixelRatioVal;
+    global->getProperty("devicePixelRatio", &devicePixelRatioVal);
+    return devicePixelRatioVal.isNumber() ? devicePixelRatioVal.toFloat() : 1.F;
+#else
     return [[[[NSApplication sharedApplication] delegate] getWindow] backingScaleFactor];
+#endif
 }
 
 void Screen::setKeepScreenOn(bool value) {

native/cocos/platform/mac/modules/SystemWindow.mm

@@ -25,10 +25,15 @@ of this software and associated engine source code (the "Software"), a limited,
 
 #include "platform/mac/modules/SystemWindow.h"
 #import <AppKit/AppKit.h>
-#include "platform/mac/AppDelegate.h"
 #include "platform/BasePlatform.h"
 #include "platform/interfaces/modules/IScreen.h"
 
+#if CC_EDITOR
+#import <QuartzCore/CAMetalLayer.h>
+#else
+#include "platform/mac/AppDelegate.h"
+#endif
+
 namespace cc {
 
 SystemWindow::SystemWindow(uint32_t windowId, void *externalHandle)
@@ -42,6 +47,9 @@ of this software and associated engine source code (the "Software"), a limited,
 
 bool SystemWindow::createWindow(const char *title,
                                 int w, int h, int flags) {
+#if CC_EDITOR
+    return createWindow(title, 0, 0, w, h, flags);
+#else
     AppDelegate *delegate = [[NSApplication sharedApplication] delegate];
     NSString *aString = [NSString stringWithUTF8String:title];
     _window = [delegate createLeftBottomWindow:aString width:w height:h];
@@ -52,11 +60,22 @@ of this software and associated engine source code (the "Software"), a limited,
     _width  = w * dpr;
     _height = h * dpr;
     return true;
+#endif
 }
 
 bool SystemWindow::createWindow(const char *title,
                                 int x, int y, int w,
                                 int h, int flags) {
+#if CC_EDITOR
+    _width                = w;
+    _height               = h;
+    CAMetalLayer *layer = [[CAMetalLayer layer] retain];
+    layer.pixelFormat   = MTLPixelFormatBGRA8Unorm;
+    layer.frame = CGRectMake(x, y, w, h);
+    [layer setAnchorPoint:CGPointMake(0.f, 0.f)];
+    _windowHandle = reinterpret_cast<uintptr_t>(layer);
+    return true;
+#else
     AppDelegate *delegate = [[NSApplication sharedApplication] delegate];
     NSString *aString = [NSString stringWithUTF8String:title];
     _window = [delegate createWindow:aString xPos:x yPos:y width:w height:h];
@@ -67,6 +86,7 @@ of this software and associated engine source code (the "Software"), a limited,
     _width  = w * dpr;
     _height = h * dpr;
     return true;
+#endif
 }
 
 void SystemWindow::closeWindow() {

native/cocos/platform/win32/WindowsPlatform.cpp

@@ -115,6 +115,10 @@ int32_t WindowsPlatform::init() {
 }
 
 int32_t WindowsPlatform::loop() {
+#if CC_EDITOR
+    _windowManager->processEvent(&_quit);
+    runTask();
+#else
     ///////////////////////////////////////////////////////////////////////////
     /////////////// changing timer resolution
     ///////////////////////////////////////////////////////////////////////////
@@ -167,6 +171,7 @@ int32_t WindowsPlatform::loop() {
         timeEndPeriod(wTimerRes);
 
     onDestroy();
+#endif
     return 0;
 }
 

native/cocos/renderer/gfx-gles3/GLES3Wrangler.cpp

@@ -24,6 +24,9 @@
 ****************************************************************************/
 
 #include "GLES3Wrangler.h"
+#include <string>
+#include "base/Log.h"
+#include "base/memory/Memory.h"
 
 #if defined(_WIN32) && !defined(ANDROID)
     #define WIN32_LEAN_AND_MEAN 1
@@ -34,8 +37,38 @@ static HMODULE libgles = NULL;
 static PFNGLES3WLOADPROC pfnGles3wLoad = NULL;
 
 bool gles3wOpen() {
-    libegl = LoadLibraryA("libEGL.dll");
-    libgles = LoadLibraryA("libGLESv2.dll");
+    std::string eglPath = "libEGL.dll";
+    std::string glesPath = "libGLESv2.dll";
+
+    #if CC_EDITOR
+    // In editor,there are same library,so we need to use abs path to load them.
+    HMODULE engine = NULL;
+    if (GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS |
+                              GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                          (LPCWSTR)&gles3wOpen, &engine) != 0) {
+        std::string dir;
+        int times = 1;
+        do {
+            auto size = MAX_PATH * times++;
+            char *path = static_cast<char*>(CC_MALLOC(size));
+            if (path) {
+                GetModuleFileNameA(engine, path, size);
+                dir = path;
+            }
+            CC_FREE(path);
+        } while (GetLastError() == ERROR_INSUFFICIENT_BUFFER);
+
+        dir = dir.substr(0, dir.rfind("\\") + 1);
+        eglPath = dir + eglPath;
+        glesPath = dir + glesPath;
+    } else {
+        DWORD err = GetLastError();
+        CC_LOG_WARNING("Failed to get abs path for editor,error code:%lu", err);
+    }
+    #endif
+
+    libegl = LoadLibraryA(eglPath.c_str());
+    libgles = LoadLibraryA(glesPath.c_str());
     return (libegl && libgles);
 }