Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
950 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

190 Commits

Author SHA1 Message Date
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 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 03e130a19f Revert "Fix #313" 2021-01-21 12:41:01 +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 8b9d5db029 Unify CC_COMPAT_GL to control renderer backend 
win32: google angle
mac: NSGL
ios: GLES
 2020-12-02 03:03:05 -08:00
rh101 220ef7a6bf Allow user to set custom program type value 2020-11-27 17:26:02 +11: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 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 4a1bebd3e6 plain include xxhash.h 2020-11-14 12:22:51 +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 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 a7e03fa49f For scripting binding happy 2020-11-02 16:35:31 +08:00
halx99 49b948af28 Improve memory use 2020-10-29 19:13:36 +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 2a4beb3ca4 DNT printmat by default 2020-10-27 11:21:03 +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 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 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