Commit Graph

854 Commits

Author SHA1 Message Date
boyu0 d161c6a576 issue #2771: Add PhysicsTest to TestCpp. Add initTest to TestScene, move Scene::init() from constructor to TestScene::initTest() 2013-09-10 17:41:06 +08:00
chengstory bdfde89ef8 Merge branch '#develop' into #4551
Conflicts:
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
2013-09-10 16:25:31 +08:00
minggo 31ce15ea46 Merge pull request #3571 from dabingnn/new_shader_test
issue #2782 shader test sprite
2013-09-09 22:55:53 -07:00
chengstory e04a47b807 1. update mkfile. 2013-09-10 13:08:05 +08:00
Huabing.Xu 8e35e7cc27 issue #2782: shadertestSprite change test case textures and add normal sprite for comparison 2013-09-10 11:45:38 +08:00
chengstory 669de88e73 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
Huabing.Xu 2912260b3a issue #2782: shadertestSprite linux and windows version 2013-09-10 11:00:57 +08:00
zhangcheng 98fce2fa84 1. update Samples on develop branch. 2013-09-10 09:53:15 +08:00
Huabing.Xu 5801e9118c issue #2782: remove a blank test case 2013-09-10 09:38:12 +08:00
Huabing.Xu f2fc710f86 issue #2782: shadertestSprite android make file 2013-09-10 09:32:03 +08:00
Nako Sung 31e3faaa4f Update AppDelegate.cpp 2013-09-09 22:38:37 +09:00
Huabing.Xu 8a86a883d0 issue #2782: update mac version, update test case title 2013-09-09 21:33:01 +08:00
zhangcheng 99f32077d2 1. upload SceneTest Resources. 2013-09-09 19:52:07 +08:00
Huabing.Xu d7d914feb1 Merge branch 'develop' into new_shader_test 2013-09-09 18:18:31 +08:00
Huabing.Xu d763de3d3c new shader test code 2013-09-09 17:49:13 +08:00
성낙호 bf4eaa7e7c merged 2013-09-09 18:20:16 +09:00
성낙호 3a4c9f9fb0 men leak fixed (life-cycle management was hand downed to scene-graph) 2013-09-09 17:07:32 +09:00
minggo c5b113c35e Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements
Fileutils perf improvements
2013-09-08 19:50:12 -07:00
boyu0 1d47737f45 issue #2771: add physics files and entries. 2013-09-09 10:29:02 +08:00
James Chen ba9fdc5774 Reverts samples/Cpp/HelloCpp/proj.win32/main.cpp 2013-09-08 11:30:50 +08:00
James Chen b8c82ae5a9 [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
Ricardo Quesada 8078a574c2 snapshopTextures are no longer supported
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-09-06 22:55:36 -07:00
Ricardo Quesada b2a81b5b86 Removes some Hungarion notation...
...and improves performance in FileUtils: String is not created
2013-09-06 18:46:33 -07:00
Ricardo Quesada b78382d5e5 Performance improvements in FileUtils / TextureCache
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
2013-09-06 15:33:28 -07:00
minggo 76a1b36191 Merge pull request #3546 from minggo/alloc_perf_test
Alloc perf test
2013-09-05 23:30:15 -07:00
minggo 8e0bce344c Merge branch 'alloc_perf_test' of https://github.com/minggo/cocos2d-x into alloc_perf_test 2013-09-06 13:45:59 +08:00
minggo d723c4ef3f Merge branch 'alloc_perf_test' of https://github.com/ricardoquesada/cocos2d-x into alloc_perf_test 2013-09-06 13:45:23 +08:00
minggo 1664d3503d add PerformanceAllocTest.cpp/h to vs project and fix some compiling errors 2013-09-06 12:51:37 +08:00
Ricardo Quesada 1071ab9d37 Adds a new test: sprite with image 2013-09-05 21:35:15 -07:00
minggo 0131ecf705 add PerformanceAllocTest.cpp/h to Android.mk and linux project setting 2013-09-06 11:44:10 +08:00
Ricardo Quesada 02500372ed Adds new perf test: alloc / dealloc 2013-09-05 20:02:04 -07:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
minggo 9dedb072e6 Merge pull request #3528 from natural-law/ForPlugin
Modify the method cocos_android_app_init()
2013-09-03 22:50:40 -07:00
Ricardo Quesada befcf722b6 compiles Linux / Windows 2013-09-03 10:17:25 -07:00
Ricardo Quesada 088a11ad0d Little performance improvements in SpriteBatchNode
_descendants: Array -> std::vector<Sprite*> since retain/release is no needed
Code is cleaner
Removes unused method (bug inherited from cocos2d-iphone)
Adds more doxygen strings
2013-09-02 16:44:25 -07:00
zhangbin b854c25103 Add parameter in method cocos_android_app_init() to initialize plugin. 2013-09-02 16:10:08 +08:00
Huabing.Xu bc5ae78423 issue #2460: change other sample projects to glfw version 2013-09-02 11:46:23 +08:00
Ricardo Quesada be0c8cb1e8 adds two more perf tests
Node::addChild and Node::removeChild
2013-08-31 17:08:51 -07:00
Ricardo Quesada 0d96a0ce40 resets random seed before each test 2013-08-31 15:49:25 -07:00
Ricardo Quesada a5e0febc3e Adds better names to test
And new values for get(),add(),remove(),sort(),reorder()
2013-08-31 07:27:56 -07:00
Ricardo Quesada 5abb57e5f2 AddChild test fix
`sortAllChildren` should not be part of the test.
It is tested separatedly on another test
2013-08-31 06:59:44 -07:00
Huabing.Xu 99f88df8d2 issue #2460: optimize EGLView interface 2013-08-29 11:36:16 +08:00
Ricardo Quesada c04409b6d5 More accurate test
Name is recalculated. No time is "wasted" in calculating it.

And `Visit` test uses `Node` objects instead of `Sprite`s. So `draw` is not taken into account, just the visit.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 18:32:45 -07:00
Ricardo Quesada 7fb56bd123 Adds "Visit Scene Graph" tests
A new tests to measure the performance of visit

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-28 12:39:57 -07:00
James Chen a8140dd31b Adding test for issue http://www.cocos2d-x.org/issues/2401 . 2013-08-28 15:12:41 +08:00
James Chen b235bf07b7 [Mac] Adding WebsocketTest and SocketIOTest. 2013-08-28 15:02:57 +08:00
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
2013-08-28 13:42:22 +08:00
Huabing.Xu 29746d513a issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
James Chen 08cd81ff43 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated
Conflicts:
	scripting/auto-generated
2013-08-27 16:59:59 +08:00
James Chen a7f4e82799 issue #2732: Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files. 2013-08-27 16:46:31 +08:00
James Chen 7552a72577 issue #2732: [iOS] Updating the reference of auto-generated binding glue codes. 2013-08-27 16:05:48 +08:00
minggo faa94fd074 Merge pull request #3482 from minggo/release_unneeded_codes
Remove unneeded codes
2013-08-26 23:23:41 -07:00
Ricardo Quesada 0093263c18 Little performance improvements
Uses `AffineTransform::IDENTITY`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-26 18:08:21 -07:00
James Chen 6501c9bffd Merge pull request #3479 from pyrasis/tizen_2.2
[Tizen] Update project files
2013-08-26 03:23:14 -07:00
minggo e567b6c54b fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
James Chen c9ffc44bc4 [Android] Removing x86 from APP_ABI. Otherwise the time of compiling will be very long. 2013-08-26 16:52:20 +08:00
Ricardo Quesada ea8eb601af Uses std::sort()
Uses std::sort() for inserting the nodes.

This code is not final, but preliminary results show that std::sort() is 60% faster

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-24 10:56:07 -07:00
Lee, Jae-Hong bbf9053788 [Tizen] Update project files.
- Update file list.
- change order of link files.
2013-08-25 02:22:50 +09:00
Ricardo Quesada 364288cf66 Adds "Sort all Children" perf test
Adds a new perf tests: "sortAllChildren"

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-23 13:14:57 -07:00
James Chen 7882ea7fbc Merge pull request #3465 from dumganhar/develop
issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib).
2013-08-22 20:28:57 -07:00
James Chen 6ed43811fe issue #2483: Updating VS projects to use the correct library (mozjs-23.0.lib). 2013-08-23 11:26:16 +08:00
Ricardo Quesada 055c566bc9 Adds missing #include 2013-08-22 19:30:20 -07:00
Ricardo Quesada 38bfadf7f3 Adds 2 new performance tests
Invocation with `for_each()` and using `arrayMakeObjectsPerformSelector`

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-22 18:21:52 -07:00
minggo ddb4219d24 Merge pull request #3457 from boyu0/iss2434_gen_android_mk
closed #2434: Add android_mk_generator.py to generate Android.mk
2013-08-22 03:05:11 -07:00
boyu0 9e34aae075 closed #2434: Use the origin android.mk files instead use templates 2013-08-22 16:45:40 +08:00
boyu0 83f7835708 issue #2434: Delete unused method dirs and find_files in Android.mk template 2013-08-22 14:03:25 +08:00
boyu0 ad23ec4a0f #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
Ricardo Quesada d7590affda Merge branch 'develop' into dictionary_array_fixes
Conflicts:
	cocos2dx/cocoa/CCArray.cpp
	cocos2dx/cocoa/CCArray.h
	cocos2dx/label_nodes/CCLabel.cpp
	extensions/CCArmature/datas/CCDatas.cpp
	extensions/CCArmature/display/CCDisplayManager.cpp
