halx99
d76a43406c
HttpClient cookie support
2021-07-19 12:26:25 +08:00
halx99
ed3a0d05ec
Move GL macros to backend MacrosGL.h
...
a. Fix box2d-testbed crash on macos and ios
b. User should avoid use them at application
2021-07-07 13:52:56 +08:00
aismann
a46bc403ae
Merge pull request #423 from aismann/dev
...
Enable box2d testbed on linux/macos
2021-07-07 02:29:38 +08:00
aismann
76b5bf8038
Merge pull request #419 from aismann/Box2D-TestBed
...
* Starting "Box2D - TextBed" adaption (most demos working)
* fix CMakeList.txt
* Update CMakeLists.txt
* Update CMakeLists.txt
* Update Box2dTest.cpp
* Update tests.h
* Update CCPhysicsDebugNodeBox2D.cpp
* Update controller.cpp
2021-07-06 21:02:47 +08:00
halx99
46a3ec8d6b
Merge: 2f570e4b64
3c25f74ef1
...
Merge pull request #420 from halx99/chipmunk-testbed
Chipmunk testbed adapt non-win platform compile issue
2021-07-06 20:46:56 +08:00
halx99
83bc1b77d6
Update CHANGELOG
2021-07-06 19:01:35 +08:00
halx99
d65529ea93
Fix case for linux
2021-07-06 18:46:07 +08:00
halx99
46d9f5cbf5
ChipmunkTestBed non-win platform adapte
2021-07-06 18:40:24 +08:00
halx99
7e1dd57605
HttpClientTest tag [skip ci]
2021-07-06 11:43:57 +08:00
halx99
0c74a94525
Implement HttpClient::sendSync with std::promise
2021-07-06 11:39:53 +08:00
halx99
3df92d56de
HttpClient handle content type from custom headers
2021-07-05 14:24:04 +08:00
halx99
43f25d5ad7
Downloader background task [ci build]
2021-07-04 19:26:18 +08:00
halx99
97425dc655
Fix #413
2021-07-04 16:40:34 +08:00
halx99
3436c968e2
Remove yasio test since we implement HttpClient based on it [ci build]
2021-07-02 19:02:38 +08:00
aismann
c6bff19863
Chipmunk2D TestBed finished ( #410 )
...
* Improve Chipmunk2D - TestBed
* Code cleanup, keyboard fix, should be finished now (behavior like the original Chipmunk2D - demos with Sokol as renderer)
* Update ChipmunkTestBed.h
* Fix wrong merge
2021-06-30 18:57:41 +08:00
aismann
ad9b41d49c
Update ChipmunkTestBed.h ( #412 )
2021-06-30 17:13:55 +08:00
aismann
9e997a4a52
Improve Chipmunk2D - TestBed ( #404 )
2021-06-30 09:52:54 +08:00
aismann
2f9d7c5d3f
Fix CCPhyhsicsDebugNode Polygon stuff, add all bench tests, ... ( #403 )
...
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.
* Improve Chipmunk2D- TestBed and starting the code cleanup ...
* Fix CCPhyhsicsDebugNode Ploygon stuff, add all bench tests, improve same demos, code cleanup
2021-06-26 17:46:06 +08:00
aismann
86322ba427
Improve Chipmunk2D - TestBed. Starting code cleanup. ( #399 )
...
* Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.
* Improve Chipmunk2D- TestBed and starting the code cleanup ...
2021-06-25 21:31:13 +08:00
aismann
8577d6f81a
Improve Chipmunk2D - TestBed, add same more debug draw stuff and some fixes too.
2021-06-25 17:01:23 +08:00
halx99
72d1ba9ea6
Merge: df58dd753c
2397d54daf
...
Merge branch 'dev' into Chipmunk2D
2021-06-24 17:04:04 +08:00
aismann
dbcb5816fe
Add springs (draw), add Copyright, improve Chipmunk2d - Testbed
2021-06-24 09:54:02 +02:00
halx99
569b8c5c30
Fix ci [ci build]
2021-06-24 12:48:25 +08:00
halx99
14dc7f05f9
Reimplement HttpClient based on yasio ( #390 )
...
* [WIP] Reimplement HttpClient based on yasio
This change will make HttpClient support concurrency request
* [WIP] Reimplement HttpClient based on yasio
a. timeoutForRead support
b. Improve code
* [WIP] Reimplement HttpClient based on yasio [ci build]
* [WIP] Fix ci [ci build]
* [WIP] Reimplement HttpClient based on yasio [ci build]
PUT,DELETE support
* [WIP] Reimplement HttpClient based on yasio [ci build]
HttpClientTest works
* Update HttpClient.cpp
* HttpClientTest: enable sslVerifaction test
* Update HttpResponse.h
* Sync luabindings [ci build]
* Add chrome UA test
* Fix ci [ci build]
* The timer for read timeout should be associated with per channel
* Remove unused function
* Update url
2021-06-24 12:33:07 +08:00
halx99
36d258f589
Delay scene default camera init, see also #392
...
This change will make sure user can change window or design size before scene init
2021-06-24 02:23:02 +08:00
halx99
de2450d3dd
Fix #392
2021-06-24 01:23:29 +08:00
aismann
289f2b0552
Update CMakeLists.txt
2021-06-24 00:21:36 +08:00
aismann
fcf23d58cd
Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange
2021-06-24 00:21:36 +08:00
halx99
510cf21197
Tidy thirdparty [ci build]
2021-06-24 00:04:29 +08:00
aismann
6a0120644c
Update CMakeLists.txt
2021-06-23 17:32:34 +02:00
aismann
5f96756d6d
Improve Chipmunk2D - TestBed, some more examples, keyboard support, display rearange
2021-06-23 17:09:48 +02:00
aismann
ea615e231c
some more Chipmunk2D TestBed examples, mouse interaction, ... ( #389 )
...
* Chipmunk2D - TestBed Add more examples and improve using the original source
* Improve using original chipmunk2d demo code, add more example, add interactions with mouse
2021-06-23 14:25:44 +08:00
aismann
d7b13b36d7
Chipmunk2D - TestBed Add more examples and improve using the original source
2021-06-18 16:52:56 +08:00
halx99
cbb1df02c4
Improve Lua RTTI performance [ci build]
2021-06-18 12:23:10 +08:00
aismann
bd10049c23
Improved Chipmunk2D - TestBed ( #381 )
...
* Improved Chipmunk2D - TestBed
* for windows only (at this moment)
* Update CmakeLists.txt
* fix CmakeLists.txt
* some more fixes
* more fixes
* more fixes
* Create ChipmunkDemo.h
* Fix CMakeList.txt; improve Chipmunk TestBed
2021-06-17 14:22:52 +08:00
aismann
a8f7a7d7c1
Improve the "Physics part" ( #379 )
...
* 1. Add "initial" Chipmunk - TestBed
More demos comes later.
* 2. Removed unused source
* Update CMakeLists.txt
* Some fixes #1
* workaround #1
* workaround #1
2021-06-16 19:34:09 +08:00
halx99
4ec57546f5
Update yasio [ci build]
2021-06-14 22:54:50 +08:00
halx99
3a7d79733f
Update readme guide and fixup [ci build]
2021-06-08 21:53:18 +08:00
halx99
5a6045ab19
Make gradle utils file as shared [ci build]
2021-06-02 06:27:19 +08:00
halx99
dc11adb950
[Gradle] Find ndk with env ANDROID_NDK [ci build]
2021-06-02 05:37:18 +08:00
halx99
84a8ec8e2e
Fix lua build [ci build]
2021-05-24 19:18:15 +08:00
halx99
25b88ff40b
Fix ci [ci build]
2021-05-24 17:20:28 +08:00
halx99
827d384eef
Renaming refactor ( #353 ) [ci build]
2021-05-18 16:40:30 +08:00
halx99
93173d860b
Replace jcenter with mavenCentral [ci build]
2021-05-15 12:15:38 +08:00
halx99
e367689ca9
Gradle Plugin no longer support cmake 3.10.0+
2021-05-15 11:58:56 +08:00
halx99
4a12425a1b
Fix android ci [ci build]
2021-05-15 00:12:41 +08:00
halx99
b68f7b8948
Update gradle stubs [ci build]
...
a. wrapper to 6.9
b. plugin to 4.2.0
2021-05-14 12:11:19 +08:00
halx99
8e6faac1f1
Merge: 3348f10813
3a7bb58045
...
Merge pull request #350 from rh101/fix-cmake-set-property
Fix for CMake error when set_property is called with aliased target
2021-05-05 19:49:30 +08:00
rh101
c3618f8ea6
Extract real target from ALIAS if it exists in order to set property successfully
...
Remove duplicate entries in dependencies lists
2021-05-05 16:04:06 +10:00
halx99
fdf0ebc97f
Make tests could build at external location [ci build]
2021-05-02 17:23:39 +08:00
halx99
0511520281
Merge: 7f1ca55a97
1efe0091a8
...
Merge pull request #347 from rh101/imgui-fix
ImGUI font crash fix when using virtual file system
2021-04-27 23:29:22 -07:00
rh101
e5fa398c67
Load fonts into IMGUI using memory routines rather than allowing it to use its own file handling in order to support FileStream related implementations.
2021-04-28 15:53:37 +10:00
halx99
72fa15f8f3
Fix cpp-tests exit crash when tableView in scrolling [ci build]
2021-04-26 17:55:55 +08: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
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
8ed6d34234
Explicit set cmake minimum version at app/build.gradle [ci build]
2021-04-22 11:40:53 +08: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
c2596efd04
Ensure build native first before compile java code
2021-04-20 20:25:32 +08:00
halx99
1c2daaf4ae
Set gradle-wrapper to 6.8.3 [ci build]
2021-04-08 22:42:15 +08:00
halx99
2a10e85122
fix lua-tests cmake script
2021-03-26 17:10:37 +08:00
halx99
5488a8da20
Fix CMakeLists for separating test projects [ci build]
2021-03-15 09:50:32 +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
9cb8963ca3
Merge: aded15aac7
057642921b
...
Merge pull request #311 from aismann/master
Update controller.cpp
2020-12-21 22:19:29 +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
aismann
0fab6141b6
same/correct wording style
2020-12-03 21:33:52 +01: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
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
fd70034958
Removed CC_ENABLE_CHIPMUNK_INTEGRATION from class CCPhysicsDebugNode
...
CCPhysicsDebugNode.cpp has only the Chipmunk2D implementation
2020-12-01 17:58:34 +01: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
Eismann
b51545ac54
Same as on 3.17 (with small changes)
2020-11-23 07:46:09 +01:00
Eismann
e08b35755b
Update Box2dTest.h
2020-11-20 07:05:21 +01:00
Eismann
d126affebf
Update CMakeLists.txt
2020-11-20 06:38:09 +01:00
Eismann
232fea1442
add Box2D to CMakeList
2020-11-20 06:19:30 +01:00
Eismann
7179435c80
Add BOX2D test
...
Add BOX2D test
2020-11-20 04:51:47 +01:00
halx99
a976e217c1
Rollback gradle plugin version 4.0.1, since there is no benefit upgrade to 4.1.0
2020-11-12 22:50:38 +08:00
halx99
db2e468e91
CMake, use file TO_CMAKE_PATH instead string replace [ci build]
2020-11-12 22:47:35 +08:00
halx99
c98313ac4b
Prepre for box2d-2.4.1
2020-11-08 13:11:40 +08:00
halx99
3835174a45
Sync folder for binding generator config
2020-11-01 20:18:50 +08:00
halx99
a4b6361478
fix fairygui-tests ios project file
2020-10-27 00:24:55 -07:00
halx99
f55c974d18
Build android arch arm64-v8a only for ci, fix test case compiling warning
2020-10-26 11:12:55 +08:00
halx99
534b2acc39
Lock name
2020-10-24 21:57:36 +08:00
halx99
0830fe9c14
Only needs updateUniformID when set a unstable uniform variable
2020-10-23 15:07:18 +08:00
halx99
119479b060
Refine ProgramState mat id
2020-10-23 11:37:52 +08:00
halx99
cff35a61b8
Set CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET at toolchain file ios.mini.cmake
2020-10-22 17:50:25 +08:00
halx99
253b82c617
Make setup.py works with python3
2020-10-22 16:53:28 +08:00
halx99
b8a0e0a478
Finsih rename
2020-10-22 10:58:10 +08:00
halx99
2e7546eca4
Update gradle plugin to 4.1.0
2020-10-21 10:55:32 +08:00
halx99
5748bbee85
Reserve extensions 'cocostudio' for esay to migrate exist projects
2020-10-21 10:12:00 +08:00
halx99
8152e6d8ad
cpp-tests for mobile, set resourceSize to 960x640
2020-10-20 16:38:50 +08:00
halx99
9e6b360437
fix lua build link on android
2020-10-19 23:21:40 +08:00
halx99
4c128913c1
Sync SharedLoader template.
2020-10-19 19:19:17 +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
5dc2626894
Reserve extension GUI for cpp-tests only
2020-10-18 12:31:45 +08:00
halx99
fdf2d5f668
Remove gradle compile lua to fix compile error, needs tools to compile and encrypt lua later
2020-10-18 01:12:11 +08:00
halx99
9019cb0d0f
Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template
2020-10-18 01:05:36 +08:00
halx99
d02c9da98b
Use system env var 'COCOS2DX_ROOT' to avoid copy whole engine sources when create new project with template
2020-10-18 01:01:36 +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
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
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
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
1f30e31b17
Add Label crashing test case for https://github.com/cocos2d/cocos2d-x/issues/20523
2020-09-17 11:49:47 +08:00
halx99
f2e7955724
fix warn [skip appveyor]
2020-09-11 18:46:15 +08:00
halx99
4fc03985d3
Use glMapBuffer if available
2020-09-11 17:32:08 +08:00
halx99
6c2939d235
More clearly programState management
2020-09-09 13:03:31 +08:00
halx99
08ee67158a
fix ident [skip appveyor] [skip travis]
2020-09-08 17:23:15 +08:00
halx99
7f6b6dfa90
Update CMake scripts and readme
2020-09-08 13:44:59 +08:00
halx99
ddbb6bb0b9
Add ImGuiEXT test case for PC platforms
2020-09-08 13:38:16 +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
cc53868d27
More clearly ETC1 format, sync enums for ETC1, correct somethings
2020-09-01 11:43:03 +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
43f464163c
1. Finish ETC2 support on GL renderer backend
...
2. Improve ASTC compressed format check
2020-08-30 17:58:39 +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
9eb32b634f
Make core lib can be build as dll, fix link issue for external
2020-08-18 12:36:44 +08:00
halx99
a3a231495c
Backport CCValue APIs
2020-08-18 11:33:18 +08:00
halx99
abc9d5f411
fix #146
2020-08-18 10:51:32 +08:00
halx99
f0276f37ae
Update README files [skip appveyor] [skip travis]
2020-08-17 19:09:54 +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
b456364167
Sets Gradle Plugin version to 3.4.0 to fix cmake can't recognize ninja
2020-08-10 15:04:12 +08:00
halx99
d179f7916f
Remove unnecessary code
2020-08-10 00:21:56 +08:00
halx99
0d357b57f8
Optimize YAsioTest, see #150
2020-08-10 00:20:29 +08:00
aismann
6cd61aac2f
Polygon looks correct now
...
Tested with Clipper 6.x and new poly2tri
2020-08-08 09:57:17 +02:00
halx99
ebc8086a4c
Sync optimize code
2020-08-06 19:58:24 +08:00
halx99
d1f7de2c03
Update fairygui-tests project name for android
2020-08-05 16:33:13 +08:00
halx99
cb40701e35
Sync fairygui-tests settings for ios
2020-08-05 13:33:31 +08:00
halx99
29113690a4
Sync fairygui-tests settings for android
2020-08-05 13:32:14 +08:00
halx99
ec80ebd344
Optimize CMake scripts
2020-08-04 14:05:00 +08:00
halx99
cf52f4d46a
Add full fairygui-tests
2020-08-04 13:15:02 +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
aismann
400c34fffb
The switch to the third monitor was not working
2020-08-03 08:34:19 +02: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
839922bbfe
Set full screen before layout renderer elements to ensure VisibleRect is correct with full screen window size
2020-08-02 16:55:21 +08:00
halx99
bd9a409dd7
Add wav testcase
2020-08-01 19:25:39 +08:00