Commit Graph

141 Commits

Author SHA1 Message Date
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 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 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 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 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 cf24cf3a36 Sync yasio to 3.33.4 [ci build] 2020-11-25 19:07:21 +08:00
halx99 dd5f706dff Refine jni methods decls [ci build] 2020-11-18 13:25:00 +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 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 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 d76e592ca9 fixup [ci build] 2020-11-03 12:41:23 +08:00
halx99 a7e03fa49f For scripting binding happy 2020-11-02 16:35:31 +08:00
halx99 09d1fffac7 fix userdefault getBoolForKey incorrect 2020-10-27 17:27:52 +08:00
halx99 534b2acc39 Lock name 2020-10-24 21:57:36 +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 dcf3dbe9e6 mini changes 2020-10-18 21:43:51 +08:00
halx99 b999d86597 Improve win dll support 2020-10-06 16:46:38 +08:00
halx99 5b5ab83830 Change access qualifier 2020-10-05 00:09:12 +08:00
halx99 0e987a7a0d Move isPOT to ccUtils.h for reuse 2020-10-04 23:43:57 +08:00
halx99 4592656b28 UserDefault int64_t 2020-10-02 19:52:32 +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 6e7e117a0d RenderTarget abstract, in-progress (#210)
RenderTarget abstract
2020-09-21 22:10:50 +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 81e78573e6 Refine code 2020-09-13 19:16:59 +08:00
halx99 d4887b8584 No need CaptureCommand for capture screen or node 2020-09-13 13:27:50 +08:00
halx99 cc7d95ffef Update comment [skip appveyor] [skip travis] 2020-09-12 20:44:08 +08:00