2013-08-21 21:27:44 -07:00
boyu0 da566a3c16 issue #2434: add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files
add PathUtils.py for python library.
2013-08-22 11:49:34 +08:00
Ricardo Quesada 2e221ee6cc Array & Dictionary fixes
In many places `Dictionary` and `Array` are not being initialized. In fact `Dictionary` doesn't  have the `init()` method creating potential leaks.
Also in objects like `Armature` and the new `LabelTTF`, the `Array` object is not being used a pointer. So it doesn't use the 2 phase initialization, creating potential leaks.

This patch fixes all those issues.

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:12:09 -07:00
Ricardo Quesada f0a2f6cbf8 purge profiler data one + or - is pressed
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-21 20:02:50 -07:00
minggo 2de8963a0a fix warnings caused by deprecating some functions of Array 2013-08-22 10:45:47 +08:00
Huabing.Xu 3bc5f1ed8a issue #2460: glfw win32 project file 2013-08-21 12:02:21 +08:00
Huabing.Xu b2e167c6ea issue #2460: glfw mac version 2013-08-21 12:01:56 +08:00
Ricardo Quesada cf02cb4581 Fixes names in Performance Node tests
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 18:05:35 -07:00
Ricardo Quesada e5551b2872 Compiles both with std::vector and ccCArray
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 16:06:51 -07:00
Ricardo Quesada 20167e2a12 removes unneeded spaces
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:45 -07:00
Ricardo Quesada c9b250d4a4 Adds new tests to tests
and enables profiling

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-08-20 14:18:32 -07:00
Huabing.Xu 2e21e18b70 issue #2460: rename EGLView::Create to EGLView->create 2013-08-20 16:23:46 +08:00
Huabing.Xu dd538a28a7 issue #2460: glfw window version 2013-08-20 13:57:15 +08:00
Ricardo Quesada 511ec1cc5d Compiles with improved CCArray
Compiles both with std::vector or ccCArray
2013-08-19 17:09:28 -07:00
minggo 3ca26e1aa6 Merge pull request #3430 from boyu0/iss2517_update_local_var_to_auto
closed #2517: Update all test cases use auto for local variables
2013-08-17 01:12:48 -07:00
minggo c7f313419e Merge pull request #3431 from minggo/iss2525-add_iterator_for_array
add iterator for Array and make Array can be used in range-based loop
2013-08-17 00:42:42 -07:00
folecr aff86b1b52 Keep TravisCI happy : build Android TestCpp for ARM architecture only. 2013-08-16 16:19:34 -07:00
minggo baa9e0a1e4 issue #2525:add iterator for Array and make Array can be used in range-based loop 2013-08-16 18:23:41 +08:00
성낙호 200a1ec831 style edited 2013-08-16 19:03:27 +09:00
boyu0 6779f494f3 issue #2517: Restore TestCpp proj.android that edited by mistake. 2013-08-16 16:09:46 +08:00
boyu0 70df1a6061 closed #2517: Use LocalVarToAuto.py to change Samples src file 2013-08-16 16:05:27 +08:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
2013-08-16 11:02:44 +08:00
James Chen 4b0d0225b7 issue #2488: Updating makefile for linux and emscripten. 2013-08-15 21:44:51 +08:00
James Chen 409e345522 issue #2488: Updating VS project configuration. 2013-08-15 21:40:11 +08:00
James Chen 56cd039b32 issue #2488: Adding "啊" letter at the end of string to make VS2012 happy, otherwise VS will generate errors like "Error 3 error C2146: syntax error : missing ')' before identifier 'label'"; 2013-08-15 21:39:47 +08:00
James Chen 21134cc48f Merge branch 'new_develop_merge_clean' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge_clean 2013-08-15 17:02:51 +08:00
folecr b4edb14d33 Use ndk-gdb-py and name the explicit launch activity to be able to use gdb's Text User Interface when debugging. 2013-08-13 15:50:58 -07:00
folecr 4d34cfc28f Add --nowait option (Android has broken something again in NDK/SDK/emulator/etc.) and the debugger will not work correctly anymore 2013-08-13 11:29:53 -07:00
folecr 84054a237c Android platform version used matches all other sample projects 2013-08-13 11:28:56 -07:00
carlo morgantini 47be4ff58a Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
Conflicts:
	cocos2dx/label_nodes/CCFontAtlas.cpp
	cocos2dx/label_nodes/CCFontAtlas.h
	cocos2dx/label_nodes/CCFontAtlasCache.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	cocos2dx/label_nodes/CCFontAtlasFactory.h
	cocos2dx/label_nodes/CCFontDefinition.cpp
	cocos2dx/label_nodes/CCFontFreeType.cpp
	cocos2dx/label_nodes/CCLabel.cpp
	cocos2dx/label_nodes/CCLabel.h
	cocos2dx/label_nodes/CCStringBMFont.h
	cocos2dx/label_nodes/CCStringTTF.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-08-13 11:28:54 -07:00
carlo morgantini 15ec303278 more clean ups on tests for label 2013-08-13 10:12:02 -07:00
folecr b61ce3c79d ndkgdb.sh for TestCpp 2013-08-13 08:47:48 -07:00