Eismann
381189f726
Update cocos.bat
2020-11-23 09:55:07 +01:00
halx99
a300b75a2f
Merge: 0d04e20b50
eee60b9d99
...
Merge pull request #276 from aismann/master
Same as on 3.17 (with small changes)
2020-11-22 23:43:18 -08:00
Eismann
b51545ac54
Same as on 3.17 (with small changes)
2020-11-23 07:46:09 +01:00
halx99
7122b5043a
fix metal znear range for viewport
...
https://developer.apple.com/documentation/metal/mtlrendercommandencoder/1515527-setviewport?language=objc
2020-11-23 09:30:51 +08:00
halx99
a842beee1f
Refine jni param types
2020-11-18 18:19:14 +08:00
halx99
349e435937
jni match natvie API param types
2020-11-18 18:17:55 +08:00
halx99
dd5f706dff
Refine jni methods decls [ci build]
2020-11-18 13:25:00 +08:00
halx99
09e2615e51
Add missing param JNIEnv* for natvie interfaces [ci build]
2020-11-18 12:15:48 +08:00
halx99
d1fc9712b4
fix UserDefault plain mode stack overflow
2020-11-17 19:50:58 +08:00
halx99
b341aa31da
fix ci warnings
2020-11-15 21:34:53 -08:00
halx99
1ec908d4f9
fix #260 [ci build]
2020-11-16 12:21:27 +08:00
halx99
1c1c8520b1
Delete unused buitin shaders
2020-11-16 11:20:12 +08:00
halx99
bcacf9137e
Refine UserDefault comment [ci build]
2020-11-15 13:13:24 +08:00
halx99
9e3ad89089
Update CCUserDefault.cpp
2020-11-15 13:11:53 +08:00
halx99
772e57ef67
Update CCUserDefault.cpp
2020-11-15 13:08:21 +08:00
halx99
c3401087d2
Refine UserDefault comment
2020-11-15 12:26:40 +08:00
halx99
ff662dfffc
Refine user default comment
2020-11-15 12:16:54 +08:00
halx99
c727d692a8
fix UserDefault doesn't work with encrypt enabled [ci build]
2020-11-15 11:45:14 +08:00
halx99
133f942a6b
fix compile and improve Physics3DConstraint management [ci build]
2020-11-15 00:48:53 +08:00
halx99
fa47ae5f5a
Update config.json [ci build]
2020-11-14 13:32:51 +08:00
halx99
4a1bebd3e6
plain include xxhash.h
2020-11-14 12:22:51 +08:00
halx99
74133ec753
Add missing JNIEXPORT
2020-11-13 23:03:05 +08:00
Born.Xiao
6a1b561d7e
Update CCUserDefault.cpp
...
write with variable size, calculate size use int32_t
2020-11-12 00:32:33 +08:00
halx99
b2d8a4626c
Sets box2d as default physics 2d engine
2020-11-08 13:20:36 +08:00
halx99
052558e83d
Merge: 5da2894e1b
f80a6ef25c
...
Merge branch 'master' of https://github.com/c4games/engine-x into master
2020-11-08 13:12:06 +08:00
halx99
c98313ac4b
Prepre for box2d-2.4.1
2020-11-08 13:11:40 +08:00
halx99
6c09438b38
Add cmake option -DLUA_ENGINE=luajit to switch lua engine to luajit [ci build]
2020-11-07 10:36:22 +08:00
halx99
73380fb4eb
Update comment
2020-11-06 09:33:26 +08:00
halx99
17e1ddae83
[Metal] matching depth stencil state
2020-11-06 08:56:25 +08:00
halx99
fcaee3f0f9
fix #255 [ci build]
2020-11-05 22:51:33 +08:00
halx99
fefb5f27fb
fix #255 [ci build]
2020-11-05 22:24:30 +08:00
halx99
5134ed69f0
Remove unused shader files [ci build]
2020-11-04 16:35:12 +08:00
halx99
d76e592ca9
fixup [ci build]
2020-11-03 12:41:23 +08:00
halx99
47603f0ac6
Now, the lua binding generator should works [ci build]
2020-11-02 16:47:33 +08:00
halx99
a7e03fa49f
For scripting binding happy
2020-11-02 16:35:31 +08:00
halx99
60a6d97d86
Remove Sprite::updateShaders [ci build]
2020-10-31 20:08:32 +08:00
halx99
49b948af28
Improve memory use
2020-10-29 19:13:36 +08:00
halx99
09d1fffac7
fix userdefault getBoolForKey incorrect
2020-10-27 17:27:52 +08:00
halx99
4c05ca5004
fix compile
2020-10-27 17:01:03 +08:00
halx99
a060ef3bcb
Use DeviceGL to store defaultFBO
2020-10-27 16:58:37 +08:00
halx99
ab7173e61e
GLES ios compile
2020-10-27 01:42:05 -07:00
halx99
2a4beb3ca4
DNT printmat by default
2020-10-27 11:21:03 +08:00
halx99
a2fcdb67a1
Sprite::setTexture, programType >= ProgramType::HSV needs update by user manually.
2020-10-27 11:14:36 +08:00
halx99
8a8d96e8d4
Refine DrawNode, should not use Node::_programState for private use ( #251 )
...
The follow classes should not reuse Node::_programState, otherwise needs override Node::setProgramState to update programState of pipelineDescriptor:
- DrawNode
- LayerColor
- LayerRadialGradient
- ParticleBatchNode
- ParticleSystemQuad
2020-10-26 14:49:14 +08:00
halx99
e58041bd46
Don't update sprite shader when it's not default
2020-10-26 13:08:02 +08:00
halx99
f49cb01e1e
Finish #244
2020-10-25 16:25:08 +08:00
halx99
534b2acc39
Lock name
2020-10-24 21:57:36 +08:00
halx99
97b283bc94
Optimize includes
2020-10-23 16:40:51 +08:00
halx99
fe76c658b0
fix android build
2020-10-23 16:36:24 +08:00
halx99
22bd64cd27
Support specific manually and more clearly comment
2020-10-23 15:27:03 +08:00
halx99
0830fe9c14
Only needs updateUniformID when set a unstable uniform variable
2020-10-23 15:07:18 +08:00
halx99
ad98ef54b0
Add setUniformID manually for user to avoid calculate uniformID with uniform buffer automatically
2020-10-23 12:39:30 +08:00
halx99
4f36b1bbe9
Remove default constructor of ProgramState
2020-10-23 12:17:36 +08:00
halx99
083b99112b
Since we have uniformID, CUSTOM_PROGRAM also can batch
2020-10-23 12:07:37 +08:00
halx99
e4d8e60c0b
Since v4, no needs callback uniform, so mark setCallbackUniform deprecated
2020-10-23 11:57:17 +08:00
halx99
119479b060
Refine ProgramState mat id
2020-10-23 11:37:52 +08:00
halx99
4394b94c31
Simply skip batch for custom program, see #245
2020-10-23 10:26:45 +08:00
halx99
b8a0e0a478
Finsih rename
2020-10-22 10:58:10 +08:00
halx99
ac21c27140
Build pugixml from sources for all platforms ( #241 )
2020-10-21 12:28:34 +08:00
halx99
03527fd45b
Fix CCFileStream write bits
...
make it behavior same with fopen "wb"
2020-10-21 10:58:48 +08:00
halx99
77e48ddca6
Remove unused converter functions
2020-10-21 00:35:39 +08:00
halx99
4048395cdb
Refine pixel format
...
a. make RGB565, RGB5A1 identical between GL and MTL backend
b. make texture internal format compatible on GLES-2.0 ONLY GPU devices
2020-10-20 23:27:20 +08:00
halx99
630a452d01
fix rgba4444 enum for gles-2.0 only GPU
2020-10-20 20:01:18 +08:00
halx99
3d27b9615c
GLES compatible
2020-10-20 19:50:34 +08:00
halx99
212148dc56
Remove unused varaibles
2020-10-20 19:38:33 +08:00
halx99
f1be86ee7a
fix lua build on android
2020-10-19 19:56:48 +08:00
halx99
3741bbd7e2
Finish cpp and lua template to use env var 'COCOS2DX_ROOT' to avoid copy whole engine source when new project.
2020-10-19 18:33:10 +08:00
halx99
dcf3dbe9e6
mini changes
2020-10-18 21:43:51 +08:00
halx99
b9c58a8420
Refactor modules ( #238 )
2020-10-17 16:32:16 +08:00
halx99
5401bbf821
Simplfy hsv color
2020-10-16 17:23:29 +08:00
halx99
567f55d6fb
fix clear flow for rendertexture and grid since we use clearCommand to clear renderTarget, see #233
2020-10-16 16:25:10 +08:00
halx99
c594e3789c
Refactor programState management ( #236 )
...
1. Add custom program registery
2. Re-enable batch draw for custom program
2020-10-16 16:23:14 +08:00
halx99
a0034c48a0
fix #233 ( #235 )
2020-10-16 01:41:36 +08:00
halx99
880c274995
fix #233
2020-10-15 10:22:18 +08:00
halx99
958922bf6d
Add setDispatchOnWorkThread support
2020-10-08 00:00:14 +08:00
halx99
257e5ce0e0
Use move assignment
2020-10-07 23:59:26 +08:00
halx99
11ffba3758
API qualifiers improments
2020-10-07 00:07:53 +08:00
halx99
b999d86597
Improve win dll support
2020-10-06 16:46:38 +08:00
halx99
5ef9214d19
fix warning
2020-10-06 12:31:17 +08:00
halx99
3214a76297
Refine HttpClient ( #224 )
2020-10-05 08:32:48 +08:00
halx99
89d80ce24f
Refine HttpClient
2020-10-05 02:40:38 +08:00
halx99
3fadbb3928
fix #223
2020-10-05 00:10:31 +08:00
halx99
5b5ab83830
Change access qualifier
2020-10-05 00:09:12 +08:00
halx99
79e04aad3c
Add custom hosts support for HttpReuqest
...
refer to: https://curl.haxx.se/libcurl/c/CURLOPT_RESOLVE.html
2020-10-04 23:44:52 +08:00
halx99
0e987a7a0d
Move isPOT to ccUtils.h for reuse
2020-10-04 23:43:57 +08:00
halx99
3b70b21430
fix lua binding, remove unused initWithBackendTexture
2020-10-03 18:04:56 +08:00
halx99
4592656b28
UserDefault int64_t
2020-10-02 19:52:32 +08:00
halx99
a0ee504406
Delete duplicated _mv ( #220 )
2020-09-26 12:33:14 +08:00
halx99
a2288d08db
Fix depth stencil state and pipeline state mismatch
2020-09-25 23:16:48 +08:00
halx99
2b6cb88167
Clearly texture usage and TextureGL initWithZeros usage ( #219 )
...
* Clearly texture usage and TextureGL initWithZeros usage
* More properly function name
2020-09-25 15:04:55 +08:00
halx99
4a35122ab0
Remove dep
2020-09-25 13:49:23 +08:00
halx99
f93a26a7de
Delete file ant.properties
2020-09-25 13:17:03 +08:00
halx99
3820cffc33
Sync feature from b2a0cb5e2f
2020-09-25 13:13:54 +08:00
halx99
1c57632e51
Delete unused source files
2020-09-25 13:08:39 +08:00
halx99
cca0739793
Refactor pixel format manipulate ( #217 )
...
* PixelFormat use table
* Correct PixelFormat name to match 'GL_LUMINANCE'
* Up
* fix cube update texture enum
* linux build
* Refine ci
* fix linux build
* Remove unused function, match mtl framebuffer pixel format
* readPixels always RGBA format
* fix ci for linux
* fix linux build
* Remove unused functions
* fix travis
* fix android ci
* Update config.json
* linux glad
* Update CCGLViewImpl-desktop.cpp
* fix linux build
* Fix linux build
* Link issue [skip appveyor][skip travis]
* Update CMakeLists.txt
* Refine GL enums use
* Update test case name [skip appveyor][skip travis]
* fix linux link issue
* for mtl
* fix ci
* Tidy pixelformat enums
* fix ci
* fix rgba8 to abgr4 error
* fix ci
* fix ci for GLES
* Fix linux build, require glibc-2.27+
* Use properly dist for travis [skip appveyor]
* fix linux build [skip appveyor]
* Update install-deps-linux.sh
* Remove unused members for pixel block info, update external to v73
* Sync from compile linux warnings
* Remove unused check, and PixelFormat::A8 is ordinary format, not compressed format
* metal doesn't support rgb8 (#3 )
* Update CCTexture2D.cpp
* Refine code
* Pixel Format Descriptor Table
* fix ci
* BGR5A1
* Simplfy texture format convert function name
* Update
* rgba4 match mtl render format
* Add note about RGBA4
* Remove unused function
* fix osx
* Already converted at texture2d
* Clearly comment
* fixup
2020-09-25 11:07:56 +08:00
halx99
ad62747456
fix #213
2020-09-22 17:34:52 +08:00
halx99
9790c31529
fix macro CC_LOG_TO_CONSOLE doesn't work for win32
2020-09-22 17:23:19 +08:00
halx99
26924879be
fix AtlasNode, needs update atlas values when ignore content scale factor changed
2020-09-22 16:35:24 +08:00
halx99
3eb2d51df9
Refactor render pipeline state ( #211 )
...
* Refactor pipeline state
* Cache DepthStencil state for MTL renderer backend
2020-09-22 16:32:17 +08:00
halx99
7bee993bd0
Reduce depthStencil state create, don't create it at per draw call
2020-09-21 22:58:45 +08:00