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

60 Commits

Author SHA1 Message Date
halx99 8d7f133e7c [spine] Use currentState to setup shader stubs 2022-07-05 14:40:18 +08:00
halx99 0f9a79899b [Spine] Use backend shader definations 2022-07-05 14:36:04 +08:00
halx99 91e57e7dd3 Spine runtime can use official code 2022-07-05 14:13:15 +08:00
halx99 768a8bd5e1 Refator sampler name in shader 2022-07-04 21:26:48 +08:00
halx99 36fa5ad84e Remove CC_CONSTRUCTOR_ACCESS, refer to #603 2022-03-18 21:46:07 +08:00
halx99 4b12f12a55 [spine] Improve RTTI compare performance when compiler string pooling enabled 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2012

Signed-off-by: halx99 <halx99@live.com>
 2022-01-05 14:10:05 +08:00
halx99 aaef0c3048 Fix ClippingAttachment doesn't work 
Refer to: https://github.com/EsotericSoftware/spine-runtimes/pull/2011

Reported by: @kangleblue

Signed-off-by: halx99 <halx99@live.com>
 2022-01-04 22:38:02 +08:00
halx99 15be00be20 Sync commit from pr: 
https://github.com/EsotericSoftware/spine-runtimes/pull/1947
 2021-09-14 11:54:19 +08:00
halx99 80e0e3b941 Fix spine command pipeline state uniform location mismatch 2021-08-30 17:40:35 +08:00
aismann cbeeb8d8ab Debug 64bit build error 
Severity	Code	Description	Project	File	Line	Suppression State
Error (active)	E0075	operand of '*' must be a pointer but has type "bool"	cpp-tests	D:\______\GitHub\adxe\tests\cpp-tests\Classes\SpineTest\SpineTest.cpp	153
 2021-08-27 07:47:22 +02:00
halx99 39ca61f623 Update spine-3.8 runtime to latest 
Maybe no further update until upgrade to spine-4.x
 2021-08-07 00:59:58 +08:00
halx99 f70ad053c0 Rename everything to adxe 2021-07-09 10:42:36 +08:00
halx99 39b5e14489 Update spine runtimes 2021-04-24 18:14:30 +08:00
halx99 c5493b4230 Update extension spine README.md 2020-11-04 23:28:51 +08:00
halx99 f90046f0ac Tidy extension spine folder structure [ci build] 2020-11-04 23:17:05 +08:00
halx99 3fa65521e3 Sync https://github.com/EsotericSoftware/spine-runtimes/pull/1801 2020-10-27 17:08:26 +08:00
halx99 a09d53bf05 Remove unused comment 2020-10-22 21:32:09 +08:00
halx99 c6d8d395a3 fix #234, spine custom shader doesn't work. 2020-10-17 22:00:53 +08:00
HALX99 90ecc475f0
Refactor modules (#238) 2020-10-17 16:32:16 +08:00
halx99 f38f76c1a1 Sync spine code and resource to 3.8 2020-08-05 17:04:57 +08:00
halx99 5dc9e92fb7 fix android build issues 2020-08-03 20:31:47 +08:00
halx99 b142167560 Huge changes, move spine,dragonbones,cocostudio to extensions folder, future make all extensions pluginable 2020-08-03 17:51:40 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
rablwupei 5ea249a265 fix memory leak 2013-10-08 20:03:10 +08:00
yinkaile 5e1f91d396 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 
Conflicts:
	extensions/CocoStudio/Armature/CCArmature.h
	extensions/CocoStudio/Armature/CCBone.h
	extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
	extensions/CocoStudio/Armature/animation/CCProcessBase.h
	extensions/CocoStudio/Armature/animation/CCTween.h
	extensions/CocoStudio/Armature/datas/CCDatas.h
	extensions/CocoStudio/Armature/display/CCDecorativeDisplay.h
	extensions/CocoStudio/Armature/display/CCDisplayManager.h
	extensions/CocoStudio/Armature/external_tool/CCTexture2DMutable.h
	extensions/CocoStudio/Armature/physics/CCColliderDetector.h
	extensions/CocoStudio/Armature/physics/CCPhysicsWorld.h
	extensions/CocoStudio/Armature/utils/CCArmatureDataManager.h
	extensions/CocoStudio/Armature/utils/CCSpriteFrameCacheHelper.h
 2013-09-14 19:54:49 +08:00
samuele3hu d8bd65b2e8 issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
Ricardo Quesada 8bf24f0475 ccGLXXX -> GL::xxx 
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`

Also, converts the class `DrawPrimitives` into a namespace
 2013-07-25 18:42:53 -07:00
Ricardo Quesada d683e10808 More constant fixes 
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()

And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
 2013-07-25 14:49:43 -07:00
Ricardo Quesada 16d0b43181 Constant fixes 
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE

Also adds more constant for BlendFunc
 2013-07-25 13:36:19 -07:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
Ricardo Quesada 89d210bdb3 CCAssert -> CCASSERT 
and other best pracitces like:

capacity and "index" are ints and not unsigned int (google's recomendation).
 It is easier to detect underflow bugs like this

plus other minor improvements
 2013-07-19 22:01:27 -07:00
Ricardo Quesada ba6ab126c6 More best practices fixes 
- class order fixes
  - static methods (creators) at the beginning
  - then constructors / destructors
  - then init
- more `const` fixes
  - adds some const getters
  - some getters have 2 versions: `const` and no-const version
- renamed CocosDenshion::sharedEngine -> getInstance()
 2013-07-18 16:30:19 -07:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
minggo bb758df0d0 issue #2393:mark ccp as deprecated 2013-07-12 14:11:55 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen ec902c3550 issue #2373: Adding missing overload const getter functions. 2013-07-05 15:08:52 +08:00
Ricardo Quesada adaa72fbb4 Adds const to getters 
Many getters in cocos2d are not declared as const.
This patch adds const to many cocos2d properties, specially in CCNode and
subclasses
 2013-07-03 17:22:15 -07:00
James Chen cb67ed0227 issue #2129: Removing CC prefix for extension module. 2013-06-20 14:15:53 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 646d0aa1cf [LINUX] Fix a compilation error in spine/extension.cpp. 2013-06-08 17:22:49 +08:00
James Chen d3253dd161 Fixing compilation errors for native client port. 2013-06-08 15:28:58 +08:00
Rene Klacan 8b16178f9f Merge pull request from cocos2d/develop 2013-06-06 09:42:18 +02:00
James Chen a539f69d63 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 15:02:57 +08:00
James Chen 93597a5858 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 14:22:51 +08:00
James Chen 1e04c4e743 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:09:20 +08:00
James Chen 37df435089 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:05:27 +08:00