2010-12-28 10:23:14 +08:00
|
|
|
/****************************************************************************
|
2011-03-19 10:07:16 +08:00
|
|
|
Copyright (c) 2008-2010 Ricardo Quesada
|
2014-01-07 11:25:07 +08:00
|
|
|
Copyright (c) 2010-2012 cocos2d-x.org
|
2011-07-04 19:20:16 +08:00
|
|
|
Copyright (c) 2011 Zynga Inc.
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2010-12-28 10:23:14 +08:00
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
****************************************************************************/
|
2011-03-19 10:07:16 +08:00
|
|
|
|
|
|
|
// ideas taken from:
|
2012-04-19 14:35:52 +08:00
|
|
|
// . The ocean spray in your face [Jeff Lander]
|
|
|
|
// http://www.double.co.nz/dust/col0798.pdf
|
|
|
|
// . Building an Advanced Particle System [John van der Burg]
|
|
|
|
// http://www.gamasutra.com/features/20000623/vanderburg_01.htm
|
2011-03-19 10:07:16 +08:00
|
|
|
// . LOVE game engine
|
2012-04-19 14:35:52 +08:00
|
|
|
// http://love2d.org/
|
2011-03-19 10:07:16 +08:00
|
|
|
//
|
|
|
|
//
|
|
|
|
// Radius mode support, from 71 squared
|
2012-04-19 14:35:52 +08:00
|
|
|
// http://particledesigner.71squared.com/
|
2011-03-19 10:07:16 +08:00
|
|
|
//
|
|
|
|
// IMPORTANT: Particle Designer is supported by cocos2d, but
|
2012-09-17 15:02:24 +08:00
|
|
|
// 'Radius Mode' in Particle Designer uses a fixed emit rate of 30 hz. Since that can't be guaranteed in cocos2d,
|
2011-03-19 10:07:16 +08:00
|
|
|
// cocos2d uses a another approach, but the results are almost identical.
|
|
|
|
//
|
|
|
|
|
2014-05-17 05:36:00 +08:00
|
|
|
#include "2d/CCParticleSystem.h"
|
2013-07-25 13:54:32 +08:00
|
|
|
|
|
|
|
#include <string>
|
|
|
|
|
2014-05-17 05:36:00 +08:00
|
|
|
#include "2d/CCParticleBatchNode.h"
|
|
|
|
#include "renderer/CCTextureAtlas.h"
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/base64.h"
|
|
|
|
#include "base/ZipUtils.h"
|
|
|
|
#include "base/CCDirector.h"
|
2016-06-06 16:25:00 +08:00
|
|
|
#include "base/CCProfiling.h"
|
2016-06-15 15:01:26 +08:00
|
|
|
#include "base/ccUTF8.h"
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
#include "base/ccUtils.h"
|
2014-05-17 05:36:00 +08:00
|
|
|
#include "renderer/CCTextureCache.h"
|
2014-08-29 16:44:20 +08:00
|
|
|
#include "platform/CCFileUtils.h"
|
2011-03-19 10:07:16 +08:00
|
|
|
|
2012-11-15 17:16:51 +08:00
|
|
|
using namespace std;
|
|
|
|
|
2012-04-18 18:43:45 +08:00
|
|
|
NS_CC_BEGIN
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2010-12-27 17:39:15 +08:00
|
|
|
// ideas taken from:
|
2012-04-19 14:35:52 +08:00
|
|
|
// . The ocean spray in your face [Jeff Lander]
|
|
|
|
// http://www.double.co.nz/dust/col0798.pdf
|
|
|
|
// . Building an Advanced Particle System [John van der Burg]
|
|
|
|
// http://www.gamasutra.com/features/20000623/vanderburg_01.htm
|
2010-12-27 17:39:15 +08:00
|
|
|
// . LOVE game engine
|
2012-04-19 14:35:52 +08:00
|
|
|
// http://love2d.org/
|
2010-12-27 17:39:15 +08:00
|
|
|
//
|
|
|
|
//
|
|
|
|
// Radius mode support, from 71 squared
|
2012-04-19 14:35:52 +08:00
|
|
|
// http://particledesigner.71squared.com/
|
2010-12-27 17:39:15 +08:00
|
|
|
//
|
|
|
|
// IMPORTANT: Particle Designer is supported by cocos2d, but
|
2012-09-17 15:02:24 +08:00
|
|
|
// 'Radius Mode' in Particle Designer uses a fixed emit rate of 30 hz. Since that can't be guaranteed in cocos2d,
|
2010-12-27 17:39:15 +08:00
|
|
|
// cocos2d uses a another approach, but the results are almost identical.
|
|
|
|
//
|
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2017-02-06 15:13:20 +08:00
|
|
|
inline void normalize_point(float x, float y, particle_point* out)
|
2015-08-31 17:25:34 +08:00
|
|
|
{
|
|
|
|
float n = x * x + y * y;
|
|
|
|
// Already normalized.
|
|
|
|
if (n == 1.0f)
|
|
|
|
return;
|
|
|
|
|
|
|
|
n = sqrt(n);
|
|
|
|
// Too close to zero.
|
|
|
|
if (n < MATH_TOLERANCE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
n = 1.0f / n;
|
2015-10-14 13:24:38 +08:00
|
|
|
out->x = x * n;
|
|
|
|
out->y = y * n;
|
2015-08-31 17:25:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
A more effect random number getter function, get from ejoy2d.
|
|
|
|
*/
|
|
|
|
inline static float RANDOM_M11(unsigned int *seed) {
|
|
|
|
*seed = *seed * 134775813 + 1;
|
|
|
|
union {
|
|
|
|
uint32_t d;
|
|
|
|
float f;
|
|
|
|
} u;
|
|
|
|
u.d = (((uint32_t)(*seed) & 0x7fff) << 8) | 0x40000000;
|
|
|
|
return u.f - 3.0f;
|
|
|
|
}
|
|
|
|
|
|
|
|
ParticleData::ParticleData()
|
|
|
|
{
|
|
|
|
memset(this, 0, sizeof(ParticleData));
|
|
|
|
}
|
|
|
|
|
|
|
|
bool ParticleData::init(int count)
|
|
|
|
{
|
|
|
|
maxCount = count;
|
|
|
|
|
|
|
|
posx= (float*)malloc(count * sizeof(float));
|
|
|
|
posy= (float*)malloc(count * sizeof(float));
|
|
|
|
startPosX= (float*)malloc(count * sizeof(float));
|
|
|
|
startPosY= (float*)malloc(count * sizeof(float));
|
|
|
|
colorR= (float*)malloc(count * sizeof(float));
|
|
|
|
colorG= (float*)malloc(count * sizeof(float));
|
|
|
|
colorB= (float*)malloc(count * sizeof(float));
|
|
|
|
colorA= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaColorR= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaColorG= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaColorB= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaColorA= (float*)malloc(count * sizeof(float));
|
|
|
|
size= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaSize= (float*)malloc(count * sizeof(float));
|
|
|
|
rotation= (float*)malloc(count * sizeof(float));
|
|
|
|
deltaRotation= (float*)malloc(count * sizeof(float));
|
|
|
|
timeToLive= (float*)malloc(count * sizeof(float));
|
|
|
|
atlasIndex= (unsigned int*)malloc(count * sizeof(unsigned int));
|
|
|
|
|
|
|
|
modeA.dirX= (float*)malloc(count * sizeof(float));
|
|
|
|
modeA.dirY= (float*)malloc(count * sizeof(float));
|
|
|
|
modeA.radialAccel= (float*)malloc(count * sizeof(float));
|
|
|
|
modeA.tangentialAccel= (float*)malloc(count * sizeof(float));
|
|
|
|
|
|
|
|
modeB.angle= (float*)malloc(count * sizeof(float));
|
|
|
|
modeB.degreesPerSecond= (float*)malloc(count * sizeof(float));
|
|
|
|
modeB.deltaRadius= (float*)malloc(count * sizeof(float));
|
|
|
|
modeB.radius= (float*)malloc(count * sizeof(float));
|
|
|
|
|
|
|
|
return posx && posy && startPosY && startPosX && colorR && colorG && colorB && colorA &&
|
|
|
|
deltaColorR && deltaColorG && deltaColorB && deltaColorA && size && deltaSize &&
|
|
|
|
rotation && deltaRotation && timeToLive && atlasIndex && modeA.dirX && modeA.dirY &&
|
|
|
|
modeA.radialAccel && modeA.tangentialAccel && modeB.angle && modeB.degreesPerSecond &&
|
|
|
|
modeB.deltaRadius && modeB.radius;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ParticleData::release()
|
|
|
|
{
|
|
|
|
CC_SAFE_FREE(posx);
|
|
|
|
CC_SAFE_FREE(posy);
|
|
|
|
CC_SAFE_FREE(startPosX);
|
|
|
|
CC_SAFE_FREE(startPosY);
|
|
|
|
CC_SAFE_FREE(colorR);
|
|
|
|
CC_SAFE_FREE(colorG);
|
|
|
|
CC_SAFE_FREE(colorB);
|
|
|
|
CC_SAFE_FREE(colorA);
|
|
|
|
CC_SAFE_FREE(deltaColorR);
|
|
|
|
CC_SAFE_FREE(deltaColorG);
|
|
|
|
CC_SAFE_FREE(deltaColorB);
|
|
|
|
CC_SAFE_FREE(deltaColorA);
|
|
|
|
CC_SAFE_FREE(size);
|
|
|
|
CC_SAFE_FREE(deltaSize);
|
|
|
|
CC_SAFE_FREE(rotation);
|
|
|
|
CC_SAFE_FREE(deltaRotation);
|
|
|
|
CC_SAFE_FREE(timeToLive);
|
|
|
|
CC_SAFE_FREE(atlasIndex);
|
|
|
|
|
|
|
|
CC_SAFE_FREE(modeA.dirX);
|
|
|
|
CC_SAFE_FREE(modeA.dirY);
|
|
|
|
CC_SAFE_FREE(modeA.radialAccel);
|
|
|
|
CC_SAFE_FREE(modeA.tangentialAccel);
|
|
|
|
|
|
|
|
CC_SAFE_FREE(modeB.angle);
|
|
|
|
CC_SAFE_FREE(modeB.degreesPerSecond);
|
|
|
|
CC_SAFE_FREE(modeB.deltaRadius);
|
|
|
|
CC_SAFE_FREE(modeB.radius);
|
|
|
|
}
|
|
|
|
|
2017-06-05 13:37:50 +08:00
|
|
|
Vector<ParticleSystem*> ParticleSystem::__allInstances;
|
|
|
|
float ParticleSystem::__totalParticleCountFactor = 1.0f;
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ParticleSystem::ParticleSystem()
|
2013-11-13 11:22:34 +08:00
|
|
|
: _isBlendAdditive(false)
|
2013-07-29 14:07:57 +08:00
|
|
|
, _isAutoRemoveOnFinish(false)
|
|
|
|
, _plistFile("")
|
2013-06-15 14:03:30 +08:00
|
|
|
, _elapsed(0)
|
2013-11-13 11:22:34 +08:00
|
|
|
, _configName("")
|
2013-06-15 14:03:30 +08:00
|
|
|
, _emitCounter(0)
|
2013-11-13 11:22:34 +08:00
|
|
|
, _batchNode(nullptr)
|
2013-06-15 14:03:30 +08:00
|
|
|
, _atlasIndex(0)
|
|
|
|
, _transformSystemDirty(false)
|
|
|
|
, _allocatedParticles(0)
|
|
|
|
, _isActive(true)
|
|
|
|
, _particleCount(0)
|
|
|
|
, _duration(0)
|
|
|
|
, _life(0)
|
|
|
|
, _lifeVar(0)
|
|
|
|
, _angle(0)
|
|
|
|
, _angleVar(0)
|
2013-07-29 14:07:57 +08:00
|
|
|
, _emitterMode(Mode::GRAVITY)
|
2013-06-15 14:03:30 +08:00
|
|
|
, _startSize(0)
|
|
|
|
, _startSizeVar(0)
|
|
|
|
, _endSize(0)
|
|
|
|
, _endSizeVar(0)
|
|
|
|
, _startSpin(0)
|
|
|
|
, _startSpinVar(0)
|
|
|
|
, _endSpin(0)
|
|
|
|
, _endSpinVar(0)
|
|
|
|
, _emissionRate(0)
|
|
|
|
, _totalParticles(0)
|
2013-11-13 11:22:34 +08:00
|
|
|
, _texture(nullptr)
|
2013-07-29 14:07:57 +08:00
|
|
|
, _blendFunc(BlendFunc::ALPHA_PREMULTIPLIED)
|
2013-06-15 14:03:30 +08:00
|
|
|
, _opacityModifyRGB(false)
|
2014-05-10 02:50:37 +08:00
|
|
|
, _yCoordFlipped(1)
|
2013-11-13 11:22:34 +08:00
|
|
|
, _positionType(PositionType::FREE)
|
2016-06-22 16:54:57 +08:00
|
|
|
, _paused(false)
|
2017-09-07 17:16:46 +08:00
|
|
|
, _sourcePositionCompatible(true) // In the furture this member's default value maybe false or be removed.
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-04-20 01:40:52 +08:00
|
|
|
modeA.gravity.setZero();
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.speed = 0;
|
|
|
|
modeA.speedVar = 0;
|
|
|
|
modeA.tangentialAccel = 0;
|
|
|
|
modeA.tangentialAccelVar = 0;
|
|
|
|
modeA.radialAccel = 0;
|
|
|
|
modeA.radialAccelVar = 0;
|
2013-01-21 17:39:48 +08:00
|
|
|
modeA.rotationIsDir = false;
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.startRadius = 0;
|
|
|
|
modeB.startRadiusVar = 0;
|
|
|
|
modeB.endRadius = 0;
|
|
|
|
modeB.endRadiusVar = 0;
|
|
|
|
modeB.rotatePerSecond = 0;
|
|
|
|
modeB.rotatePerSecondVar = 0;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2013-06-20 14:13:12 +08:00
|
|
|
// implementation ParticleSystem
|
2012-06-14 15:13:16 +08:00
|
|
|
|
2013-11-06 11:02:03 +08:00
|
|
|
ParticleSystem * ParticleSystem::create(const std::string& plistFile)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
ParticleSystem *ret = new (std::nothrow) ParticleSystem();
|
2013-12-18 17:47:20 +08:00
|
|
|
if (ret && ret->initWithFile(plistFile))
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
ret->autorelease();
|
|
|
|
return ret;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(ret);
|
|
|
|
return ret;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-03-16 13:42:53 +08:00
|
|
|
|
2013-11-15 08:21:49 +08:00
|
|
|
ParticleSystem* ParticleSystem::createWithTotalParticles(int numberOfParticles)
|
2012-08-29 14:53:01 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
ParticleSystem *ret = new (std::nothrow) ParticleSystem();
|
2013-12-18 17:47:20 +08:00
|
|
|
if (ret && ret->initWithTotalParticles(numberOfParticles))
|
2012-08-29 14:53:01 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
ret->autorelease();
|
|
|
|
return ret;
|
2012-08-29 14:53:01 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
CC_SAFE_DELETE(ret);
|
|
|
|
return ret;
|
2012-08-29 14:53:01 +08:00
|
|
|
}
|
|
|
|
|
2017-06-05 13:37:50 +08:00
|
|
|
// static
|
|
|
|
Vector<ParticleSystem*>& ParticleSystem::getAllParticleSystems()
|
|
|
|
{
|
|
|
|
return __allInstances;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ParticleSystem::setTotalParticleCountFactor(float factor)
|
|
|
|
{
|
|
|
|
__totalParticleCountFactor = factor;
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
bool ParticleSystem::init()
|
2012-03-16 13:42:53 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
return initWithTotalParticles(150);
|
2012-03-16 13:42:53 +08:00
|
|
|
}
|
|
|
|
|
2013-11-06 11:02:03 +08:00
|
|
|
bool ParticleSystem::initWithFile(const std::string& plistFile)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
bool ret = false;
|
2013-07-12 06:24:23 +08:00
|
|
|
_plistFile = FileUtils::getInstance()->fullPathForFilename(plistFile);
|
2015-05-12 12:31:33 +08:00
|
|
|
ValueMap dict = FileUtils::getInstance()->getValueMapFromFile(_plistFile);
|
2010-12-27 17:39:15 +08:00
|
|
|
|
2013-12-03 15:41:01 +08:00
|
|
|
CCASSERT( !dict.empty(), "Particles: file not found");
|
2012-11-15 17:16:51 +08:00
|
|
|
|
2014-08-30 03:54:24 +08:00
|
|
|
// FIXME: compute path from a path, should define a function somewhere to do it
|
2012-11-15 17:16:51 +08:00
|
|
|
string listFilePath = plistFile;
|
|
|
|
if (listFilePath.find('/') != string::npos)
|
|
|
|
{
|
|
|
|
listFilePath = listFilePath.substr(0, listFilePath.rfind('/') + 1);
|
2016-02-03 23:12:37 +08:00
|
|
|
ret = this->initWithDictionary(dict, listFilePath);
|
2012-11-15 17:16:51 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
ret = this->initWithDictionary(dict, "");
|
2012-11-15 17:16:51 +08:00
|
|
|
}
|
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return ret;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
2013-12-04 17:46:57 +08:00
|
|
|
bool ParticleSystem::initWithDictionary(ValueMap& dictionary)
|
2012-11-15 17:16:51 +08:00
|
|
|
{
|
|
|
|
return initWithDictionary(dictionary, "");
|
|
|
|
}
|
|
|
|
|
2013-12-04 17:46:57 +08:00
|
|
|
bool ParticleSystem::initWithDictionary(ValueMap& dictionary, const std::string& dirname)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
bool ret = false;
|
2013-12-03 15:31:36 +08:00
|
|
|
unsigned char *buffer = nullptr;
|
|
|
|
unsigned char *deflated = nullptr;
|
|
|
|
Image *image = nullptr;
|
2012-04-19 14:35:52 +08:00
|
|
|
do
|
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
int maxParticles = dictionary["maxParticles"].asInt();
|
2012-04-19 14:35:52 +08:00
|
|
|
// self, not super
|
|
|
|
if(this->initWithTotalParticles(maxParticles))
|
|
|
|
{
|
2013-09-23 10:12:54 +08:00
|
|
|
// Emitter name in particle designer 2.0
|
2013-12-03 15:41:01 +08:00
|
|
|
_configName = dictionary["configName"].asString();
|
2013-09-23 10:12:54 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// angle
|
2013-12-03 15:41:01 +08:00
|
|
|
_angle = dictionary["angle"].asFloat();
|
|
|
|
_angleVar = dictionary["angleVariance"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// duration
|
2013-12-03 15:41:01 +08:00
|
|
|
_duration = dictionary["duration"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// blend function
|
2015-09-01 11:26:09 +08:00
|
|
|
if (!_configName.empty())
|
2013-09-18 16:21:48 +08:00
|
|
|
{
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
_blendFunc.src = utils::toBackendBlendFactor((int)dictionary["blendFuncSource"].asFloat());
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
_blendFunc.src = utils::toBackendBlendFactor(dictionary["blendFuncSource"].asInt());
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
_blendFunc.dst = utils::toBackendBlendFactor(dictionary["blendFuncDestination"].asInt());
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// color
|
2013-12-03 15:41:01 +08:00
|
|
|
_startColor.r = dictionary["startColorRed"].asFloat();
|
|
|
|
_startColor.g = dictionary["startColorGreen"].asFloat();
|
|
|
|
_startColor.b = dictionary["startColorBlue"].asFloat();
|
|
|
|
_startColor.a = dictionary["startColorAlpha"].asFloat();
|
|
|
|
|
|
|
|
_startColorVar.r = dictionary["startColorVarianceRed"].asFloat();
|
|
|
|
_startColorVar.g = dictionary["startColorVarianceGreen"].asFloat();
|
|
|
|
_startColorVar.b = dictionary["startColorVarianceBlue"].asFloat();
|
|
|
|
_startColorVar.a = dictionary["startColorVarianceAlpha"].asFloat();
|
|
|
|
|
|
|
|
_endColor.r = dictionary["finishColorRed"].asFloat();
|
|
|
|
_endColor.g = dictionary["finishColorGreen"].asFloat();
|
|
|
|
_endColor.b = dictionary["finishColorBlue"].asFloat();
|
|
|
|
_endColor.a = dictionary["finishColorAlpha"].asFloat();
|
|
|
|
|
|
|
|
_endColorVar.r = dictionary["finishColorVarianceRed"].asFloat();
|
|
|
|
_endColorVar.g = dictionary["finishColorVarianceGreen"].asFloat();
|
|
|
|
_endColorVar.b = dictionary["finishColorVarianceBlue"].asFloat();
|
|
|
|
_endColorVar.a = dictionary["finishColorVarianceAlpha"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// particle size
|
2013-12-03 15:41:01 +08:00
|
|
|
_startSize = dictionary["startParticleSize"].asFloat();
|
|
|
|
_startSizeVar = dictionary["startParticleSizeVariance"].asFloat();
|
|
|
|
_endSize = dictionary["finishParticleSize"].asFloat();
|
|
|
|
_endSizeVar = dictionary["finishParticleSizeVariance"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// position
|
2013-12-03 15:41:01 +08:00
|
|
|
float x = dictionary["sourcePositionx"].asFloat();
|
|
|
|
float y = dictionary["sourcePositiony"].asFloat();
|
2017-09-07 17:16:46 +08:00
|
|
|
if(!_sourcePositionCompatible) {
|
|
|
|
this->setSourcePosition(Vec2(x, y));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
this->setPosition(Vec2(x, y));
|
|
|
|
}
|
2013-12-03 15:41:01 +08:00
|
|
|
_posVar.x = dictionary["sourcePositionVariancex"].asFloat();
|
|
|
|
_posVar.y = dictionary["sourcePositionVariancey"].asFloat();
|
2010-12-27 17:39:15 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// Spinning
|
2013-12-03 15:41:01 +08:00
|
|
|
_startSpin = dictionary["rotationStart"].asFloat();
|
|
|
|
_startSpinVar = dictionary["rotationStartVariance"].asFloat();
|
|
|
|
_endSpin= dictionary["rotationEnd"].asFloat();
|
|
|
|
_endSpinVar= dictionary["rotationEndVariance"].asFloat();
|
2011-07-04 19:20:16 +08:00
|
|
|
|
2013-12-03 15:41:01 +08:00
|
|
|
_emitterMode = (Mode) dictionary["emitterType"].asInt();
|
2010-12-27 17:39:15 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// Mode A: Gravity + tangential accel + radial accel
|
2013-07-26 13:48:32 +08:00
|
|
|
if (_emitterMode == Mode::GRAVITY)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
// gravity
|
2013-12-03 15:41:01 +08:00
|
|
|
modeA.gravity.x = dictionary["gravityx"].asFloat();
|
|
|
|
modeA.gravity.y = dictionary["gravityy"].asFloat();
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// speed
|
2013-12-03 15:41:01 +08:00
|
|
|
modeA.speed = dictionary["speed"].asFloat();
|
|
|
|
modeA.speedVar = dictionary["speedVariance"].asFloat();
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// radial acceleration
|
2013-12-03 15:41:01 +08:00
|
|
|
modeA.radialAccel = dictionary["radialAcceleration"].asFloat();
|
|
|
|
modeA.radialAccelVar = dictionary["radialAccelVariance"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// tangential acceleration
|
2013-12-03 15:41:01 +08:00
|
|
|
modeA.tangentialAccel = dictionary["tangentialAcceleration"].asFloat();
|
|
|
|
modeA.tangentialAccelVar = dictionary["tangentialAccelVariance"].asFloat();
|
2013-01-21 17:39:48 +08:00
|
|
|
|
|
|
|
// rotation is dir
|
2013-12-03 15:41:01 +08:00
|
|
|
modeA.rotationIsDir = dictionary["rotationIsDir"].asBool();
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// or Mode B: radius movement
|
2013-07-26 13:48:32 +08:00
|
|
|
else if (_emitterMode == Mode::RADIUS)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-09-01 11:26:09 +08:00
|
|
|
if (!_configName.empty())
|
2013-09-18 16:21:48 +08:00
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.startRadius = dictionary["maxRadius"].asInt();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.startRadius = dictionary["maxRadius"].asFloat();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.startRadiusVar = dictionary["maxRadiusVariance"].asFloat();
|
2015-09-01 11:26:09 +08:00
|
|
|
if (!_configName.empty())
|
2013-09-18 16:21:48 +08:00
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.endRadius = dictionary["minRadius"].asInt();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.endRadius = dictionary["minRadius"].asFloat();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
2014-03-21 16:25:22 +08:00
|
|
|
|
|
|
|
if (dictionary.find("minRadiusVariance") != dictionary.end())
|
|
|
|
{
|
|
|
|
modeB.endRadiusVar = dictionary["minRadiusVariance"].asFloat();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
modeB.endRadiusVar = 0.0f;
|
|
|
|
}
|
|
|
|
|
2015-09-01 11:26:09 +08:00
|
|
|
if (!_configName.empty())
|
2013-09-18 16:21:48 +08:00
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.rotatePerSecond = dictionary["rotatePerSecond"].asInt();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.rotatePerSecond = dictionary["rotatePerSecond"].asFloat();
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
2013-12-03 15:41:01 +08:00
|
|
|
modeB.rotatePerSecondVar = dictionary["rotatePerSecondVariance"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
} else {
|
2013-07-20 13:01:27 +08:00
|
|
|
CCASSERT( false, "Invalid emitterType in config file");
|
2012-04-19 14:35:52 +08:00
|
|
|
CC_BREAK_IF(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
// life span
|
2013-12-03 15:41:01 +08:00
|
|
|
_life = dictionary["particleLifespan"].asFloat();
|
|
|
|
_lifeVar = dictionary["particleLifespanVariance"].asFloat();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// emission Rate
|
2013-06-15 14:03:30 +08:00
|
|
|
_emissionRate = _totalParticles / _life;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
//don't get the internal texture if a batchNode is used
|
2013-06-15 14:03:30 +08:00
|
|
|
if (!_batchNode)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2012-06-12 01:43:07 +08:00
|
|
|
// Set a compatible default for the alpha transfer
|
2013-06-15 14:03:30 +08:00
|
|
|
_opacityModifyRGB = false;
|
2012-06-08 14:11:48 +08:00
|
|
|
|
2012-04-24 15:02:18 +08:00
|
|
|
// texture
|
|
|
|
// Try to get the texture from the cache
|
2013-12-03 15:41:01 +08:00
|
|
|
std::string textureName = dictionary["textureFileName"].asString();
|
2012-11-15 17:16:51 +08:00
|
|
|
|
2012-11-21 17:22:26 +08:00
|
|
|
size_t rPos = textureName.rfind('/');
|
|
|
|
|
|
|
|
if (rPos != string::npos)
|
2012-11-15 17:16:51 +08:00
|
|
|
{
|
2012-11-21 17:22:26 +08:00
|
|
|
string textureDir = textureName.substr(0, rPos + 1);
|
|
|
|
|
2014-01-08 10:47:27 +08:00
|
|
|
if (!dirname.empty() && textureDir != dirname)
|
2012-11-21 17:22:26 +08:00
|
|
|
{
|
|
|
|
textureName = textureName.substr(rPos+1);
|
2013-11-06 11:02:03 +08:00
|
|
|
textureName = dirname + textureName;
|
2012-11-21 17:22:26 +08:00
|
|
|
}
|
2012-11-15 17:16:51 +08:00
|
|
|
}
|
2014-01-08 10:47:27 +08:00
|
|
|
else if (!dirname.empty() && !textureName.empty())
|
2013-01-17 11:42:41 +08:00
|
|
|
{
|
2014-01-04 04:27:08 +08:00
|
|
|
textureName = dirname + textureName;
|
2013-01-17 11:42:41 +08:00
|
|
|
}
|
2012-04-24 15:02:18 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
Texture2D *tex = nullptr;
|
2012-04-24 15:02:18 +08:00
|
|
|
|
2015-06-12 11:03:32 +08:00
|
|
|
if (!textureName.empty())
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2012-04-24 15:02:18 +08:00
|
|
|
// set not pop-up message box when load image failed
|
2013-12-18 17:47:20 +08:00
|
|
|
bool notify = FileUtils::getInstance()->isPopupNotify();
|
2013-07-12 06:24:23 +08:00
|
|
|
FileUtils::getInstance()->setPopupNotify(false);
|
2014-01-08 10:47:27 +08:00
|
|
|
tex = Director::getInstance()->getTextureCache()->addImage(textureName);
|
2012-04-24 15:02:18 +08:00
|
|
|
// reset the value of UIImage notify
|
2013-12-18 17:47:20 +08:00
|
|
|
FileUtils::getInstance()->setPopupNotify(notify);
|
2012-04-24 15:02:18 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (tex)
|
|
|
|
{
|
|
|
|
setTexture(tex);
|
|
|
|
}
|
2014-05-06 06:50:08 +08:00
|
|
|
else if( dictionary.find("textureImageData") != dictionary.end() )
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
2014-05-06 06:50:08 +08:00
|
|
|
std::string textureData = dictionary.at("textureImageData").asString();
|
2015-07-14 15:28:36 +08:00
|
|
|
CCASSERT(!textureData.empty(), "textureData can't be empty!");
|
2012-04-24 15:02:18 +08:00
|
|
|
|
2013-12-05 17:19:01 +08:00
|
|
|
auto dataLen = textureData.size();
|
2013-12-03 15:41:01 +08:00
|
|
|
if (dataLen != 0)
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
|
|
|
// if it fails, try to get it from the base64-gzipped data
|
2013-12-03 15:41:01 +08:00
|
|
|
int decodeLen = base64Decode((unsigned char*)textureData.c_str(), (unsigned int)dataLen, &buffer);
|
2013-12-03 15:31:36 +08:00
|
|
|
CCASSERT( buffer != nullptr, "CCParticleSystem: error decoding textureImageData");
|
2012-04-24 15:02:18 +08:00
|
|
|
CC_BREAK_IF(!buffer);
|
|
|
|
|
2013-12-06 16:32:06 +08:00
|
|
|
ssize_t deflatedLen = ZipUtils::inflateMemory(buffer, decodeLen, &deflated);
|
2013-12-03 15:31:36 +08:00
|
|
|
CCASSERT( deflated != nullptr, "CCParticleSystem: error ungzipping textureImageData");
|
2012-04-19 14:35:52 +08:00
|
|
|
CC_BREAK_IF(!deflated);
|
|
|
|
|
2013-11-07 19:11:09 +08:00
|
|
|
// For android, we should retain it in VolatileTexture::addImage which invoked in Director::getInstance()->getTextureCache()->addUIImage()
|
2014-08-28 07:31:57 +08:00
|
|
|
image = new (std::nothrow) Image();
|
2012-04-19 14:35:52 +08:00
|
|
|
bool isOK = image->initWithImageData(deflated, deflatedLen);
|
2013-07-20 13:01:27 +08:00
|
|
|
CCASSERT(isOK, "CCParticleSystem: error init image with Data");
|
2012-04-19 14:35:52 +08:00
|
|
|
CC_BREAK_IF(!isOK);
|
|
|
|
|
2015-06-12 11:03:32 +08:00
|
|
|
setTexture(Director::getInstance()->getTextureCache()->addImage(image, _plistFile + textureName));
|
2012-05-23 11:18:04 +08:00
|
|
|
|
|
|
|
image->release();
|
2012-04-24 15:02:18 +08:00
|
|
|
}
|
2013-09-18 16:21:48 +08:00
|
|
|
}
|
2014-01-08 10:47:27 +08:00
|
|
|
|
2014-05-10 02:50:37 +08:00
|
|
|
_yCoordFlipped = dictionary.find("yCoordFlipped") == dictionary.end() ? 1 : dictionary.at("yCoordFlipped").asInt();
|
2014-05-06 06:50:08 +08:00
|
|
|
|
|
|
|
if( !this->_texture)
|
|
|
|
CCLOGWARN("cocos2d: Warning: ParticleSystemQuad system without a texture");
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2013-12-18 17:47:20 +08:00
|
|
|
ret = true;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
} while (0);
|
2013-11-12 10:09:47 +08:00
|
|
|
free(buffer);
|
|
|
|
free(deflated);
|
2013-12-18 17:47:20 +08:00
|
|
|
return ret;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-11-15 08:21:49 +08:00
|
|
|
bool ParticleSystem::initWithTotalParticles(int numberOfParticles)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_totalParticles = numberOfParticles;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.release();
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
if( !_particleData.init(_totalParticles) )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
CCLOG("Particle system: not enough memory");
|
|
|
|
this->release();
|
|
|
|
return false;
|
|
|
|
}
|
2013-06-15 14:03:30 +08:00
|
|
|
_allocatedParticles = numberOfParticles;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if (_batchNode)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-09-08 11:26:38 +08:00
|
|
|
for (int i = 0; i < _totalParticles; i++)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.atlasIndex[i] = i;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// default, active
|
2013-06-15 14:03:30 +08:00
|
|
|
_isActive = true;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// default blend function
|
2013-07-26 08:47:42 +08:00
|
|
|
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// default movement type;
|
2013-07-26 13:48:32 +08:00
|
|
|
_positionType = PositionType::FREE;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// by default be in mode A:
|
2013-07-26 13:48:32 +08:00
|
|
|
_emitterMode = Mode::GRAVITY;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// default: modulate
|
2014-08-30 03:54:24 +08:00
|
|
|
// FIXME:: not used
|
2012-04-19 14:35:52 +08:00
|
|
|
// colorModulate = YES;
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_isAutoRemoveOnFinish = false;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2012-09-17 15:02:24 +08:00
|
|
|
// Optimization: compile updateParticle method
|
2012-04-19 14:35:52 +08:00
|
|
|
//updateParticleSel = @selector(updateQuadWithParticle:newPosition:);
|
|
|
|
//updateParticleImp = (CC_UPDATE_PARTICLE_IMP) [self methodForSelector:updateParticleSel];
|
|
|
|
//for batchNode
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = false;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
return true;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
ParticleSystem::~ParticleSystem()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-02-27 16:26:42 +08:00
|
|
|
// Since the scheduler retains the "target (in this case the ParticleSystem)
|
|
|
|
// it is not needed to call "unscheduleUpdate" here. In fact, it will be called in "cleanup"
|
|
|
|
//unscheduleUpdate();
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.release();
|
2013-06-15 14:03:30 +08:00
|
|
|
CC_SAFE_RELEASE(_texture);
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-03-14 14:55:17 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
void ParticleSystem::addParticles(int count)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2016-06-15 18:31:10 +08:00
|
|
|
if (_paused)
|
|
|
|
return;
|
2015-08-31 17:25:34 +08:00
|
|
|
uint32_t RANDSEED = rand();
|
|
|
|
|
|
|
|
int start = _particleCount;
|
|
|
|
_particleCount += count;
|
|
|
|
|
|
|
|
//life
|
|
|
|
for (int i = start; i < _particleCount ; ++i)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
float theLife = _life + _lifeVar * RANDOM_M11(&RANDSEED);
|
|
|
|
_particleData.timeToLive[i] = MAX(0, theLife);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
|
|
|
//position
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.posx[i] = _sourcePosition.x + _posVar.x * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.posy[i] = _sourcePosition.y + _posVar.y * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
|
|
|
|
|
|
|
//color
|
|
|
|
#define SET_COLOR(c, b, v)\
|
|
|
|
for (int i = start; i < _particleCount; ++i)\
|
|
|
|
{\
|
|
|
|
c[i] = clampf( b + v * RANDOM_M11(&RANDSEED) , 0 , 1 );\
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
|
|
|
SET_COLOR(_particleData.colorR, _startColor.r, _startColorVar.r);
|
|
|
|
SET_COLOR(_particleData.colorG, _startColor.g, _startColorVar.g);
|
|
|
|
SET_COLOR(_particleData.colorB, _startColor.b, _startColorVar.b);
|
|
|
|
SET_COLOR(_particleData.colorA, _startColor.a, _startColorVar.a);
|
|
|
|
|
|
|
|
SET_COLOR(_particleData.deltaColorR, _endColor.r, _endColorVar.r);
|
|
|
|
SET_COLOR(_particleData.deltaColorG, _endColor.g, _endColorVar.g);
|
|
|
|
SET_COLOR(_particleData.deltaColorB, _endColor.b, _endColorVar.b);
|
|
|
|
SET_COLOR(_particleData.deltaColorA, _endColor.a, _endColorVar.a);
|
|
|
|
|
|
|
|
#define SET_DELTA_COLOR(c, dc)\
|
|
|
|
for (int i = start; i < _particleCount; ++i)\
|
|
|
|
{\
|
|
|
|
dc[i] = (dc[i] - c[i]) / _particleData.timeToLive[i];\
|
|
|
|
}
|
|
|
|
|
|
|
|
SET_DELTA_COLOR(_particleData.colorR, _particleData.deltaColorR);
|
|
|
|
SET_DELTA_COLOR(_particleData.colorG, _particleData.deltaColorG);
|
|
|
|
SET_DELTA_COLOR(_particleData.colorB, _particleData.deltaColorB);
|
|
|
|
SET_DELTA_COLOR(_particleData.colorA, _particleData.deltaColorA);
|
|
|
|
|
|
|
|
//size
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.size[i] = _startSize + _startSizeVar * RANDOM_M11(&RANDSEED);
|
|
|
|
_particleData.size[i] = MAX(0, _particleData.size[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (_endSize != START_SIZE_EQUAL_TO_END_SIZE)
|
|
|
|
{
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
float endSize = _endSize + _endSizeVar * RANDOM_M11(&RANDSEED);
|
|
|
|
endSize = MAX(0, endSize);
|
|
|
|
_particleData.deltaSize[i] = (endSize - _particleData.size[i]) / _particleData.timeToLive[i];
|
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.deltaSize[i] = 0.0f;
|
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// rotation
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.rotation[i] = _startSpin + _startSpinVar * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
float endA = _endSpin + _endSpinVar * RANDOM_M11(&RANDSEED);
|
|
|
|
_particleData.deltaRotation[i] = (endA - _particleData.rotation[i]) / _particleData.timeToLive[i];
|
|
|
|
}
|
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// position
|
2015-08-31 17:25:34 +08:00
|
|
|
Vec2 pos;
|
2013-07-26 13:48:32 +08:00
|
|
|
if (_positionType == PositionType::FREE)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
pos = this->convertToWorldSpace(Vec2::ZERO);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2013-07-26 13:48:32 +08:00
|
|
|
else if (_positionType == PositionType::RELATIVE)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
pos = _position;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.startPosX[i] = pos.x;
|
|
|
|
}
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.startPosY[i] = pos.y;
|
|
|
|
}
|
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// Mode Gravity: A
|
2013-07-26 13:48:32 +08:00
|
|
|
if (_emitterMode == Mode::GRAVITY)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// radial accel
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeA.radialAccel[i] = modeA.radialAccel + modeA.radialAccelVar * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// tangential accel
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeA.tangentialAccel[i] = modeA.tangentialAccel + modeA.tangentialAccelVar * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
|
|
|
|
2013-01-21 17:39:48 +08:00
|
|
|
// rotation is dir
|
2015-08-31 17:25:34 +08:00
|
|
|
if( modeA.rotationIsDir )
|
|
|
|
{
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
float a = CC_DEGREES_TO_RADIANS( _angle + _angleVar * RANDOM_M11(&RANDSEED) );
|
|
|
|
Vec2 v(cosf( a ), sinf( a ));
|
|
|
|
float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);
|
|
|
|
Vec2 dir = v * s;
|
|
|
|
_particleData.modeA.dirX[i] = dir.x;//v * s ;
|
|
|
|
_particleData.modeA.dirY[i] = dir.y;
|
|
|
|
_particleData.rotation[i] = -CC_RADIANS_TO_DEGREES(dir.getAngle());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
float a = CC_DEGREES_TO_RADIANS( _angle + _angleVar * RANDOM_M11(&RANDSEED) );
|
|
|
|
Vec2 v(cosf( a ), sinf( a ));
|
|
|
|
float s = modeA.speed + modeA.speedVar * RANDOM_M11(&RANDSEED);
|
|
|
|
Vec2 dir = v * s;
|
|
|
|
_particleData.modeA.dirX[i] = dir.x;//v * s ;
|
|
|
|
_particleData.modeA.dirY[i] = dir.y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
// Mode Radius: B
|
2015-08-31 17:25:34 +08:00
|
|
|
else
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
//Need to check by Jacky
|
2012-04-19 14:35:52 +08:00
|
|
|
// Set the default diameter of the particle from the source position
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.radius[i] = modeB.startRadius + modeB.startRadiusVar * RANDOM_M11(&RANDSEED);
|
|
|
|
}
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.angle[i] = CC_DEGREES_TO_RADIANS( _angle + _angleVar * RANDOM_M11(&RANDSEED));
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.degreesPerSecond[i] = CC_DEGREES_TO_RADIANS(modeB.rotatePerSecond + modeB.rotatePerSecondVar * RANDOM_M11(&RANDSEED));
|
|
|
|
}
|
|
|
|
|
|
|
|
if(modeB.endRadius == START_RADIUS_EQUAL_TO_END_RADIUS)
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.deltaRadius[i] = 0.0f;
|
|
|
|
}
|
2012-04-24 15:02:18 +08:00
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
else
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = start; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
float endRadius = modeB.endRadius + modeB.endRadiusVar * RANDOM_M11(&RANDSEED);
|
|
|
|
_particleData.modeB.deltaRadius[i] = (endRadius - _particleData.modeB.radius[i]) / _particleData.timeToLive[i];
|
|
|
|
}
|
2012-04-24 15:02:18 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
}
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2014-03-24 18:08:55 +08:00
|
|
|
void ParticleSystem::onEnter()
|
|
|
|
{
|
2014-06-13 17:59:23 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
2014-06-18 11:51:52 +08:00
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnEnter))
|
2014-06-13 17:59:23 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-03-24 18:08:55 +08:00
|
|
|
Node::onEnter();
|
|
|
|
|
|
|
|
// update after action in run!
|
|
|
|
this->scheduleUpdateWithPriority(1);
|
2017-06-05 13:37:50 +08:00
|
|
|
|
|
|
|
__allInstances.pushBack(this);
|
2014-03-24 18:08:55 +08:00
|
|
|
}
|
|
|
|
|
2014-03-28 14:05:38 +08:00
|
|
|
void ParticleSystem::onExit()
|
|
|
|
{
|
2015-07-28 16:07:14 +08:00
|
|
|
#if CC_ENABLE_SCRIPT_BINDING
|
|
|
|
if (_scriptType == kScriptTypeJavascript)
|
|
|
|
{
|
2015-07-28 18:24:03 +08:00
|
|
|
if (ScriptEngineManager::sendNodeEventToJSExtended(this, kNodeOnExit))
|
2015-07-28 16:07:14 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-03-28 14:05:38 +08:00
|
|
|
this->unscheduleUpdate();
|
|
|
|
Node::onExit();
|
2017-06-05 13:37:50 +08:00
|
|
|
|
|
|
|
auto iter = std::find(std::begin(__allInstances), std::end(__allInstances), this);
|
|
|
|
if (iter != std::end(__allInstances))
|
|
|
|
{
|
|
|
|
__allInstances.erase(iter);
|
|
|
|
}
|
2014-03-28 14:05:38 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::stopSystem()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isActive = false;
|
|
|
|
_elapsed = _duration;
|
|
|
|
_emitCounter = 0;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::resetSystem()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isActive = true;
|
|
|
|
_elapsed = 0;
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.timeToLive[i] = 0.0f;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
bool ParticleSystem::isFull()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return (_particleCount == _totalParticles);
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ParticleSystem - MainLoop
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::update(float dt)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-20 14:13:12 +08:00
|
|
|
CC_PROFILER_START_CATEGORY(kProfilerCategoryParticles , "CCParticleSystem - update");
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if (_isActive && _emissionRate)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
float rate = 1.0f / _emissionRate;
|
2017-06-05 13:37:50 +08:00
|
|
|
int totalParticles = static_cast<int>(_totalParticles * __totalParticleCountFactor);
|
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
//issue #1201, prevent bursts of particles, due to too high emitCounter
|
2017-06-05 13:37:50 +08:00
|
|
|
if (_particleCount < totalParticles)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_emitCounter += dt;
|
2015-09-23 18:37:12 +08:00
|
|
|
if (_emitCounter < 0.f)
|
|
|
|
_emitCounter = 0.f;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
2017-06-05 13:37:50 +08:00
|
|
|
int emitCount = MIN(totalParticles - _particleCount, _emitCounter / rate);
|
2015-08-31 17:25:34 +08:00
|
|
|
addParticles(emitCount);
|
|
|
|
_emitCounter -= rate * emitCount;
|
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_elapsed += dt;
|
2015-09-23 18:37:12 +08:00
|
|
|
if (_elapsed < 0.f)
|
|
|
|
_elapsed = 0.f;
|
2015-08-31 17:25:34 +08:00
|
|
|
if (_duration != DURATION_INFINITY && _duration < _elapsed)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
this->stopSystem();
|
|
|
|
}
|
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.timeToLive[i] -= dt;
|
|
|
|
}
|
2014-09-18 15:24:27 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
if (_particleData.timeToLive[i] <= 0.0f)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
int j = _particleCount - 1;
|
|
|
|
while (j > 0 && _particleData.timeToLive[j] <= 0)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleCount--;
|
|
|
|
j--;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.copyParticle(i, _particleCount - 1);
|
2013-06-15 14:03:30 +08:00
|
|
|
if (_batchNode)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
//disable the switched particle
|
2015-08-31 17:25:34 +08:00
|
|
|
int currentIndex = _particleData.atlasIndex[i];
|
|
|
|
_batchNode->disableParticle(_atlasIndex + currentIndex);
|
2012-04-19 14:35:52 +08:00
|
|
|
//switch indexes
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.atlasIndex[_particleCount - 1] = currentIndex;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2013-06-15 14:03:30 +08:00
|
|
|
--_particleCount;
|
|
|
|
if( _particleCount == 0 && _isAutoRemoveOnFinish )
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
this->unscheduleUpdate();
|
2013-06-15 14:03:30 +08:00
|
|
|
_parent->removeChild(this, true);
|
2012-04-19 14:35:52 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (_emitterMode == Mode::GRAVITY)
|
|
|
|
{
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
particle_point tmp, radial = {0.0f, 0.0f}, tangential;
|
|
|
|
|
|
|
|
// radial acceleration
|
|
|
|
if (_particleData.posx[i] || _particleData.posy[i])
|
|
|
|
{
|
2017-02-06 15:13:20 +08:00
|
|
|
normalize_point(_particleData.posx[i], _particleData.posy[i], &radial);
|
2015-08-31 17:25:34 +08:00
|
|
|
}
|
|
|
|
tangential = radial;
|
|
|
|
radial.x *= _particleData.modeA.radialAccel[i];
|
|
|
|
radial.y *= _particleData.modeA.radialAccel[i];
|
|
|
|
|
|
|
|
// tangential acceleration
|
|
|
|
std::swap(tangential.x, tangential.y);
|
|
|
|
tangential.x *= - _particleData.modeA.tangentialAccel[i];
|
|
|
|
tangential.y *= _particleData.modeA.tangentialAccel[i];
|
|
|
|
|
|
|
|
// (gravity + radial + tangential) * dt
|
|
|
|
tmp.x = radial.x + tangential.x + modeA.gravity.x;
|
|
|
|
tmp.y = radial.y + tangential.y + modeA.gravity.y;
|
|
|
|
tmp.x *= dt;
|
|
|
|
tmp.y *= dt;
|
|
|
|
|
|
|
|
_particleData.modeA.dirX[i] += tmp.x;
|
|
|
|
_particleData.modeA.dirY[i] += tmp.y;
|
|
|
|
|
|
|
|
// this is cocos2d-x v3.0
|
|
|
|
// if (_configName.length()>0 && _yCoordFlipped != -1)
|
|
|
|
|
|
|
|
// this is cocos2d-x v3.0
|
|
|
|
tmp.x = _particleData.modeA.dirX[i] * dt * _yCoordFlipped;
|
|
|
|
tmp.y = _particleData.modeA.dirY[i] * dt * _yCoordFlipped;
|
|
|
|
_particleData.posx[i] += tmp.x;
|
|
|
|
_particleData.posy[i] += tmp.y;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2016-05-18 22:25:43 +08:00
|
|
|
//Why use so many for-loop separately instead of putting them together?
|
|
|
|
//When the processor needs to read from or write to a location in memory,
|
|
|
|
//it first checks whether a copy of that data is in the cache.
|
|
|
|
//And every property's memory of the particle system is continuous,
|
|
|
|
//for the purpose of improving cache hit rate, we should process only one property in one for-loop AFAP.
|
|
|
|
//It was proved to be effective especially for low-end machine.
|
2015-08-31 17:25:34 +08:00
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.angle[i] += _particleData.modeB.degreesPerSecond[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.modeB.radius[i] += _particleData.modeB.deltaRadius[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.posx[i] = - cosf(_particleData.modeB.angle[i]) * _particleData.modeB.radius[i];
|
|
|
|
}
|
|
|
|
for (int i = 0; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.posy[i] = - sinf(_particleData.modeB.angle[i]) * _particleData.modeB.radius[i] * _yCoordFlipped;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//color r,g,b,a
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.colorR[i] += _particleData.deltaColorR[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.colorG[i] += _particleData.deltaColorG[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.colorB[i] += _particleData.deltaColorB[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.colorA[i] += _particleData.deltaColorA[i] * dt;
|
|
|
|
}
|
|
|
|
//size
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.size[i] += (_particleData.deltaSize[i] * dt);
|
|
|
|
_particleData.size[i] = MAX(0, _particleData.size[i]);
|
|
|
|
}
|
|
|
|
//angle
|
|
|
|
for (int i = 0 ; i < _particleCount; ++i)
|
|
|
|
{
|
|
|
|
_particleData.rotation[i] += _particleData.deltaRotation[i] * dt;
|
|
|
|
}
|
|
|
|
|
|
|
|
updateParticleQuads();
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = false;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2015-08-31 17:25:34 +08:00
|
|
|
|
2014-03-27 16:47:21 +08:00
|
|
|
// only update gl buffer when visible
|
|
|
|
if (_visible && ! _batchNode)
|
2012-04-24 15:02:18 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
postStep();
|
2012-04-24 15:02:18 +08:00
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
CC_PROFILER_STOP_CATEGORY(kProfilerCategoryParticles , "CCParticleSystem - update");
|
2012-03-14 14:55:17 +08:00
|
|
|
}
|
2010-08-23 14:57:37 +08:00
|
|
|
|
2019-07-22 09:38:46 +08:00
|
|
|
void ParticleSystem::updateWithNoTime()
|
2012-03-14 14:55:17 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
this->update(0.0f);
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-03-14 14:55:17 +08:00
|
|
|
|
2015-08-31 17:25:34 +08:00
|
|
|
void ParticleSystem::updateParticleQuads()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2015-09-22 16:08:23 +08:00
|
|
|
//should be overridden
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::postStep()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2012-09-17 15:02:24 +08:00
|
|
|
// should be overridden
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
// ParticleSystem - Texture protocol
|
|
|
|
void ParticleSystem::setTexture(Texture2D* var)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
if (_texture != var)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2012-06-08 14:11:48 +08:00
|
|
|
CC_SAFE_RETAIN(var);
|
2013-06-15 14:03:30 +08:00
|
|
|
CC_SAFE_RELEASE(_texture);
|
|
|
|
_texture = var;
|
2012-06-08 14:11:48 +08:00
|
|
|
updateBlendFunc();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::updateBlendFunc()
|
2012-06-08 14:11:48 +08:00
|
|
|
{
|
2013-07-20 13:01:27 +08:00
|
|
|
CCASSERT(! _batchNode, "Can't change blending functions when the particle is being batched");
|
2010-12-27 17:39:15 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if(_texture)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
bool premultiplied = _texture->hasPremultipliedAlpha();
|
2012-06-12 01:43:07 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_opacityModifyRGB = false;
|
2012-06-12 01:43:07 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _texture && ( _blendFunc.src == CC_BLEND_SRC && _blendFunc.dst == CC_BLEND_DST ) )
|
2012-06-12 01:43:07 +08:00
|
|
|
{
|
|
|
|
if( premultiplied )
|
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_opacityModifyRGB = true;
|
2012-06-12 01:43:07 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-07-26 04:36:19 +08:00
|
|
|
_blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED;
|
2012-06-12 01:43:07 +08:00
|
|
|
}
|
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-23 18:26:26 +08:00
|
|
|
Texture2D * ParticleSystem::getTexture() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _texture;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ParticleSystem - Additive Blending
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setBlendAdditive(bool additive)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2012-04-19 14:35:52 +08:00
|
|
|
if( additive )
|
|
|
|
{
|
2013-07-26 04:36:19 +08:00
|
|
|
_blendFunc = BlendFunc::ADDITIVE;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _texture && ! _texture->hasPremultipliedAlpha() )
|
2013-07-26 04:36:19 +08:00
|
|
|
_blendFunc = BlendFunc::ALPHA_NON_PREMULTIPLIED;
|
2012-04-19 14:35:52 +08:00
|
|
|
else
|
2013-07-26 04:36:19 +08:00
|
|
|
_blendFunc = BlendFunc::ALPHA_PREMULTIPLIED;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
bool ParticleSystem::isBlendAdditive() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
return( _blendFunc.src == backend::BlendFactor::SRC_ALPHA && _blendFunc.dst == backend::BlendFactor::ONE);
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ParticleSystem - Properties of Gravity Mode
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setTangentialAccel(float t)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT( _emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.tangentialAccel = t;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getTangentialAccel() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT( _emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.tangentialAccel;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setTangentialAccelVar(float t)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.tangentialAccelVar = t;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getTangentialAccelVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.tangentialAccelVar;
|
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRadialAccel(float t)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.radialAccel = t;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getRadialAccel() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.radialAccel;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRadialAccelVar(float t)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.radialAccelVar = t;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getRadialAccelVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.radialAccelVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRotationIsDir(bool t)
|
2013-01-21 17:39:48 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2013-01-21 17:39:48 +08:00
|
|
|
modeA.rotationIsDir = t;
|
|
|
|
}
|
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
bool ParticleSystem::getRotationIsDir() const
|
2013-01-21 17:39:48 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2013-01-21 17:39:48 +08:00
|
|
|
return modeA.rotationIsDir;
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
void ParticleSystem::setGravity(const Vec2& g)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.gravity = g;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
const Vec2& ParticleSystem::getGravity()
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.gravity;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setSpeed(float speed)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.speed = speed;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getSpeed() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.speed;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setSpeedVar(float speedVar)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeA.speedVar = speedVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getSpeedVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::GRAVITY, "Particle Mode should be Gravity");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeA.speedVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// ParticleSystem - Properties of Radius Mode
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setStartRadius(float startRadius)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.startRadius = startRadius;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getStartRadius() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.startRadius;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setStartRadiusVar(float startRadiusVar)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.startRadiusVar = startRadiusVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getStartRadiusVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.startRadiusVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setEndRadius(float endRadius)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.endRadius = endRadius;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getEndRadius() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.endRadius;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setEndRadiusVar(float endRadiusVar)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.endRadiusVar = endRadiusVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getEndRadiusVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.endRadiusVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRotatePerSecond(float degrees)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.rotatePerSecond = degrees;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getRotatePerSecond() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.rotatePerSecond;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRotatePerSecondVar(float degrees)
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
modeB.rotatePerSecondVar = degrees;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
float ParticleSystem::getRotatePerSecondVar() const
|
2010-12-27 17:39:15 +08:00
|
|
|
{
|
2013-07-26 13:48:32 +08:00
|
|
|
CCASSERT(_emitterMode == Mode::RADIUS, "Particle Mode should be Radius");
|
2012-04-19 14:35:52 +08:00
|
|
|
return modeB.rotatePerSecondVar;
|
2010-12-27 17:39:15 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
bool ParticleSystem::isActive() const
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _isActive;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-09-08 11:26:38 +08:00
|
|
|
int ParticleSystem::getTotalParticles() const
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _totalParticles;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-09-08 11:26:38 +08:00
|
|
|
void ParticleSystem::setTotalParticles(int var)
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-07-20 13:01:27 +08:00
|
|
|
CCASSERT( var <= _allocatedParticles, "Particle: resizing particle array only supported for quads");
|
2013-06-15 14:03:30 +08:00
|
|
|
_totalParticles = var;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-05 16:49:22 +08:00
|
|
|
const BlendFunc& ParticleSystem::getBlendFunc() const
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _blendFunc;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-05 16:49:22 +08:00
|
|
|
void ParticleSystem::setBlendFunc(const BlendFunc &blendFunc)
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _blendFunc.src != blendFunc.src || _blendFunc.dst != blendFunc.dst ) {
|
|
|
|
_blendFunc = blendFunc;
|
2012-06-12 01:43:07 +08:00
|
|
|
this->updateBlendFunc();
|
2012-06-08 14:11:48 +08:00
|
|
|
}
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-07-07 13:01:21 +08:00
|
|
|
bool ParticleSystem::isAutoRemoveOnFinish() const
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _isAutoRemoveOnFinish;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setAutoRemoveOnFinish(bool var)
|
2011-03-19 10:07:16 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_isAutoRemoveOnFinish = var;
|
2011-03-19 10:07:16 +08:00
|
|
|
}
|
2012-04-18 18:43:45 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
// ParticleSystem - methods for batchNode rendering
|
|
|
|
|
2019-07-22 09:38:46 +08:00
|
|
|
ParticleBatchNode* ParticleSystem::getBatchNode() const
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
return _batchNode;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setBatchNode(ParticleBatchNode* batchNode)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
if( _batchNode != batchNode ) {
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2013-06-15 14:03:30 +08:00
|
|
|
_batchNode = batchNode; // weak reference
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
if( batchNode ) {
|
|
|
|
//each particle needs a unique index
|
2013-09-08 11:26:38 +08:00
|
|
|
for (int i = 0; i < _totalParticles; i++)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2015-08-31 17:25:34 +08:00
|
|
|
_particleData.atlasIndex[i] = i;
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//don't use a transform matrix, this is faster
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setScale(float s)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = true;
|
2013-06-20 14:13:12 +08:00
|
|
|
Node::setScale(s);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setRotation(float newRotation)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = true;
|
2013-06-20 14:13:12 +08:00
|
|
|
Node::setRotation(newRotation);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setScaleX(float newScaleX)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = true;
|
2013-06-20 14:13:12 +08:00
|
|
|
Node::setScaleX(newScaleX);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
|
|
|
|
2013-06-20 14:13:12 +08:00
|
|
|
void ParticleSystem::setScaleY(float newScaleY)
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
2013-06-15 14:03:30 +08:00
|
|
|
_transformSystemDirty = true;
|
2013-06-20 14:13:12 +08:00
|
|
|
Node::setScaleY(newScaleY);
|
2012-04-19 14:35:52 +08:00
|
|
|
}
|
2012-03-14 14:55:17 +08:00
|
|
|
|
2016-01-12 17:21:01 +08:00
|
|
|
void ParticleSystem::start()
|
|
|
|
{
|
|
|
|
resetSystem();
|
|
|
|
}
|
|
|
|
|
|
|
|
void ParticleSystem::stop()
|
|
|
|
{
|
|
|
|
stopSystem();
|
|
|
|
}
|
2016-06-15 18:31:10 +08:00
|
|
|
|
|
|
|
bool ParticleSystem::isPaused() const
|
|
|
|
{
|
|
|
|
return _paused;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ParticleSystem::pauseEmissions()
|
|
|
|
{
|
|
|
|
_paused = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ParticleSystem::resumeEmissions()
|
|
|
|
{
|
|
|
|
_paused = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2012-04-18 18:43:45 +08:00
|
|
|
NS_CC_END
|