Skip to content

Fixed #2445 refactor code for rendering classes to optimize performance #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 2, 2013
Merged

Fixed #2445 refactor code for rendering classes to optimize performance #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfbbdd7
Issue #2445 refactor code for rendering classes
dingpinglv Jul 31, 2013
5984f44
fixed #2445 refactor code for Performance
dingpinglv Aug 1, 2013
15cc204
Merge branch 'develop' of Cocos2d-html5 into Iss2445_RewriteCtor
dingpinglv Aug 1, 2013
24d41a4
fixed #2445 refactor code for rendering classes to optimize performance
dingpinglv Aug 1, 2013
e16afc6
Fixed #2445 correct a mistake in CCScheduler.js when refactoring code…
dingpinglv Aug 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions cocos2d/CCScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ cc.ArrayContainsObject = function (arr, findObj) {
/**
* find object from array by target
* @param {Array} arr source array
* @param {cc.ListEntry|cc.HashUpdateEntry|cc.HashSelectorEntry} findInt find target
* @return {cc.ListEntry|cc.HashUpdateEntry|cc.HashSelectorEntry}
* @param {cc.ListEntry|cc.HashUpdateEntry} findInt find target
* @return {cc.ListEntry|cc.HashUpdateEntry}
*/
cc.HASH_FIND_INT = function (arr, findInt) {
if (arr == null) {
Expand Down Expand Up @@ -331,12 +331,13 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
this._elapsed = 0;
this._timesExecuted = 0;
} else {
var locTarget = this._target, locSelector = this._selector;
if (this._runForever && !this._useDelay) {
//standard timer usage
this._elapsed += dt;

if (this._elapsed >= this._interval) {
if (this._target && this._selector)
if (locTarget && locSelector)
this._callSelector();
this._elapsed = 0;
}
Expand All @@ -345,7 +346,7 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
this._elapsed += dt;
if (this._useDelay) {
if (this._elapsed >= this._delay) {
if (this._target && this._selector)
if (locTarget && locSelector)
this._callSelector();

this._elapsed = this._elapsed - this._delay;
Expand All @@ -354,7 +355,7 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
}
} else {
if (this._elapsed >= this._interval) {
if (this._target && this._selector)
if (locTarget && locSelector)
this._callSelector();

this._elapsed = 0;
Expand All @@ -363,7 +364,7 @@ cc.Timer = cc.Class.extend(/** @lends cc.Timer# */{
}

if (this._timesExecuted > this._repeat)
cc.Director.getInstance().getScheduler().unscheduleCallbackForTarget(this._target, this._selector);
cc.Director.getInstance().getScheduler().unscheduleCallbackForTarget(locTarget, locSelector);
}
}
}
Expand Down Expand Up @@ -999,4 +1000,3 @@ cc.Scheduler = cc.Class.extend(/** @lends cc.Scheduler# */{
}
});


Loading