rh101
abb27ce2f3
Fix downloader crash due to uninitialised variables.
2021-04-25 18:20:25 +10:00
RH
c8c4c2d703
Merge: 6fbebe9617
8b8b015b02
...
Merge pull request #6 from c4games/master
Sync with primary
2021-04-25 18:14:50 +10:00
rh101
c26a5e7bd8
Ensure FileStream is used for file access where possible
2021-04-25 17:22:43 +10:00
halx99
964e515f48
Merge: 2a1459b27b
3d8884721f
...
Merge pull request #341 from rh101/vfs-support
Add support for FileStream in ZipUtils and ZipFile
2021-04-25 14:21:19 +08:00
rh101
0867aa48a9
Add function comments to detail the expected parameters and return values of a FileStream
2021-04-25 15:27:25 +10:00
rh101
5cc21f52ba
Removed incorrect delete statement
2021-04-25 14:42:42 +10:00
rh101
3dbdd7b5ee
Verify the amount of string space we have to replace the zip extension
2021-04-25 12:15:56 +10:00
rh101
8703cad209
Initialise member variable
2021-04-25 02:47:21 +10:00
rh101
84be1fa014
Minor code cleanup
2021-04-25 02:45:04 +10:00
rh101
a819f310b2
Removed redundant code
2021-04-25 02:43:03 +10:00
rh101
cce67f688e
Add support for FileStream in ZipUtils and ZipFile
2021-04-25 02:39:47 +10:00
halx99
da1038b147
Fix crash from pr: #340
2021-04-24 18:15:54 +08:00
halx99
5484825229
Fix indent with clang-format [ci build]
2021-04-24 16:58:41 +08:00
rh101
155fe98406
openFileStream now returns a nullptr if it fails
2021-04-24 09:22:27 +10:00
rh101
e1ce966be2
Remove redundant std::move
2021-04-23 22:00:33 +10:00
rh101
6502627714
Added getNativeWritableAbsolutePath() which will always return the underlying file system raw path.
...
Re-enabled memory mapped UserDefault usage, since it now has access to the raw file system path.
2021-04-23 01:00:00 +10:00
rh101
95cf5b5c2b
Merge: 2aa2d69151
b7506fed0c
...
Merge branch 'vfs-support' of https://github.com/rh101/engine-x into vfs-support
2021-04-23 00:01:47 +10:00
rh101
54ffa13dff
Move PosixFileStream class to its own files
...
Update UserDefault to work with FileStream
Fix undefined openFileStream on platforms other than Win32
2021-04-23 00:01:32 +10:00
RH
dd5f77c3d5
Merge: 15c8f2298d
0886473e1b
...
Merge pull request #4 from rh101/master
Sync with master
2021-04-22 21:49:43 +10:00
RH
1e15ed4839
Merge: 2cef9f2e76
844119d162
...
Merge pull request #3 from c4games/master
Sync with master
2021-04-22 21:48:49 +10:00
rh101
7540c06fd3
Use FileStream to write JPG images to disk
2021-04-22 21:36:26 +10:00
halx99
6effb1642f
Fix #339 [ci build]
2021-04-22 18:55:56 +08:00
halx99
8ed6d34234
Explicit set cmake minimum version at app/build.gradle [ci build]
2021-04-22 11:40:53 +08:00
rh101
57e2d5dea8
Fixed typo
2021-04-22 03:18:23 +10:00
rh101
2bf12b2226
Add support for virtual file system via custom FileStream and FileUtils implementations.
2021-04-22 03:15:49 +10:00
halx99
473e51cee7
Set cmake min version to 3.10 [ci build]
2021-04-21 14:05:44 +08:00
halx99
4f0f713977
Merge: 6a868299f5
9aebfd4b0d
...
Merge pull request #331 from c4games/cmake-improve
Improve cmake scripts
2021-03-13 18:46:32 +08:00
halx99
b8892e446b
Merge: 91bfb7c8ff
a5cf017e0f
...
Merge pull request #330 from c4games/lua54-compat
Lua 5.4 compatible
2021-03-13 18:46:13 +08:00
halx99
d7610b8c77
Improve cmake scripts
...
a. rename project 'plainluac' to 'luac'
b. add executable project 'lua'
c. unify cmake runtime directory to bin
2021-03-13 18:18:40 +08:00
halx99
fce0f9caf0
Refine director access [ci build]
2021-02-05 23:09:14 +08:00
halx99
6904b9f3f3
Fix depth stencil state/desc ( #321 )
...
* Fix ds state
* fix 3d object not render
* Update DepthStencilStateGL.cpp
* fix ds, not complete
* fix image ref incorrect
* Fix metal captureScreen
* Share ds desc
needs restore properly after non-default render target destroy.
* fix gl compile
* Sync ds desc
* Only set vertex & index buffer once for batch draw
* Add set/get ds desc for renderer
* Refine code style
* Fix RenderTextureTest
a. should restore stencil desc properly
* Sync gl captureNode
* Sync GL
2021-01-31 22:22:52 +08:00
halx99
472266c25c
Fix #318
2021-01-27 12:03:42 +08:00
halx99
53bbf7368c
Fix warnings
2021-01-26 19:00:04 +08:00
halx99
03e130a19f
Revert "Fix #313 "
2021-01-21 12:41:01 +08:00
halx99
be79c908c5
Fix ParticleBatchNode texture not bind [ci build]
2021-01-19 23:53:22 +08:00
halx99
734602069e
Fix #313
...
a. error: depthAttachment PixelFormat (MTLPixelFormatInvalid) and stencilAttachment PixelFormat (MTLPixelFormat Depth32Float_Stencil8) must match.
b. Because we only support D24S8(D32FS8) combined format, so needs check
TargetBuffferFlags::DEPTH_AND_STENCIL when setup depth and stencil
format, otherwise newRenderPipelineWithDescriptor will crash.
2021-01-16 00:01:21 +08:00
halx99
984c164c57
Sync yasio to 3.35.0 [ci build]
2020-12-21 18:12:13 +08:00
aismann
f38b271650
Update controller.cpp
...
"Node: Physics" using Chipmunk2D (hardcoded on e.g.: CCPhysicsBody.cpp)
Maybe a Wiki entry is also usefull?
2020-12-20 07:11:13 +01:00
halx99
3ebb1f57c0
Fix next drawable maybe nil crash[ci build] ( #310 )
2020-12-17 15:31:16 +08:00
halx99
b92c3d30c4
Update lua bindings source [ci build]
...
cxx17::string_view support
2020-12-16 17:52:17 +08:00
halx99
86e0340b9d
Sync yasio [ci build]
2020-12-15 18:58:04 +08:00
halx99
3a49f0e064
Merge: c3ad19df96
c95e0466e1
...
Merge pull request #308 from c4games/refactor-android-run-on-gl-thread
Refactor android runOnGLThread
2020-12-10 16:56:14 +08:00
halx99
78aaf568c6
fix FUISprite gray to normal doesn't work
2020-12-10 16:54:59 +08:00
halx99
ca4597a1ff
Refactor android runOnGLThread
...
Ensure the callback run engine core mainLoop,
This commit can solve any weird behaviors, such as:
a. text render maybe missing charactors when bring from back to frontend
b. some renderer objects alpha may present black at sdk callback call
c. some other things
All above behavior is caused gl state not ready when go back to game activity from sdk activity
2020-12-09 15:13:57 +08:00
halx99
04db04ad93
Merge: 3f4178cc27
dbf81d7511
...
Merge pull request #295 from aismann/master
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements...
2020-12-02 08:39:58 -08:00
halx99
571adc605a
fix ci
2020-12-02 03:33:53 -08:00
halx99
8b9d5db029
Unify CC_COMPAT_GL to control renderer backend
...
win32: google angle
mac: NSGL
ios: GLES
2020-12-02 03:03:05 -08:00
aismann
73b2b175d9
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup, some other small improvements too
...
CCPhysicsSprite(Box2D/Chipmunk2D) cleanup and small improvements on PhysicsTest
2020-12-01 16:39:28 +01:00
halx99
43f5a305c8
Merge: 079ecdbbec
5e249bf6f8
...
Merge pull request #293 from aismann/master
Chipmunk2D and Box2D works together now (add two new classes) and FIX ImGuiEXTTest window size problem
2020-12-01 01:52:47 -08:00
aismann
18cc4a9eb4
Update README.md
...
change wiki link: https://github.com/c4games/engine-x-wiki
2020-12-01 10:32:09 +01:00
aismann
91843b3fae
Chipmunk2D and Box2D works together now (add two new classes)
...
add class PhysicsSpriteChipmunk2D
add class PhysicsSpriteBox2D
Improve window size problem with ImGuiEXTTest
2020-12-01 10:15:30 +01:00
halx99
315e42b126
Merge: 4c1ff6bd01
369bef3614
...
Merge pull request #286 from rh101/add-center-vertical-layout-support
Add support for center vertical layout
2020-11-26 23:43:25 -08:00
halx99
cc7366845e
Merge: 74add84559
f113e1f2ed
...
Merge pull request #285 from rh101/fix-listview-dimensions
Fix ListView dimensions when child elements are scaled
2020-11-26 23:08:30 -08:00
halx99
bcb96e66ee
Merge: 289bc4fccc
ee996a5cfb
...
Merge pull request #282 from rh101/fix-editbox-globalz
Ensure global Z is correctly set on all child items of EditBox
2020-11-26 23:00:14 -08:00
rh101
220ef7a6bf
Allow user to set custom program type value
2020-11-27 17:26:02 +11:00
rh101
11e78b27c0
Add support for center vertical layout
2020-11-27 17:24:07 +11:00
rh101
25bf822fb8
Fix ListView dimensions when child elements are scaled.
2020-11-27 17:02:31 +11:00
rh101
35e57843c8
Ensure global Z is correctly set on all child items of EditBox
2020-11-27 16:59:34 +11:00
halx99
cf24cf3a36
Sync yasio to 3.33.4 [ci build]
2020-11-25 19:07:21 +08:00
halx99
1353c00758
Sync pr: https://github.com/cocos2d/cocos2d-x/pull/20614
2020-11-24 18:10:28 +08:00
halx99
3f0d17b520
Merge: a10d7701b8
a606572775
...
Merge pull request #277 from aismann/master
Update cocos.bat
2020-11-23 01:27:53 -08:00
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
halx99
c97956d28f
Remove unused param for setRenderPipeline
2020-09-21 22:35:18 +08:00
halx99
6e7e117a0d
RenderTarget abstract, in-progress ( #210 )
...
RenderTarget abstract
2020-09-21 22:10:50 +08:00
halx99
bb6faed0a2
fix macro
2020-09-21 11:38:21 +08:00
halx99
03ae85f2f4
Merge: 22a4586af9
03e5a1bd9a
...
Merge pull request #209 from halx99/delete-copy-stubs
Explicit delete copy stubs for CustomCommand
2020-09-16 22:45:38 -07:00
halx99
a14cb93bdc
fix ci warnings
2020-09-17 12:13:59 +08:00
halx99
ac2e8e4bb6
fix ci
2020-09-17 12:10:08 +08:00
halx99
c0a61434e0
Sync pr from https://github.com/cocos2d/cocos2d-x/pull/20580
2020-09-17 12:05:31 +08:00
halx99
dc74671240
Explicit delete copy stubs for CustomCommand
2020-09-17 11:41:14 +08:00
halx99
62d7a5e220
suppressing invalid offset warning [skip appveyor][skip travis]
2020-09-16 22:57:55 +08:00
halx99
75fe464e6c
Decrease pod offset
2020-09-16 21:26:14 +08:00
halx99
3fd426c481
fix #206
2020-09-16 21:22:37 +08:00
halx99
7217d16cd2
Needs recalculate max items when AtlasNode::setIgnoreContentScaleFactor
2020-09-16 13:34:20 +08:00
halx99
20d91f6566
check null also
2020-09-15 16:03:00 +08:00
halx99
05d31aa618
Take care PBO use on android
2020-09-15 16:01:44 +08:00
halx99
e91b7240e6
captureScreen compatible, saveFile at offthread
2020-09-15 14:12:00 +08:00
halx99
b956637c74
Fixup
...
OpenGL: read screen pixels only works: AFTER_DRAW and BEFORE_END_FRAME
2020-09-14 17:43:44 +08:00
halx99
c542037e7c
Needs readPixels at CallbackCommand
...
Avoid read dirty pixels
2020-09-14 17:20:07 +08:00
halx99
759acc98a7
fix fbo attachment texture bind error
2020-09-13 19:17:49 +08:00
halx99
81e78573e6
Refine code
2020-09-13 19:16:59 +08:00
halx99
d333e79502
Remove unused CaptureCallbackCommand ( #2 )
2020-09-13 14:53:17 +08:00
halx99
e2cc3f5c90
Refine comment
2020-09-13 13:30:41 +08:00
halx99
d4887b8584
No need CaptureCommand for capture screen or node
2020-09-13 13:27:50 +08:00
halx99
89c4ab3046
Metal screen framebuffer only set/restore
2020-09-13 12:55:35 +08:00
halx99
dd0070040b
Make capture API public to Renderer
2020-09-13 11:11:48 +08:00
halx99
474531fda7
UtilsGL::readPixels also use PBO if available
2020-09-12 23:26:40 +08:00
halx99
cc7d95ffef
Update comment [skip appveyor] [skip travis]
2020-09-12 20:44:08 +08:00
halx99
7282a3ea3f
No need enqueue, commit will do it automatically
2020-09-12 16:44:16 +08:00
halx99
3b71ea621a
Refine code
2020-09-12 15:34:09 +08:00
halx99
caf9d4b761
Remove test stubs
2020-09-12 14:52:39 +08:00
halx99
4f51702b66
a. Refine captureScreen, glReadPixels shoud from glviewport's origin.
...
b. Sets desktop GL min version from 2.0 to 2.1
2020-09-12 14:50:48 +08:00
halx99
2f96108c75
Add more clearly comment [skip appveyor]
2020-09-11 20:17:31 +08:00
halx99
4fc03985d3
Use glMapBuffer if available
2020-09-11 17:32:08 +08:00
halx99
c79da1ca05
fix ci
2020-09-11 14:45:45 +08:00
halx99
a6b3fa91fd
fix ci
2020-09-11 13:38:05 +08:00
halx99
378975d768
Remove comment
2020-09-11 12:39:16 +08:00
halx99
08f8177031
Renaming stubs relative capture command
2020-09-11 12:23:33 +08:00
halx99
66161f982a
Remove unused comment
2020-09-11 12:14:40 +08:00
halx99
0365122f4a
v4 captureScreen API compatiable, gl needs flip always for capture
2020-09-11 11:57:55 +08:00
halx99
2dd406c52e
Remove todo comment [skip appveyor][skip travis]
2020-09-11 02:19:19 +08:00
halx99
065cfc77b3
Update CCRenderTexture.cpp
2020-09-11 01:46:12 +08:00
halx99
d2acbe176e
finish gl backend
2020-09-11 01:19:10 +08:00
halx99
e53fa3560b
Prepare
2020-09-11 00:14:03 +08:00
halx99
671b6b4ca9
Tidy code
2020-09-11 00:10:44 +08:00
halx99
3313720a20
Remove unused API, TODO: unify to Utils::readPixels
2020-09-10 23:11:43 +08:00
halx99
2cc14ef4d7
Add comment
2020-09-10 21:41:52 +08:00
halx99
dc3796d746
Refine code
2020-09-10 21:38:24 +08:00
halx99
e283a4fca0
Refactor capture, fix data race for apple metal reanderer backend
2020-09-10 21:14:28 +08:00
halx99
df43be0a7e
fix 193
2020-09-10 18:12:46 +08:00
halx99
d784e549c6
Sync lua binding
2020-09-09 16:30:48 +08:00
halx99
0df57da33f
fix compile issue[skip appveyor]
2020-09-09 15:47:41 +08:00
halx99
df8631582b
Tidy, update programState texture at attachProgramState
2020-09-09 15:29:56 +08:00
halx99
6c2939d235
More clearly programState management
2020-09-09 13:03:31 +08:00
halx99
84ed7befe2
fix memory leak for ProgramStateRegistry use
2020-09-08 22:13:10 +08:00
halx99
cabc917bff
Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated
2020-09-06 17:00:20 +08:00
halx99
54f1fc26d6
fix mac compile error
2020-09-05 22:33:18 +08:00
halx99
e564a5bc25
Add CC_REDUCE_PAUSED_CPU_USAGE ccConfig.h to control whether reduce cpu usage after paused
2020-09-05 17:12:30 +08:00
halx99
e7185c1de8
fix ci warnings
2020-09-04 18:34:15 +08:00
halx99
0f078279ff
Fix mac [skip appveyor]
2020-09-04 18:16:13 +08:00
halx99
714803916e
Fix glviewimpl for osx
2020-09-04 17:58:34 +08:00
halx99
cd3923b553
Add utils::makeInstance and utils::newInstance
2020-09-04 11:28:16 +08:00
halx99
e5d18c5118
Should set _mtlCommandBuffer to nil after release
2020-09-03 22:26:21 +08:00
halx99
4bb44288a5
Fix GL renderer backend API updateCompressedSubData will cause OpenGL 502 error
2020-09-03 18:03:43 +08:00
halx99
d66e62e436
ASTC6x6 support and more comment about bpp usage in engine ( #191 )
...
* ASTC6x6 support and more comment abount bpp usage in engine
* fix log output
* Comment astc compression tool download url
* Add command line comment for astcenc tool [skip travis][skip appveyor]
* Add astc_6x6 test image[skip appveyor][skip travis]
* astc_6x6 mtl
* Refine log info[skip appveyor][skip travis]
* Empty line[skip appveyor][skip travis]
2020-09-03 18:01:40 +08:00
halx99
93a461f779
Add getGPUHandler for backend::Texture for some purpose use
2020-09-02 13:00:32 +08:00
halx99
e9a61cc216
Remove unused member 'func' from CustomCommand, use CallbackCommand instead
2020-09-02 12:59:34 +08:00
halx99
4a9b2fb9b5
Merge: f2970e72de
8cad7319f6
...
Merge pull request #188 from halx99/etc2-support
Add etc2 compressed texture support
2020-09-01 00:16:01 -07:00
halx99
bb9652f1a6
Use uint8_t instead unsigned char for byte buffer [skip appveyor][skip travis]
2020-09-01 14:57:18 +08:00
halx99
ec9a1822be
No need check GL_ETC1_RGB8_OES for ETC compression formats [skip appveyor][skip travis]
2020-09-01 14:32:52 +08:00
halx99
3e443d286e
Remove unnecessary macro GL_ETC1_RGB8_OES check
2020-09-01 13:39:15 +08:00
halx99
6f524beeb6
Remove unused comment [skip appveyor][skip travis]
2020-09-01 13:29:41 +08:00
halx99
f9ae5401ec
Add copyright notice [skip appveyor][skip travis]
2020-09-01 13:24:45 +08:00
halx99
45b2ab7134
Also decode bmp to RGBA8888 directly
2020-09-01 12:06:21 +08:00
halx99
cc53868d27
More clearly ETC1 format, sync enums for ETC1, correct somethings
2020-09-01 11:43:03 +08:00
halx99
9e4f61d9d6
ETC2 feature check for metal
2020-09-01 00:03:49 +08:00
halx99
815c737e6b
wrap fowardPixels for hardware decoder
2020-08-31 23:09:42 +08:00
halx99
09cedf60b2
Improve images decoder
2020-08-31 21:04:47 +08:00
halx99
e96ae229dd
Merge: 5ddc84bbee
539e5ca42c
...
Merge pull request #189 from aismann/patch-8
Update README.md
2020-08-31 04:27:33 -07:00
halx99
a87c0bba78
More clearly data owner when decode images.
2020-08-31 19:24:23 +08:00
halx99
fa5d2d198b
fix resources relative path to avoid test case crash on mobile
2020-08-31 17:39:29 +08:00
halx99
c338472df8
Move copyright notice to header [skip appveyor][skip travis]
2020-08-31 17:35:01 +08:00
halx99
477aa0c185
Clearly CCLOG content
2020-08-31 17:13:04 +08:00
halx99
65a7bd5360
Remove test code [skip appveyor] [skip travis]
2020-08-31 16:31:37 +08:00
halx99
086c3dee3c
Add comment for etc1/etc2 compression tools [skip appveyor][skip travis]
2020-08-31 16:16:13 +08:00
halx99
258dfc5b4a
ETC2 Metal support
2020-08-31 15:45:05 +08:00
halx99
b12068e1c8
Use etc2_decode_image decode etc1 to RGBA8888 [skip appveyor] [skip travis]
...
This can avoid further texture data convert
2020-08-31 15:34:20 +08:00
halx99
8749c63346
fix compile issue
2020-08-31 15:17:28 +08:00
halx99
2443e01136
fix compile issue
2020-08-31 14:50:33 +08:00
halx99
27ba2fd377
Remove unused file [skip appveyor][skip travis]
2020-08-31 14:48:10 +08:00
halx99
da8f1c56fe
ETC2 software decode support
2020-08-31 14:11:48 +08:00
halx99
43f464163c
1. Finish ETC2 support on GL renderer backend
...
2. Improve ASTC compressed format check
2020-08-30 17:58:39 +08:00
halx99
0edf05888f
fix CCValue::visit
2020-08-30 17:45:21 +08:00
halx99
318c6855a3
fix #187
2020-08-30 13:03:32 +08:00
halx99
21cb31685d
Merge: 6b4d5918c0
e6108d111a
...
Merge pull request #186 from halx99/fix-185
Fix ASTC bytesPerRow calculation
2020-08-29 10:27:04 -07:00
halx99
f53ddd2c4a
Update README_CN.md
2020-08-30 00:28:20 +08:00
halx99
0943e0a793
Fix ASTC bytesPerRow calculation
2020-08-30 00:11:33 +08:00
halx99
479047361d
Clear vector after releaseTextures
2020-08-29 22:00:58 +08:00
halx99
9baf39823e
Release old storage textures
2020-08-29 20:07:13 +08:00
halx99
b32b9b75e9
More clearly comment
2020-08-29 19:51:42 +08:00
halx99
998335b8af
More clearly comment for multi-textures support
2020-08-29 17:39:17 +08:00
halx99
d147190d8a
Remove unused comment [skip appveyor][skip travis]
2020-08-29 16:59:15 +08:00
halx99
32549195cf
fix multi-texture2d support
2020-08-29 16:56:48 +08:00
halx99
8f448b517c
fix ci
2020-08-28 17:26:30 +08:00
halx99
2197bb52cd
Sync missing feature from v3, and API compatible
2020-08-28 16:33:52 +08:00
halx99
4674b1e89d
Remove TMXLayer,TMXMap, remain FastTMXLayer,FastTMXMap enough
2020-08-28 15:42:40 +08:00
halx99
81b038c18d
Code improvement
2020-08-28 15:01:25 +08:00
minggo
1934eb5ac9
close keyboard when Done is pressed ( #20341 )
...
* close keyboard when Done is pressed
2020-08-28 14:50:52 +08:00
halx99
238cd782e3
Add CMake -DCC_FORCE_USE_GLES to control whether force use gles on win32,iOS
2020-08-28 12:57:00 +08:00
halx99
2a234afc3d
Improve listFiles for win32, use std::move avoid string deep copy
2020-08-28 11:05:32 +08:00
halx99
e75a29a393
fix #179
2020-08-28 11:04:14 +08:00
halx99
7ce3f4ab34
Make logical more clearly
2020-08-27 17:35:30 +08:00
halx99
53b1da1bf9
fix mssing sources
2020-08-27 12:44:30 +08:00
halx99
b6f2d775a9
Make UserDefault encrypt/decrypt algorithm can be customlized
2020-08-27 12:37:20 +08:00
halx99
f583ec6300
By default, disable stream parsing
2020-08-27 11:40:44 +08:00
halx99
6345cca301
freetype stream parsing support, reduce memory use on FontCache
2020-08-27 11:35:55 +08:00
halx99
ea1cb45ba3
Refine code style
2020-08-27 10:19:21 +08:00
halx99
6ac06d8571
fix ci compile
2020-08-27 00:49:07 +08:00
halx99
c9d6c5afdf
Rename PXFileStream to CCFileStream
2020-08-27 00:21:44 +08:00
halx99
d0c01ea688
Merge: 6be52c29e7
9d7d1e40fb
...
Merge branch 'master' of https://github.com/c4games/engine-x into master
2020-08-26 12:46:51 +08:00
halx99
6df5f91142
Sync LayoutHelper APIs
2020-08-26 12:46:41 +08:00
halx99
8d7a5ab3c6
finish killCurrentProcess implementation on windows
2020-08-26 10:36:33 +08:00
halx99
6fe10e8809
Add utils::killCurrentProcess API to kill game immidiately
2020-08-25 23:12:26 +08:00
halx99
0e0a28e033
Merge: 1740c444f8
5c850e00ac
...
Merge pull request #171 from halx99/feature-170
Add utils::createInstance to instead macro CREATE_FUNC
2020-08-24 23:55:37 -07:00
halx99
feb4e1783a
fix warning
2020-08-25 14:47:51 +08:00
halx99
0545a471cb
fix ci
2020-08-25 14:08:17 +08:00
halx99
d39f803459
Add utils::createInstance to instead macro CREATE_FUNC
2020-08-25 13:49:45 +08:00
halx99
c8a665da40
Update al format enum
2020-08-24 19:04:08 +08:00
halx99
3b770e4519
Improve engine CMakeLists.txt for ios
...
benefit: Now engine can build without ios.toolchain.cmake,
because we solvoe follow issues:
a. fix cmake try_compile failed with arm device without
b. fix try_compile/compile will failed with device on armv7
c. fix thread local storage require:
1. deployment target >= 9.0 (arm64)
2. deployment target == 10.x (armv7)
2020-08-24 15:31:45 +08:00
halx99
34c51f5596
Print al vender and version after initialized
2020-08-20 22:37:34 +08:00
halx99
e348312baa
Naming style [skip appveyor] [skip travis]
2020-08-19 12:26:31 +08:00
halx99
eaaeeea27f
Refine code
2020-08-19 12:10:29 +08:00
halx99
98fab08a6c
fix label crashing, add private use BatchCommand move constructor to adapte std::vector resize properly
2020-08-19 11:46:13 +08:00
halx99
7ff2ffa0b3
Make CustomCommand safe copyable and moveable
2020-08-19 11:42:32 +08:00
halx99
aa3f12628a
Sync mssing code from official-v3
2020-08-18 14:43:09 +08:00
halx99
083d14f342
Improve code quality
2020-08-18 14:29:09 +08:00
halx99
b594cda5e3
Consider mutex use, which object dou you want guard?
2020-08-18 12:48:16 +08:00
halx99
9eb32b634f
Make core lib can be build as dll, fix link issue for external
2020-08-18 12:36:44 +08:00
halx99
c9882c195a
Update README_CN.md
2020-08-18 12:11:04 +08:00
halx99
641b2e40f3
Sync fix from https://github.com/cocos2d/cocos2d-x/pull/20518
2020-08-18 12:09:56 +08:00
halx99
a3a231495c
Backport CCValue APIs
2020-08-18 11:33:18 +08:00
halx99
d084d9f61a
Improve shared library for android, remove mojoal,sdl2, still use OpenAL.framework on apple platform, alsoft on other platforms.
2020-08-17 18:45:14 +08:00
halx99
bda3a720b4
Use CC0-1.0 licensed decoder 'minimp3' to replace LGPL licensed decoder 'mpg123'
2020-08-17 14:56:53 +08:00
halx99
b090664084
Make android listFiles behavior same with other platforms
2020-08-17 12:09:31 +08:00
halx99
08e3b65b9a
More clearly check supported pcm format by alsoft extends
2020-08-15 17:48:57 +08:00
halx99
2e4499b6d0
Add ios framework required by SDL2, check whether SDL2 support strip it later
2020-08-15 17:47:40 +08:00
halx99
072deafeae
Adapte zlib licensed AL library: mojoal
2020-08-14 18:58:44 +08:00
halx99
f72f6e8cac
Cleanup unused code for min support iOS
2020-08-13 23:03:55 +08:00
halx99
a09253c7a2
fix-157
2020-08-13 22:35:41 +08:00
halx99
a3b208075b
fix compile issue without alsoft
2020-08-13 00:41:30 +08:00
halx99
da2ec96fd8
fix ci android build issue.
2020-08-12 18:53:33 +08:00
halx99
5732e20789
Tidy code
2020-08-12 18:40:04 +08:00
halx99
d9ef1e238f
Simplify audio source again, merge audio sources
2020-08-12 17:00:07 +08:00
halx99
37d4be2152
FreeType: Output missing char in .ttf at _DEBUG compiling mode
2020-08-12 14:24:06 +08:00
halx99
9fef6a8720
Sync macro
2020-08-07 23:55:25 +08:00
halx99
7e7fba9649
By default, make cocos2d::log multi-threading safe
2020-08-07 23:52:41 +08:00
aismann
63e7c6e4dc
OpenGL 'works' better...
2020-08-07 08:10:12 +02:00
halx99
d424be2a80
Naming style
2020-08-07 00:39:55 +08:00
halx99
77b3290226
Make CCValue compatible official cocos2d-x v3/v4
2020-08-06 19:39:50 +08:00
halx99
9c92a5e4ab
Sync optimize code from v3
2020-08-06 17:37:34 +08:00
halx99
b781a25e16
Reorder members of Node, sizeof(Node) decrease from 640 to 616 on 32bit application
2020-08-06 13:30:35 +08:00
halx99
8af53505c1
Merge: 3cf637418f
137ded73a5
...
Merge branch 'master' of https://github.com/c4games/engine-x into master
2020-08-05 18:12:31 +08:00
halx99
4713580381
Update features [skip appveyor] [skip travis]
2020-08-05 18:11:52 +08:00
halx99
ff5ec02d77
Merge: bda1fce2b1
f38f76c1a1
...
Merge pull request #145 from halx99/spine-3.8
Sync spine code and resource to 3.8
2020-08-05 02:38:59 -07:00
halx99
03816cd0c0
fix console output error on win32, see #144
2020-08-05 17:30:30 +08:00
halx99
e8765c88f8
Sync spine code and resource to 3.8
2020-08-05 17:04:57 +08:00
halx99
4214ed6add
Add missing optimize from v3
2020-08-05 13:10:37 +08:00
halx99
df2073f1e5
win32 cover wide API use, remove unused long getFieSize(const std::string&)
2020-08-05 12:24:31 +08:00
halx99
9f66d7dce0
utf-8 file path
2020-08-05 12:17:57 +08:00
halx99
205d6e5fb9
fix lua compile issue
2020-08-04 22:38:57 +08:00
halx99
94a2a6994c
Macro and engine name alias
2020-08-04 14:53:59 +08:00
halx99
2add0272a3
Add ENGINEX_VERSION and improve ABI compatiable
2020-08-04 12:11:36 +08:00
halx99
d2d656e83d
Update CCColorizer.cpp
2020-08-04 01:31:32 +08:00
halx99
2e4b573e8c
Update CCColorizer.cpp
2020-08-04 01:01:05 +08:00
halx99
d3cb044df2
Update CCColorizer.h
2020-08-04 00:59:02 +08:00
halx99
57a1e88533
fix compile issue
2020-08-04 00:39:48 +08:00
halx99
e638e0bd68
Tidy sources
2020-08-04 00:14:35 +08:00
halx99
8b9a6bbbf1
fix android build issues
2020-08-03 20:31:47 +08:00
halx99
1e392c9dfe
Refine readme [skip appveyor][skip travis]
2020-08-03 19:12:07 +08:00
halx99
3049b8f751
Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable
2020-08-03 17:51:40 +08:00
halx99
8f541a61a7
Merge: 5f96ce8981
3e95b8ccf3
...
Merge pull request #135 from halx99/unify-plist-ops
Unify plist implementation, remove apple specific sources.
2020-08-02 20:22:36 -07:00
halx99
588e977ef0
Merge: 8cc189fb4d
6fd4d6e4ab
...
Merge pull request #134 from halx99/fullscreen-mode
Refactor full screen support
2020-08-02 20:03:07 -07:00
halx99
d6958498d4
Unify plist implementation, remove apple specific sources.
2020-08-03 10:48:26 +08:00
halx99
8024b9b2e9
Adapte multi monitors
2020-08-03 10:33:04 +08:00
halx99
1c59ba423c
Unnecessary space lilne [skip appveyor] [skip travis]
2020-08-02 17:00:35 +08:00
halx99
996f303eb7
Optimize param use.
2020-08-02 16:48:19 +08:00
halx99
b12cde7c19
vidMode need moniter
2020-08-02 16:36:58 +08:00
halx99
049a7e58ba
Update comment [skip appveyor] [skip travis]
2020-08-02 16:24:30 +08:00
halx99
76d246ce54
check isFullscreen
2020-08-02 16:22:41 +08:00
halx99
2bd0a48e02
Provide more useful for setFullscreen with width,height,refreshRate.
2020-08-02 16:18:39 +08:00
halx99
7c816dae8d
Refactor full screen support, fix different behavior when enter full screen between 1 and >=2 times
2020-08-02 11:54:46 +08:00