62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
3a7b673164
add callback for RenderTexture::saveToFile
2014-08-12 10:50:57 +08:00
9c87522199
little more modefy
2014-08-04 17:34:50 +08:00
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
7e7c3aeb1c
The orientation of render texture should be rotated when _keepMatrix is true
2014-07-17 19:53:35 +08:00
a2413a6538
no need to save/restore for render texture when entering background
2014-07-17 17:03:10 +08:00
33fb1dd050
Make the API more extendable
2014-06-13 15:27:59 +08:00
7e99121af7
Change the default pixel format from RGB to RGBA for render texture when saving as PNG.
2014-06-13 13:35:18 +08:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
b5f513ce16
Merge branch 'v3' into improved_directory_structure
2014-04-30 13:15:10 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
331c2d3872
readd wp8 code which is removed by accident
2014-04-29 16:03:50 +08:00
faa0f67644
using pointer instead of Director::getInstance() in RenderTexture
2014-04-29 15:13:24 +08:00
bd93a5cb76
fix bug for renderTexture created which is bigger than screen size
2014-04-29 15:08:44 +08:00
35f83fc40a
fixed compile fail
2014-04-28 11:42:54 +08:00
81c2d92355
yeah... love in includes
...
<3
2014-04-26 10:35:57 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
dbf241c38d
fix compile error after merge
2014-04-25 16:30:51 +08:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
7a38050e09
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-21 17:47:34 +08:00
b0adaee331
added missing WP8 device orientation
2014-04-19 10:06:27 -07:00
5ddef013ba
Flipping RenderTexture's sprite instead of scaling it by -1
2014-04-17 02:22:34 +03:00
d14d3007d0
remove kazmath include file
2014-04-16 14:08:58 +08:00
346d42f723
remove warning message---finished
2014-04-16 11:20:45 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
e5802a56da
remove kmMat4 in RenderTexture.cpp
2014-04-11 13:58:42 +08:00
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
6b4451482f
remove matrixToKmMat4 function
2014-04-04 18:13:10 +08:00
f1b1678900
Director::getMatrix returns Matrix instead of kmMat4
2014-04-04 17:31:21 +08:00
67e62ce73d
readied director::getMatrix again. remove kmGLgetMatrix
2014-04-03 17:26:06 +08:00
46b4f1b5d8
migrate Grid, Label, RenderTexture to director matrix stack
2014-04-03 14:32:49 +08:00
e15d0a9d20
RenderTexture saveToFile will return true
2014-03-10 17:42:27 +08:00
ad9c104cfd
migrate saveToFile compatible with new renderer
2014-03-07 17:41:51 +08:00
99d0ce160a
rename setVirtualViewPort->setVirtualViewport
2014-03-04 15:41:36 +08:00
ec397611f6
remove blank line，adjust indent
2014-03-04 15:30:05 +08:00
756024e9f1
implement interface setKeepMatrix, setVirtualViewPort
2014-03-04 15:07:28 +08:00
68130fb4d0
fix matrix push/pop bug
2014-03-04 11:06:39 +08:00
a759d9ae60
calculate viewport based on _fullRect _rtRect and _fullRectViewport
2014-03-04 10:57:57 +08:00
7949cb2cd9
add interface for keep Matrix
2014-03-04 10:41:03 +08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
eb66ddd931
visit and draw improved.
...
`visit()` and `draw()` are improved.
they both receive:
- `Renderer`
- `kmMat4` for transformation
- `bool` whether or not the transform changed from the previous frame
Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).
Those parameters are needed for:
- `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
- we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
- whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.
We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
650331769a
closed #3964 , Use GL methods instead in function RenderTexture::newImage()
2014-02-18 10:47:14 +08:00
8ae5d2a049
closed #3964 , Solve the bug of logic code in method Image::saveImageToPNG().
2014-02-13 16:22:41 +08:00
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
64af0de648
update copyrights for 2014, in cocos/2d/ folder
2014-01-07 11:25:07 +08:00
b2934d32bc
Merge branch 'develop' into develop_RenderTextureBug
...
* develop: (32 commits)
fix align text error in label
Update the JS binding code & samples for latest cocos2d engine.
[AUTO] : updating submodule reference to latest autogenerated bindings
texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
Updates nativeactivity.cpp.
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
remove other non-functional jenkins scripts
[AUTO] : updating submodule reference to latest autogenerated bindings
move ghprb.py to tools/jenkins-scripts/
issue #2050 : commit resources
add github pull request builder for Jenkins
Adds an empty LuaEngine::parseConfig function.
[JSB] Adds trigger bindings for CocoStudio.
update cocos2d-x version string
update describe for support translucency on android
update describe for support translucency on android
update describe for support translucency on android
recover java activity on android.
remove draw increment
migrate ShaderTestSprite to new renderer
...
2013-12-31 14:58:11 +08:00
bf1f5dd0e0
fix rendertexture bug
2013-12-31 11:48:51 +08:00
cf006df9ff
closed #2865 : Deprecates CCNotificationCenter, uses EventDispatcher instead.
2013-12-31 10:54:37 +08:00
a14006bb8f
calculation matrix
2013-12-30 21:24:16 +08:00
c030553d8c
Fix missed popMatrix
2013-12-30 20:25:25 +08:00
6bc0a7066f
change CustomCommand variable to class member.
2013-12-26 21:19:12 +08:00
d32fbbbfca
change GroupCommand variable to class member.
2013-12-26 18:11:23 +08:00
f878864794
Specialize GroupCommand and CustomCommand, change generateCommand to new.
2013-12-26 15:41:47 +08:00
98d573f4cb
rename protected _beginWithClear to beginWithClear
2013-12-23 19:59:09 +08:00
a7a50dffcc
move begin(), end(),draw() to RenderTexture
2013-12-23 17:13:06 +08:00
fad585fbef
move rendering callback to RenderTexture
2013-12-23 15:59:47 +08:00
b7c0d7a9e8
1. remove redundant code in NewRenderTexture 2. rename protected beginWithClear to _beginWithClear
2013-12-23 14:59:44 +08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -08:00
d51ad36613
Merge branch 'develop' into develop_gridNode
...
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-19 17:20:22 +08:00
e07c4ffec1
Change NULL to nullptr, edit hungarian notation.
2013-12-18 17:47:20 +08:00
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -08:00
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
b726c6fd2c
issue #3025 : move VolatileTexture static function to VolatileTextureMgr
2013-11-08 16:47:33 +08:00
Martin Taylor