folecr
af1e450fe6
Remove spurious LOGI (use appropriate LOG_RENDER_DEBUG in its place.)
2013-08-05 02:05:42 -07:00
folecr
c1e88b79ba
Initialize JniHelper with the Acitivity. Load the native library that is specified in the Activity's meta-data.
2013-08-05 02:05:42 -07:00
folecr
76a684c556
Initialize Cocos2dxHelper from JNI. Call System.loadLibrary() in Java so functions implemented in native code are available from Java.
2013-08-05 02:05:42 -07:00
folecr
2951504b46
Actually obtain a reference to the Java class
2013-08-05 02:05:41 -07:00
folecr
dd79d9bbc2
Use default class loader to obtain the ClassLoader for this NativeActivity
2013-08-05 02:05:41 -07:00
folecr
e67698116c
Cache JNIEnv
2013-08-05 02:05:41 -07:00
folecr
d96f54d4e0
Separate calls to setvm reference and to set classloader
2013-08-05 02:05:41 -07:00
folecr
53b1a92773
Use an obtained class loader instead of the default
2013-08-05 02:05:41 -07:00
folecr
669427363f
Clean up JNIHelper
2013-08-05 02:05:41 -07:00
folecr
dc6b6ecc69
Remove unused Java files for Activity and GLSurfaceView (now in C code.)
2013-08-05 02:05:40 -07:00
folecr
921ed14a87
Use OpenGLES 2.0
2013-08-05 02:05:40 -07:00
folecr
a2a999d505
JNI, Set JavaVM
2013-08-05 02:05:40 -07:00
folecr
4539600ac2
initialize cocos with asset manager interface. separate out cocos init from android view init.
2013-08-05 02:05:40 -07:00
folecr
1fb4387d0a
AssetManager is a private member of FileUtilsAndroid. setter method. Remove old Java/JNI setter.
2013-08-05 02:05:40 -07:00
folecr
68b9e5d608
Move nativeactivity.cpp
2013-08-05 02:05:40 -07:00
folecr
0a9e9571cc
Remove unused declaration
2013-08-05 02:05:40 -07:00
folecr
e1bcbc7859
Remove references to the Java renderer
2013-08-05 02:05:39 -07:00
folecr
f7d5eb198e
ccx : setAnimationInterval() not implemented.
2013-08-05 02:05:39 -07:00
folecr
05daebf65e
ccx : Initialize cocos. Calls cocos_android_app_init() to initialize the Cocos app.
2013-08-05 02:05:39 -07:00
folecr
7add86c751
ccx : Trace accelerometer only when tracing rendering
2013-08-05 02:05:38 -07:00
folecr
58c4037de8
ccx : Trace rendering
2013-08-05 02:05:38 -07:00
folecr
3cc62f9fa8
ccx : remove/comment filesystem access methods from Java
2013-08-05 02:05:38 -07:00
folecr
d9c3089f35
ccx : Cocos2dxActivity extends NativeActivity
2013-08-05 02:05:38 -07:00
folecr
3af519a61a
ccx : Remove Cocos2dxRenderer
2013-08-05 02:05:37 -07:00
folecr
6d990d0570
ccx : Call cocos rendering methods.
...
* switch to .cpp for nativeactivity.
* ccx : update log tags to say .ccp instead of .c
2013-08-05 02:05:37 -07:00
folecr
57cd5eedef
ccx : Change minimum config to RGB565. Add depth buffer and stencil buffer requirements to EGL config.
2013-08-05 02:05:37 -07:00
folecr
f4d21528d5
ccx : Link libraries used by nativeactivity.c
2013-08-05 02:05:36 -07:00
folecr
6ac71f16c1
ccx : add nativeactivity
2013-08-05 02:05:36 -07:00
folecr
588ca7e57b
Android port is a static library
2013-08-05 02:04:25 -07:00
James Chen
ea10032b24
issue #2170 : Adding missing libs for Android.
2013-08-05 11:43:43 +08:00
James Chen
9a9ffaeb4d
issue #2170 : A typo fix.
2013-08-05 11:33:59 +08:00
James Chen
b8a7a4291f
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
2013-08-05 11:26:34 +08:00
James Chen
eaabd93051
issue #2170 : Fixing compilaction errors on Emscripten.
2013-08-05 11:10:12 +08:00
James Chen
5ee6e7d79a
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
...
Conflicts:
cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
James Chen
0db8b2bbf3
closed #2469:LabelTest and TileMapTest crash on windows.
2013-08-02 17:31:19 +08:00
boyu0
1a878cf795
issue #2345 : Merge branch '2345' into iss2345_refactor_ccimage
2013-08-02 16:19:50 +08:00
boyu0
6afa77ddc3
issue #2345 : update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined.
2013-08-02 16:02:40 +08:00
James Chen
c1d715b778
Adding windows support for New Label.
2013-08-02 15:01:27 +08:00
boyu0
89dd5a19ad
issue #2345 : move g_texturePixelFormatInfoTables into Texture2D
2013-08-02 14:10:23 +08:00
James Chen
67d710a41c
Adding Android support for new label.
2013-08-02 13:46:26 +08:00
minggo
5e03b9b29d
Merge pull request #3347 from timothyqiu/docfix
...
More documentation fixes
2013-08-01 18:22:43 -07:00
Timothy Qiu
5ad5cfed7a
Yet another documentation fix.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Removed Hungarian notation from parts of the code.
2013-08-01 21:40:13 +08:00
Timothy Qiu
5ed8deb9a6
Fixed more documentation errors.
...
Modified mismatching parameters doc caused by refactoring.
Added the missing doc of some parameters.
Fixed incorrect use of doxygen tags.
Removed Hungarian notation from parts of the code.
Replaced 1 tab character with 4 spaces.
2013-08-01 20:55:43 +08:00
boyu0
93aa3c7ada
issue #2345 : refract CCImage and CCTexture2D.
2013-08-01 15:53:52 +08:00
Thomas Perl
6f967fc107
Qt 5: Build fixes for Qt 5 platform
...
Recent changes to the develop branch broke Qt 5 support.
2013-08-01 09:20:17 +02:00
carlo morgantini
b2579987e5
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
2013-07-31 13:58:25 -07:00
James Chen
f61f4e58fd
Merge pull request #3094 from sergey-shambir/linux_sdl
...
closed 2458: Linux: added SDL backend as alternative to GLFW.
2013-07-31 01:55:37 -07:00
minggo
0530109a9f
Merge pull request #3178 from boyu0/2345
...
Refactor CCImage and CCTexture2D
2013-07-31 01:21:18 -07:00
Sergey Shambir
d23d486720
Linux: added SDL2 backend as replacement for GLFW.
...
Initially planned as alternative, made replacement after discussion with
minggo.
Summary:
GLFW v.3 released in June. New version breaks API without real need:
http://cocos2d-x.org/boards/6/topics/31277
Meanwhile SDL2 is very stable. SDL2 used in Steam Runtime and will be
part of Ubuntu SDK, it's supported by other distributions.
Completed:
- OpenGL initialization and window handling with SDL
- Keyboard, IME emulation, mouse and touches support with SDL
- Window title now contains app name on Linux
- Backspace correctly handled with new backend
Note:
- SDL on X11 have no proper multitouch, but backend handles multitouch
events to support future Linux graphics.
2013-07-30 23:08:26 +04:00
minggo
ba4e0d8d39
closed #2438:re-add libwebp.a
2013-07-30 18:06:01 +08:00
minggo
1d2b1c79c2
closed #2438:remove mac 32-bit support
2013-07-30 18:02:35 +08:00
boyu0
5225bb2f7f
fix the travis ci compile error
2013-07-30 14:16:23 +08:00
boyu0
c4a1bf8986
fix the travis ci compile error
2013-07-30 14:07:31 +08:00
boyu0
31da5ebeb7
fix some compile error and pass the linux compile
2013-07-30 13:45:50 +08:00
boyu0
afde1e57b2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 and fix the per premultipied tag
2013-07-30 11:10:05 +08:00
Timothy Qiu
b3da051807
Remove colon after @param @warning @deprecated
...
Added a missing @param.
2013-07-30 10:56:14 +08:00
James Chen
2566f74cd7
closed #2440 : Files with Non-ascii path can't be found on Windows.
2013-07-29 18:27:26 +08:00
boyu0
4348e87e31
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
2013-07-29 17:56:36 +08:00
James Chen
a76f556fb2
[emscripten] Fixing compilation errors.
2013-07-29 16:33:34 +08:00
James Chen
4c32303b2e
Merge pull request #3317 from dumganhar/member-var-init
...
Fixing warnings of the order of member variables and fixing errors for tizen projects. Updating JS-test.
2013-07-29 00:29:08 -07:00
James Chen
5aab0cab7b
[Android] Fixing build errors for ndk-r9.
2013-07-29 14:54:00 +08:00
James Chen
343c98af13
Fixing warnings of the order of member variables and fixing errors for tizen projects.
2013-07-29 14:07:57 +08:00
boyu0
41cac18ae2
edit for lua
2013-07-29 14:04:51 +08:00
boyu0
304d636deb
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-29 11:40:18 +08:00
minggo
9780b75da8
Merge pull request #3273 from thp/develop-qt5
...
Port Cocos2D-X to Qt 5 (develop branch)
2013-07-28 16:51:55 -07:00
James Chen
b7afc9db43
issue #2430 : [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE.
2013-07-27 23:20:00 +08:00
boyu0
cecfc13bc4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
2013-07-27 22:06:30 +08:00
minggo
295a23e535
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 07:57:28 +08:00
carlo morgantini
8416e7cf6d
Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
scripting/javascript/bindings/generated
tools/bindings-generator
2013-07-26 15:54:50 -07:00
Sergii Rudchenko
3ea77ec933
Fix build with -Werror=format-security (default in Android NDK r9)
2013-07-27 01:17:13 +03:00
James Chen
825dd5927f
issue #2430 : Fixing conflicts.
2013-07-27 01:11:21 +08:00
James Chen
dc7fcce0fe
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum
...
Conflicts:
scripting/javascript/bindings/generated
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-07-26 21:22:16 +08:00
James Chen
a73a4b9837
Merge pull request #3276 from dumganhar/constants-refactor
...
Enumeration refactoring
2013-07-26 05:36:16 -07:00
James Chen
c9def73930
Application::Platform::OS_MACOS --> Application::Platform::OS_MAC.
2013-07-26 20:24:33 +08:00
Éloi Rivard
95b826d82a
Fixed a bug in emscripten file utils.
2013-07-26 14:19:47 +02:00
Éloi Rivard
3ffc026c6c
Added some guards in file utils.
2013-07-26 14:19:20 +02:00
James Chen
9b6d3e6090
ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT
2013-07-26 20:07:41 +08:00
James Chen
7d9d799194
issue #2430 : Fixing a typo.
2013-07-26 19:54:44 +08:00
James Chen
e16a5f469b
issue #2430 : Refactoring enum 'ResolutionPolicy'.
2013-07-26 18:18:58 +08:00
James Chen
2f8d3587bd
Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.
2013-07-26 18:17:30 +08:00
minggo
3cb40b36e4
issue #2430:fix some errors
2013-07-26 18:07:40 +08:00
boyu0
02bdfbf169
Combine CCTextureETC to CCImage and CCTexture2D.
2013-07-26 17:34:44 +08:00
James Chen
ad1d8b667d
enum class for LanguageType, Application::Platform
2013-07-26 17:29:06 +08:00
Thomas Perl
2f35353020
Qt 5 port: Fixes to build against "develop" branch
...
The Qt 5 port was based on the "master" branch. This patch
updates all Qt 5 changes to build correctly with the "develop"
branch. Tested with GCC 4.6 and Qt 5.1.0 on Linux.
2013-07-26 08:55:46 +00:00
minggo
bafc01c2aa
issue 2430:fix a compiling error and add missing cpp
2013-07-26 15:55:12 +08:00
metalbass
5183803784
Removed delete from CC_SAFE_DELETE and changed 0 to nullptr on all CC_SAFE macros
...
This implements this issue: https://github.com/cocos2d/cocos2d-x/issues/3099
I've also change all pointer assignments to 0 to assignments to nullptr on the CC_SAFE macros.
Also aligned them for better readability :)
2013-07-26 09:33:40 +02:00
minggo
0870581623
fix warnings
2013-07-26 15:22:45 +08:00
James Chen
6c00a51517
RELATIVE was defined on windows, un-define it.
2013-07-26 14:16:12 +08:00
James Chen
5dca03c061
Fixing compilation errors in CCImageCommon_cpp.h.
2013-07-26 13:59:27 +08:00
Ricardo Quesada
058935aa8d
Removes Hungarian notation
...
Removes Hungarian notation from the code.
2013-07-25 15:53:24 -07:00
Ricardo Quesada
d683e10808
More constant fixes
...
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()
And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
2013-07-25 14:49:43 -07:00
Ricardo Quesada
16d0b43181
Constant fixes
...
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE
Also adds more constant for BlendFunc
2013-07-25 13:36:19 -07:00
minggo
4caea01021
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
2013-07-25 23:09:56 +08:00
minggo
b36a4f1df0
issue #2430:use upper letters for enum item in Image
2013-07-25 23:09:18 +08:00
minggo
323af3c889
issue #2430:use upper letters for enum item in AssetsManager and WebSocket
2013-07-25 22:29:12 +08:00
minggo
4ef197b579
Merge pull request #13 from dumganhar/iss2430-modify_enum
...
issue #2430 : Fixing compilation errors for Mac and JSB projects.
2013-07-25 07:02:57 -07:00
James Chen
3f36e8300e
issue #2430 : Fixing compilation errors for Mac and JSB projects.
2013-07-25 21:59:47 +08:00
minggo
17946c084a
issue #2430:fix android compiling error
2013-07-25 21:59:37 +08:00
boyu0
a2b611d8c3
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
2013-07-25 21:35:00 +08:00
minggo
2bb577be8b
issue #2430:change Image enum item to upper letter
2013-07-25 20:29:53 +08:00