Commit Graph

157 Commits

Author SHA1 Message Date
pandamicro 4d75340e30 Import 3d gfx and generate auto bindings 2019-10-29 14:10:11 +08:00
cary 70a2134fb4 Fix the display error of the 3D node in the native platform. (#1868)
* Fix the display error of the 3D node in the native platform.

* Modify the matrix calculation of 3D nodes.
2019-10-12 11:29:48 +08:00
cary 887eec1f4d Modify the 3D sprite to use AssemblerSprite. (#1861) 2019-09-30 09:56:45 +08:00
owen 0cd71aefb9 V2.2.0 native Spine and DragonBones cache mode (#1844)
* Spine cache

* fix dragonbones yDown bug

* Spine cache mode and fix dragonBones yDown bug

* spine cache mode

* dragonbones cache mode

* dragonbones cache mode

* dragonbones cache mode

* spine dragonbones binding

* dragonbones cache mode

* spine dragonbones binding

* optimize dragonbones event

* update dragonbones binding

* dragonbones remove cache

* dragonbones cache mode

* update dragonbones binding

* dragonbones cache mode

* Fix some cache bug

* fix some cache mode bug

* optimize cache mode

* Fix update list order bug

* Fix indent issue

* revert bindings-generator

* Fix intent issue
2019-09-23 10:19:13 +08:00
cary 34159f3c30 Fix bugs of the model orientation on the native platform. (#1836)
* Fix bugs of the model orientation on the native platform.

* Add camera api export.

* add android change

* modify liensence
2019-09-16 15:02:37 +08:00
2youyouo2 1bfcda6c19 update jsbinding 2019-07-26 16:40:46 +08:00
cary 88dd29cbb4 fix shadow error of 3d-model. (#1777)
* fix shadow error of 3d-model.

* add node judgement
2019-07-24 15:26:12 +08:00
caryliu d623ac7e65 fix program error on mac 2019-07-17 18:57:49 +08:00
owen d36d15a101 Fix spine texture index missing bug 2019-07-16 15:31:56 +08:00
caryliu 6c96b973b5 Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-mesh-fix
# Conflicts:
#	cocos/renderer/renderer/Model.cpp
#	cocos/scripting/js-bindings/auto/api/jsb_renderer_auto_api.js
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.hpp
#	tools/tojs/renderer.ini
2019-07-09 10:47:04 +08:00
owen e64a491b31 remove multiply thread calc sprite 2019-07-08 20:48:03 +08:00
caryliu 34cb81ca5b Fix the error of dynamic material scane. 2019-07-08 20:04:40 +08:00
owen 963f6f6aaa Merge commit '955cfbf69eba92a444455e280b8b50a17b1ab250' into v2.3.0-all-platform
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-08 13:56:44 +08:00
owen ce9b88983e Fix Multiply Threads bug 2019-07-08 13:53:37 +08:00
caryliu 3a114d4d12 delete mesh assembler 2019-07-05 16:01:37 +08:00
caryliu c93c0d87a7 delete mesh binding 2019-07-05 14:26:49 +08:00
owen c96f164786 Simple Sprite Multiply Thread 2019-07-04 19:57:23 +08:00
caryliu 11dfa785b8 Support mesh renderer 2019-07-03 09:50:17 +08:00
owen a21314dd86 roll back 2019-07-01 14:08:36 +08:00
owen 60fb8ab0bb Optimize assembler enable disable logic 2019-07-01 13:58:55 +08:00
owen b9334e5f57 Merge commit '9e9541917cab4ecfdd29b54120995931ab04c3ed' into v2.3.0-fix-render-bug4
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_renderer_auto.cpp
#	tools/tojs/renderer.ini
2019-07-01 11:30:09 +08:00
owen 036b2fd81a Optimize assembler enable disable logic 2019-07-01 11:22:15 +08:00
caryliu 74bc2caffc Merge remote-tracking branch 'youyou/v2.3.0' into v2.3.0-forward-renderer
# Conflicts:
#	cocos/renderer/scene/ModelBatcher.cpp
#	cocos/renderer/scene/ModelBatcher.hpp
#	tools/tojs/renderer.ini
2019-06-29 14:39:57 +08:00
owen 2c1b1482c6 Native optimize 2019-06-26 18:59:49 +08:00
2youyouo2 2bd5935110 add effect.copy bindings 2019-06-26 17:21:20 +08:00
caryliu fef37c1a58 Synchronize forward-renderer. 2019-06-26 16:34:51 +08:00
owen 88c1b2162d Merge commit '70666b528aca1bc1c2f38445be9f988b3ca58d31' into v2.3.0-fix-big-map-render-error 2019-06-18 19:21:40 +08:00
owen 86234f75b4 Memory pool 2019-06-18 18:53:42 +08:00
owen d836929117 Assembler extend 2019-06-12 10:41:49 +08:00
owen cc0077e7fe spine 2019-06-10 15:53:59 +08:00
owen c8e858a184 Tile map 2019-06-09 23:16:26 +08:00
owen e3e7ff5ab8 Renderhandle to Assembler 2019-06-06 17:36:50 +08:00
owen d7a88d240e Sync native renderer to v2.3 2019-05-16 19:33:23 +08:00
Arnold f3f5f4b7b6 Prevent connection objects from being GC, when they are not done yet. (#1716)
* prevent connections from being GC, when they are not  yet.

* run genbindings

* triggle ci
2019-04-19 10:17:41 +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
吴智明 2f6b44a2fc Change network module (#1655)
* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for ios platform

* change USE_NET_WORK to USE_SOCKET  and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +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
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 71d8cf11ad refine native module separate (#1547)
* refine module separate -> gfx renderer

* refine module separate

* modify Application.mk, add macro

* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”

* improve macro define in binding code
2018-10-18 09:10:05 +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
wdzhangchukong 21377fdb74 Remove names about Cocos (#1494) 2018-09-04 13:41:02 +08:00
wdzhangchukong b44c2a68dc Change cocos2dx_auto to jsb (#1479) 2018-08-24 20:26:11 +08:00
wdzhangchukong bf27fdd955 Rename cc in JSB (#1476)
* Rename __ccgl to __gl

* Rename __CCPrivateData to __PrivateData

* Change CanvasRenderingContext2D to global

* Change CanvasRenderingContext2D to global

* Change getDeviceMotionValue into Device

* Change FileUtils to global

* Change AudioEngine to global

* Change AudioEngine into Audio

* Remove cc in c++

* Remove __jsc__

* Change auto file template

* Name jsb_cocos2d_global to auto

* Reset jsb_cocos2dx_auto

* Register jsb_cocos2dx_global_auto
2018-08-24 17:03:50 +08:00
Vincent Yang 8f6e9adbe1 [feature] CCDownloader add header and abort support. (#1291)
*  [feature] android implement recieve http header param, handle it in android http request (#2)

* [feature] Recieve http header param, handle it in android http request

* [feature] implement abort and header api

* /2.0 -> /2

* remove task when abort

*  [feature] Implement ios and mac downloader abort api (#3)

* [feature] Implement ios and mac downloader abort api

* use DLLOG to show log

* judge NSURLSessionTask state with NSURLErrorCancelled

* [adjust] Modify downloader from auto bind to manually (#4)

* [adjust] Modify Downloader createDownloadFileTask api from auto bind to manually

* Modify ini file

* [bug] fix Cocos2dxDownloader.java syntax error

* [bug] CCDownloader-android creatCoTask don't deleteLocalRef header str
2018-06-07 22:19: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 ccc8691029 fix crash when parsing Effect property (#1254) 2018-05-22 09:32:06 +08:00
minggo 9ca6dac357 fix musk issue (#1231) 2018-05-08 11:21:41 +08:00