James Chen
4ee7981630
Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into runtime
...
# Conflicts:
# cocos/platform/mac/CCCanvasRenderingContext2D-mac.mm
# cocos/scripting/js-bindings/manual/jsb_gfx_manual.cpp
2018-03-23 15:42:12 +08:00
minggo
0be49352d0
H5 adapt merge ( #1164 )
...
* h5 adpator
* adapt to h5 engine
2018-03-23 15:26:09 +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
c341d94d1a
Adds missing function implementation. ( #1161 )
2018-03-22 16:16:10 +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
minggo
610658e5a6
h5 adpator ( #1156 )
2018-03-21 09:30:05 +08:00
James Chen
febfbe67df
Custom TTF font is supported for Android too. ( #1155 )
2018-03-20 15:49:25 +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
b648d0d41e
Fixes thread race issue in getImageInfo method. ( #1153 )
...
NOTE: FileUtils::getInstance()->fullPathForFilename isn't a threadsafe method, Image::initWithImageFile will call fullPathForFilename internally which may cause thread race issues. Therefore, we get the full path of file before going into task callback. So be careful of invoking any Cocos2d-x interface in a sub-thread.
2018-03-19 18:11:13 +08:00
James Chen
d1abdf6065
Adds Cocos2dxRenderer.setOnGameEngineInitialziedListener. ( #1152 )
2018-03-17 11:49:27 +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
5122d14e24
[runtime] CocosRenderer.nativeInit supports to pass a default resource path. ( #1149 )
...
* FileUtils::setDefaultResourcePath fix.
* CocosRenderer.nativeInit supports to pass a default resource path.
2018-03-16 11:00:19 +08:00
James Chen
c3602eb1e3
[runtime] Android testcase works. ( #1148 )
...
* Adds jsb_run_script_module for CommonJS module, reverts original `require`.
* Uses window.gameTick for sending tick event.
* Removes unused scripts.
* Android testcase works.
2018-03-15 18:12:38 +08:00
James Chen
2c3a86f7b1
[new-renderer] Label on android works. ( #1146 )
...
* Android HelloWorld without label works.
* Label on android works.
2018-03-14 21:19:51 +08:00
James Chen
f0a79242d7
Android compile ok. ( #1145 )
...
* Android compile ok.
* Fixes for Android build .
2018-03-14 10:28:03 +08:00
James Chen
8813d114f6
Merge pull request #1142 from dumganhar/new-renderer
...
Creator 2.0 WebGL bindings.
2018-03-12 16:17:56 +08:00
James Chen
77ebc9ae12
ios ctx.fillRect fix.
2018-03-12 16:12:32 +08:00
James Chen
14e8ec7370
gl.bufferData & gl.bufferSubData fix.
2018-03-12 16:05:50 +08:00
James Chen
5fcd99a151
Fix compilation error after merging from upstream.
2018-03-12 16:05:11 +08:00
James Chen
26e8259389
Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer
2018-03-12 15:34:45 +08:00
James Chen
fe91680060
Adds ctx.fillRect interface, JSB_get_arraybufferview_dataptr supports null or undefine converstion.
2018-03-12 15:25:47 +08:00
James Chen
f02faf5a15
Updates CanvasRendereringContext2D-ios/mac.mm.
2018-03-12 11:12:24 +08:00
James Chen
992594b865
module fix.
2018-03-11 21:39:22 +08:00
James Chen
3627778a35
Updates canvasrenderingcontext2d-mac.mm
2018-03-11 20:35:54 +08:00
minggo
0d483a9b07
add back network ( #1141 )
...
* add back network
* add network back on windows
2018-03-09 16:20:48 +08:00
James Chen
15370e52db
ios label works.TODO: outline, bold, underline.
2018-03-09 12:37:57 +08:00
James Chen
4faf331229
Adds csscolorparser lib.
2018-03-09 12:37:27 +08:00
James Chen
1a064feed2
Label color works.
2018-03-08 18:14:46 +08:00
James Chen
4eccfbcba8
Mac font display ok.
2018-03-08 17:38:45 +08:00
James Chen
626f13ff2d
fastSet needs to clear data at first.
2018-03-08 17:36:30 +08:00
James Chen
dde1312b50
glTexImage2D fix.
2018-03-08 13:37:27 +08:00
minggo
9dc96302ab
update external version ( #1140 )
2018-03-08 11:38:58 +08:00
James Chen
44fa82d9cc
CanvasRenderering obj-c object release fix.
2018-03-08 11:22:44 +08:00
James Chen
7beded3156
Canvas binding fix.
2018-03-07 18:45:20 +08:00
James Chen
48ab875fe2
Adds CCCanvasRenderingContext2D.
2018-03-07 18:44:57 +08:00
minggo
aebdc1c77f
fix compiling isssue of link template on iOS, Mac and Android ( #1139 )
2018-03-07 17:06:15 +08:00
minggo
332d95e5b8
fix windows link template ( #1138 )
2018-03-07 15:22:41 +08:00
minggo
c4c24c9d54
windows works with new renderer ( #1137 )
2018-03-07 14:31:46 +08:00
James Chen
6e392bdf48
updates .gitmodules
2018-03-07 10:08:00 +08:00
James Chen
e00e0e0f86
Updates bindings-generator.
2018-03-07 10:05:36 +08:00
James Chen
0dc072baab
More WebGL binding fixes.
2018-03-07 10:04:20 +08:00
James Chen
821f936ab0
renderer bindings fix.
2018-03-07 10:03:54 +08:00
James Chen
09ad99d217
gl js fix.
2018-03-07 10:03:37 +08:00
James Chen
f4110f271e
TODO: GL_UNPACK_FLIP_Y_WEBGL, GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL
2018-03-07 10:03:11 +08:00
James Chen
c826dd2548
WebGL macro.
2018-03-07 10:02:35 +08:00
James Chen
9038e57c64
don't init canvas in c++ code, initialize innerWidth,innerHeight instead.
2018-03-07 10:02:08 +08:00
James Chen
7914353483
Better log display for require
2018-03-07 10:01:35 +08:00
James Chen
71f0678287
Updates gfx.ini
2018-03-07 09:59:40 +08:00
James Chen
6721db7bc6
Updates gfx/renderer auto binding code and ini configuration.
2018-03-07 09:59:26 +08:00