Commit Graph

108 Commits

Author SHA1 Message Date
minggo 5591919cd4 fix errors on windows 2019-07-12 16:37:44 +08:00
minggo ad417e80e0 make macro more clear 2019-07-12 15:48:09 +08:00
minggo f884dcf19e use jsc for non arm64 devices and some other fix 2019-07-12 14:14:21 +08:00
minggo 751e6f5f23 make v8 work on iOS 2019-07-12 10:36:05 +08:00
minggo fc4e8af9a5 ios use v8 2019-07-12 10:35:56 +08:00
owen 0acb69851b optimize spine memory (#1694)
* Optimize spine memory

* roll back genbindings.py
Remove unused function

* visual studio project config

* modify Android mk

* Modify default project config

* Fix restart vm crash

* Fix if listen spine dispose event, will triggle crash bug

* Move some function to private

* move release skeletondata behind depose skeleton

* optimize spine load file

* Add dragon bones and spine global time scale api

* clear tracks and listener

* change tab to 4 spaces

* optimized code logic
2019-03-12 11:51:51 +08:00
owen a9887b4638 Fix vertex exceed 65535 error and dragonbones leak (#1669)
* fix exceed native-renderer

* fix dragonbones memery leak

* fix native db leak

* fix native db leak

* indent issue

* add MeshBuffer into vs project

* modify cocos2d_files template

* optimize spine
2019-02-12 17:14:03 +08:00
owen 788244869f Spine upgrade (#1652)
* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* gulp: auto retry when git ref locked

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine

* upgrade spine
2019-01-11 11:48:38 +08:00
吴智明 aca87582d3 change macro setting to xcconfig on ios and mac platform (#1653)
* change macro setting to xcconfig on ios an mac platform

* remove unuse files
2019-01-08 11:48:21 +08:00
leda 57df632830 fix v8 libs path error on mac (#1636) 2018-12-21 17:46:42 +08:00
owen 5240493448 fix release compile error (#1634) 2018-12-18 16:46:58 +08:00
dreamtravel 79cb270254 remove AnySDK and Cocos Analytics, move both into Creator Service Panel (#1619)
* 移除cocos-2dx-lite的依赖external中的AnySDK和Cocos Analytics,转移这两者的集成到Service in Creator项目 修改Runtime默认工程,清理模版工程对AnySDK和Cocos Analytics的依赖

* 修改iOS link 模版

* 修改cocos2s-x-lite的deps目标
2018-12-07 17:32:44 +08:00
leda dc65729a1d update external to next-9, include v8 upgrade to 6.5 (#1620)
* update xcode project config

* update external config to next-9
2018-12-07 17:28:30 +08:00
owen 3bc839fe88 Rollback vs version and fix file name capital mistake (#1613) 2018-12-05 11:29:38 +08:00
owen c9c6634e7e v2.0 skeleton optimize (#1603)
* v2.0 skeleton optimize

* v2.0 skeleton offical source file

* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager

* Rename Macro.h to MiddlewareMacro to avoid duplication of name

* Middleware update by js

* recover other ini generate

* Update cocos2dx-file.json

* createArrayBuffer support null point

* Rename MiddlewareMacro

* skeleton windows 工程

* add checkspace before write buffer

* add math include

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* modify dragonBones to dragonbones

* remove useless code

* Change copyright time
2018-12-03 19:58:00 +08:00
leda c6fbabc6f4 separate v8 debugger from android release build (#1551)
* seprate v8 debugger from release build

* update xcode project config

* update win32 project config

* update external config
2018-10-19 12:45:11 +08:00
Arnold 9a1f054471 change field Application::_scheduler to static (#1536)
* make Applicatino::_scheduler static

* fix mac projfile

* keep scheduler permanent

* remove commented code
2018-10-11 11:22:08 +08:00
leda 89af43e38f switch video player bind code from "manual" to "auto" (#1537)
* refine video bind, tested on iOS

* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda c8e145dadb Re-added WebView on iOS & Android for Creator 2.1 (#1535)
* init add webview files form creator 1.10

* refine header & namespace to compile works

* add webview auto bindings, need check manually

* update webview auto bind

* add setFrame interface to support set View Rect

* uniform file name with other ui modules

* adapt to iOS
2018-10-10 16:03:23 +08:00
leda c17130862c Re-added VideoPlayer on iOS & Android for Creator 2.1 (#1531)
* add video player source for ios and android.

* revert un-clearly changes

* add iOS files into project config files

* remove useless declare property on 2d-x-lite
2018-10-08 15:28:19 +08:00
leda 674614720e add v8 optional on macOS (#1515)
* add v8 libs into mac project

* update xcode simulator project config

* add v8 header into template

* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
leda 9b775e711d fix catch font name error when ttf font name with space (#1423)
* support catch fontName with space when canvas set font

* do same above on android

* improve regex

* add empty loadFont impl for win32 platform

* correct win32 parse font info regex on win32

* add win32 support ttf when font name = font face name

* another space line for win32 platforms

* improve regex when parse font name

* fix regex error

* correct typo
2018-07-26 17:57:25 +08:00
leda ccb40bdeda move CCAsyncTaskPool from cocos/base into extensions folder (#1422)
* move CCAsyncTaskPool path

* move CCAsyncTaskPool path for ios & mac project

* change header path

* adapt CCAsyncTaskPool path for win32

* divide win32 build object files into Debug and Release folder
2018-07-26 10:11:55 +08:00
leda b3b37cf457 Add AssetsManager to iOS & Mac & Android & win32 (#1405)
* Add incomplete AssetsManager to iOS & Mac

* remove Android.mk refer on Xcode project config

* re-add assetmanager for android

* re-add assetmanager for win32 project config

* remove unused macro define for win32

* remove unused marco define COCOS2D_JAVASCRIPT

* added header include for assetsManager

* Add CCAsyncTaskPool

* Fix AssetsManager event trigger issue

* update win32 project config, added CCAsyncTaskPool

* add CCAsyncTaskPool to extensions Android.mk
2018-07-23 17:50:04 +08:00
leda 076c7edc3a fix win32 release mode compile failed (#1364)
* correct libcocos2d win32 release mode compile error

* sync release include files with debug

* correct typo error
2018-07-04 20:16:43 +08:00
Jare Guo be4c60343a fix simulator error (#1357)
* fix windows sdk version of simulator

* gulp: remove update-simulator-script
2018-07-03 09:55:52 +08:00
leda 723f52a472 win32 link/default template compile and link pass, but not works when run (#1321)
* modify file changes on project config

* correct libcocos2d compile

* add win32 props back

* Revert "fix windows link template (#1138)"

This reverts commit 332d95e5b8.

* correct compile error

* many link errors need to be solved

* added part lack methods

* add empty impl for canvas rendering context 2d

* update main.cpp

* correct audio/network compile and link error

* sync win32 application logic with mac

* remove wrong change on application-win32

* correct win32 default-template compile and link error

* win32 simulator part compile error fixed

* editbox define changes
2018-06-22 10:19:31 +08:00
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
leda 19552e0dd4 gen-simulator works on mac, but not full features (#1313)
* fix part of warnings

* avoid all compile errors

* remove part lua related

* remove useless comment

* add function to get glfwWindow

* improve comment

* correct group files at platform folder

* update gulp simulator script copy
2018-06-14 14:23:16 +08:00
leda 602636c855 link template works on mac, ios, android studio (#1310)
* re-add cocos-analytics for iOS

* include jsb_cocos2dx_network_manual into xcode project

* add jsb_module_register into cocos2d_libs xcode proj

* ios, mac link template adapt

* link template adapt for android studio

* add external a line space for gitignore

* update the returen value of cocos2dVersion()

* change "Cocos Runtime" into "Cocos Game" for template project
2018-06-11 17:21:42 +08:00
James Chen c7801b75f8 Minor fixes while running on macOS with V8 script engine. (#1305) 2018-06-07 16:08:06 +08:00
minggo 05bb9d46e4 [ci skip]default template works on mac (#1300) 2018-06-06 17:59:21 +08:00
James Chen cad6cb9971 Uses the same CCCanvasRenderingContext2D for apple platforms (iOS/macOS). (#1281) 2018-06-02 17:52:54 +08:00
minggo fbeb6dd200 Editbox ios support (#1278) 2018-06-01 14:12:03 +08:00
James Chen da45e32ada Removes unused files and code. (#1277) 2018-05-31 17:58:35 +08:00
James Chen 712173a8de Supports DeviceMotionEvent and removes more unused code. (#1275)
* Binds Device class

* Removes ccFPSImage.c/h

* Updates Android.mk

* Supports DeviceMotionEvent and removes more unused code.

* Uses fprintf to implement SE_LOGD & SE_LOGE .
2018-05-31 14:08:20 +08:00
minggo 7235644283 Editbox support (#1270)
can work on Android
2018-05-28 17:09:57 +08:00
minggo 4a13d0e15e Downsample (#1245)
* support render texture

* use texture unit 0

* add functions to set device pixel ratio

* add ccDeleteBuffers again

* fix according comments
2018-05-17 14:05:05 +08:00
minggo 12676d6f2b put debug related files into debugger folder 2018-04-28 14:37:09 +08:00
minggo 87a4301d8f unify js_loadImage (#1210)
* fix Texture2D::addSubImage()

* unify the logic of js_loadImage

* simplify codes
2018-04-24 16:27:03 +08:00
James Chen 1fa4ea0e6f Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
# Conflicts:
#	cocos/renderer/gfx/IndexBuffer.cpp
#	cocos/renderer/gfx/VertexBuffer.cpp
2018-04-19 11:23:36 +08:00
James Chen 3dfe05f4cc glBindXXX glActiveTexture cache. 2018-04-14 13:43:44 +08:00
minggo f4e3f9e8f6 adapt h5 (#1170) 2018-03-28 09:47:05 +08:00
James Chen fd0f172b41 Supports faster TypedArray operation for iOS lower than 10. Uses some code in Ejecta. (#1163) 2018-03-23 14:59:18 +08:00
James Chen 7667b00f87 More WebGL binding fixes. (#1160)
* Less opengl binding files.

* recreateBuffer in CanvasRendereringContext2D constructor.

* gl.bindFrameBuffer(gl.FRAME_BUFFER, null) needs to set to default frame buffer .

* Fixes JSB_glGetActiveUniform use GL_ACTIVE_ATTRIBUTE_MAX_LENGTH to get the max length, we need to use GL_ACTIVE_UNIFORM_MAX_LENGTH instead.

* glBufferSubData supports typedarray with 0 length. Adds more API for CanvasRenderingContext2D.
2018-03-22 16:03:34 +08:00
James Chen 1edc19dd3d Custom ttf font works on iOS/macOS (#1154)
* Custom ttf font works.

* Remove unused log.

* better code logic, less if .

* comment debugging code.
2018-03-20 14:51:24 +08:00
James Chen bf1b4f7124 [runtime] Audio works. (#1151) 2018-03-17 11:22:56 +08:00
James Chen 9b2aaf1cd0 getImageInfo is async method now. Clear autoreleasepool at the end of frame. (#1150) 2018-03-17 09:48:32 +08:00
James Chen 77ebc9ae12 ios ctx.fillRect fix. 2018-03-12 16:12:32 +08:00
James Chen 5fcd99a151 Fix compilation error after merging from upstream. 2018-03-12 16:05:11 +08:00