Commit Graph

174 Commits

Author SHA1 Message Date
James Chen d94a0cf4c7 issue : fixed a warning in unzip.cpp. 2012-12-20 18:39:29 +08:00
James Chen bb6df91749 issue : Exported CCUserDefault to js. 2012-11-16 15:58:18 +08:00
minggo 605771697a Merge pull request from mingulov/unzip_crc
Zip support: broken CRC check / unzCloseCurrentFile
2012-11-15 23:31:14 -08:00
Denis Mingulov 869168a884 ZipFile - speedup initialization for zip archive by 30-50%
unzip.h/.cpp - unzGoToFirstFile/unzGoToNextFile retrieves information
about the current file, so it is possible to remove redundant calls
to unzGetCurrentFileInfo and speed up general execution.

unzip.h/.cpp are modified accordingly by creation unzGoToFirstFile64
and unzGoToNextFile64 with file info (unz_file_info64) and name as
possible output parameters.

ZipFile::setFilter (it is used to create a file list at ZipFile
constructor) - redundant calls to unzGetCurrentFileInfo64 are removed,
so briefly the time required to generate a zip file list is something
like 1 average old unzLocateFile call.
2012-11-11 15:04:41 +02:00
Denis Mingulov eaed42c8bd Zip support: broken CRC check / unzCloseCurrentFile
A fix for changes at 75ae8d2201
- unzOpenCurrentFile3 has set pfile_in_zip_read_info->crc32_wait
just in case if Zip file has unknown structure / might not be
unpacked, so almost any unpacked file was considered as having
UNZ_CRCERROR.
2012-11-11 10:22:48 +02:00
Denis Mingulov 83cf8aaf29 Android: Access to files from APK is boosted - 1st review update 2012-11-09 09:53:40 +02:00
Denis Mingulov 071d264cc5 Android: Access to files from APK is boosted
Open APK file just once and cache a file list information (name and
position inside archive). Also a general ZipFile helper class is
created to read multiple files from Zip archives - might be used
for another platforms if needed.

Previously it was so for each separate file access operation:
- Open zip archive, initially parse its structure (unzOpen)
- Locate the particular file there by a linear search through
  full archive (unzLocateFile).
  So if file does not exist - still an archive has to be handled
  fully, even slower than a file exists.
- Read file.
- Close zip archive

After this commit:
- Once - open zip/apk file and collect file list information
  (average consumed time - the same like a search for 2 different
  files by unzLocateFile)
- When needed - directly retrieve file position inside the archive,
  setting it up to the zip reader and reading file

ZipFile class is located in support/zip_support/ZipUtils.h and .cpp
to prevent creation of a new files and adding them to multiple
project files.
2012-11-08 13:46:53 +02:00
James Chen 56cdb76867 fixed : Updated one comment. 2012-10-22 15:52:11 +08:00
James Chen 7af2f7c5ce fixed : Updated one comment. 2012-10-22 15:51:06 +08:00
James Chen 6f4e56cd92 fixed : Corrected some comments for CCNotificationCenter. 2012-10-22 15:49:33 +08:00
James Chen 1c0240b5de fixed : Added doxygen comments in CCNotificationCenter.h 2012-10-22 13:48:11 +08:00
micahli c69a11296e fix the potential Container iterator bug with CCNotification
revert last fix which may contain other bugs
2012-10-15 09:55:37 +08:00
micahli 7d1d46ee3f fix a bug with CCNotificationCenter that observer->performSelector(observer) may call CCNotificationCenter::removeObserver and cause CCARRAY_FOREACH(m_observers, obj) access invalid address 2012-10-13 16:44:46 +08:00
James Chen 0d8e7deb10 Reverted CCNotificationCenter.cpp. 'object' and 'target' should not be retained. We must use weak reference, otherwise the life-cycle of target object will be delayed until the destruction of CCNotificationCenter. 2012-09-26 16:25:13 +08:00
James Chen a4e04d70c9 A memory leak fix in CCNotificationCenter. 2012-09-26 15:51:14 +08:00
jzgenius 0517372557 add CC_SAFE_RETAIN into constructor of CCNotificationObserver. 2012-09-26 14:10:52 +08:00
jzgenius e24ad0380b [fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target. 2012-09-25 14:54:13 +08:00
walzer 06f639edab update copyright to 2012, update cocos2d version to 2.0.3
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
nichos1983 16d3466f39 fix bug of not checking object before post notification 2012-09-19 15:28:36 +08:00
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
James Chen 7d8b261ced fixed : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
YuLei da79992275 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-09-02 00:38:57 +08:00
YuLei 2c518e43b2 [Lua] fix CCLayer:registerScriptTouchHandler()
[Lua] make CCNotificationCenter script support
2012-08-28 12:08:15 +08:00
Rolando Abarca e757d55a29 updates cocos2d-x API to support getObjectType() 2012-08-27 05:45:11 -07:00
Donald Alan Morrison 75ae8d2201 Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.) 2012-08-20 14:54:12 -07:00
Dale Ducharme 4004a8ac61 Cocos2dx for gles2. 2012-08-17 17:45:21 -04:00
Walzer cc3d850892 fixed , add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
Walzer 685b70e6fb fixed , résolve conflicting "create" functions
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
minggo f9c40f7372 issue : work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen b818c0afa6 fixed : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
James Chen 07b9db8e91 Merge branch 'gles20' into gles20-ccbi 2012-06-19 17:28:31 +08:00
James Chen c4056b1bb0 fixed : Updated include search paths for win32 and android. 2012-06-19 17:22:55 +08:00
James Chen 591566b43a fixed : Memory leaks in cocos2dx and CCBReader. 2012-06-19 16:31:26 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 23574172ff issue : Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 9ff7dcd96d issue : Removed some functions. 2012-06-08 17:15:00 +08:00
James Chen 76a560a474 issue : Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen 6cf608effd issue : deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h. 2012-06-08 15:17:15 +08:00
James Chen c5cf23c859 issue : First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
Nat Weiss 472c98b652 Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful. 2012-05-31 23:20:56 -07:00
James Chen 1b7cc47a34 issue : Removed unused files. Fixed an issue in uthash.h. 2012-05-28 13:59:18 +08:00
James Chen 330b019361 Added jstest project for vs2008. 2012-05-27 22:53:48 +08:00
James Chen 0f36a89c7e issue : Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
minggo 160c94dd46 fixed : popup message box when invoking CCAssert on Android 2012-04-20 15:12:20 +08:00
minggo f3d97bd9b6 fixed : synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
James Chen 230b8a386b issue : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen 4068be84e9 Refactored project folders. 2012-04-19 11:46:08 +08:00