diff --git a/extensions/GUI/CCControlExtension/CCControl.cpp b/extensions/GUI/CCControlExtension/CCControl.cpp index 417627191d..66f81aa9b7 100644 --- a/extensions/GUI/CCControlExtension/CCControl.cpp +++ b/extensions/GUI/CCControlExtension/CCControl.cpp @@ -107,7 +107,7 @@ void Control::sendActionsForControlEvents(EventType controlEvents) // For each control events for (int i = 0; i < kControlEventTotalNumber; i++) { - // If the given controlEvents bitmask contains the curent event + // If the given controlEvents bitmask contains the current event if (((int)controlEvents & (1 << i))) { // Call invocations @@ -135,7 +135,7 @@ void Control::addTargetWithActionForControlEvents(Ref* target, Handler action, E // For each control events for (int i = 0; i < kControlEventTotalNumber; i++) { - // If the given controlEvents bitmask contains the curent event + // If the given controlEvents bitmask contains the current event if (((int)controlEvents & (1 << i))) { this->addTargetWithActionForControlEvent(target, action, (EventType)(1<removeTargetWithActionForControlEvent(target, action, (EventType)(1 << i)); diff --git a/extensions/GUI/CCControlExtension/CCControl.h b/extensions/GUI/CCControlExtension/CCControl.h index e4842d047a..7c25caec6b 100644 --- a/extensions/GUI/CCControlExtension/CCControl.h +++ b/extensions/GUI/CCControlExtension/CCControl.h @@ -84,7 +84,7 @@ public: /** The possible state for a control. */ enum class State { - NORMAL = 1 << 0, // The normal, or default state of a control¡ªthat is, enabled but neither selected nor highlighted. + NORMAL = 1 << 0, // The normal, or default state of a control that is, enabled but neither selected nor highlighted. HIGH_LIGHTED = 1 << 1, // Highlighted state of a control. A control enters this state when a touch down, drag inside or drag enter is performed. You can retrieve and set this value through the highlighted property. DISABLED = 1 << 2, // Disabled state of a control. This state indicates that the control is currently disabled. You can retrieve and set this value through the enabled property. SELECTED = 1 << 3 // Selected state of a control. This state indicates that the control is currently selected. You can retrieve and set this value through the selected property. @@ -122,7 +122,7 @@ public: /** * Adds a target and action for a particular event (or events) to an internal * dispatch table. - * The action message may optionnaly include the sender and the event as + * The action message may optionally include the sender and the event as * parameters, in that order. * When you call this method, target is not retained. * @@ -138,7 +138,7 @@ public: * Removes a target and action for a particular event (or events) from an * internal dispatch table. * - * @param target The target object—that is, the object to which the action + * @param target The target object that is, the object to which the action * message is sent. Pass nil to remove all targets paired with action and the * specified control events. * @param action A selector identifying an action message. Pass NULL to remove @@ -149,7 +149,7 @@ public: virtual void removeTargetWithActionForControlEvents(Ref* target, Handler action, EventType controlEvents); /** - * Returns a point corresponding to the touh location converted into the + * Returns a point corresponding to the touch location converted into the * control space coordinates. * @param touch A Touch object that represents a touch. */ @@ -190,7 +190,7 @@ CC_CONSTRUCTOR_ACCESS: protected: /** * Returns an Invocation object able to construct messages using a given - * target-action pair. (The invocation may optionnaly include the sender and + * target-action pair. (The invocation may optionally include the sender and * the event as parameters, in that order) * * @param target The target object. @@ -217,11 +217,11 @@ protected: /** * Adds a target and action for a particular event to an internal dispatch * table. - * The action message may optionnaly include the sender and the event as + * The action message may optionally include the sender and the event as * parameters, in that order. * When you call this method, target is not retained. * - * @param target The target object¡ªthat is, the object to which the action + * @param target The target object that is, the object to which the action * message is sent. It cannot be nil. The target is not retained. * @param action A selector identifying an action message. It cannot be NULL. * @param controlEvent A control event for which the action message is sent. @@ -233,7 +233,7 @@ protected: * Removes a target and action for a particular event from an internal dispatch * table. * - * @param target The target object¡ªthat is, the object to which the action + * @param target The target object that is, the object to which the action * message is sent. Pass nil to remove all targets paired with action and the * specified control events. * @param action A selector identifying an action message. Pass NULL to remove diff --git a/extensions/GUI/CCControlExtension/CCControlButton.h b/extensions/GUI/CCControlExtension/CCControlButton.h index 302b8c8ec9..4c7dc27511 100644 --- a/extensions/GUI/CCControlExtension/CCControlButton.h +++ b/extensions/GUI/CCControlExtension/CCControlButton.h @@ -134,7 +134,7 @@ public: virtual float getTitleTTFSizeForState(State state); /** - * Sets the font of the label, changes the label to a BMFont if neccessary. + * Sets the font of the label, changes the label to a BMFont if necessary. * @param fntFile The name of the font to change to * @param state The state that uses the specified fntFile. The values are described * in "CCControlState". diff --git a/extensions/GUI/CCControlExtension/CCControlHuePicker.h b/extensions/GUI/CCControlExtension/CCControlHuePicker.h index bca41ba1c6..b2bb21dbd9 100644 --- a/extensions/GUI/CCControlExtension/CCControlHuePicker.h +++ b/extensions/GUI/CCControlExtension/CCControlHuePicker.h @@ -71,7 +71,7 @@ protected: void updateSliderPosition(Vec2 location); bool checkSliderPosition(Vec2 location); - //maunally put in the setters + //manually put in the setters CC_SYNTHESIZE_READONLY(float, _hue, Hue); virtual void setHue(float val); CC_SYNTHESIZE_READONLY(float, _huePercentage, HuePercentage); diff --git a/extensions/GUI/CCControlExtension/CCControlSlider.h b/extensions/GUI/CCControlExtension/CCControlSlider.h index e2196c6b8f..fec34ca07c 100644 --- a/extensions/GUI/CCControlExtension/CCControlSlider.h +++ b/extensions/GUI/CCControlExtension/CCControlSlider.h @@ -129,7 +129,7 @@ protected: /** Returns the value for the given location. */ float valueForLocation(Vec2 location); - //maunally put in the setters + //manually put in the setters /** Contains the receiver's current value. */ CC_SYNTHESIZE_READONLY(float, _value, Value); diff --git a/extensions/GUI/CCScrollView/CCScrollView.h b/extensions/GUI/CCScrollView/CCScrollView.h index f621169493..47dc14b235 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.h +++ b/extensions/GUI/CCScrollView/CCScrollView.h @@ -323,7 +323,7 @@ protected: */ Node* _container; /** - * Determiens whether user touch is moved after begin phase. + * Determines whether user touch is moved after begin phase. */ bool _touchMoved; /** diff --git a/extensions/Particle3D/PU/CCPUAffector.h b/extensions/Particle3D/PU/CCPUAffector.h index 87d9bf3f1d..e1c564fd90 100644 --- a/extensions/Particle3D/PU/CCPUAffector.h +++ b/extensions/Particle3D/PU/CCPUAffector.h @@ -119,7 +119,7 @@ protected: /** Although the scale is on a Particle System level, the affector can also be scaled. */ Vec3 _affectorScale; - /** Because the public attribute ´position?is sometimes used for both localspace and worldspace + /** Because the public attribute position is sometimes used for both localspace and worldspace position, the mDerivedPosition attribute is introduced. */ Vec3 _derivedPosition; diff --git a/extensions/Particle3D/PU/CCPUAffectorTranslator.cpp b/extensions/Particle3D/PU/CCPUAffectorTranslator.cpp index 687019adb0..49b5397694 100644 --- a/extensions/Particle3D/PU/CCPUAffectorTranslator.cpp +++ b/extensions/Particle3D/PU/CCPUAffectorTranslator.cpp @@ -104,7 +104,7 @@ void PUAffectorTranslator::translate(PUScriptCompiler* compiler, PUAbstractNode } else if (prop->name == token[TOKEN_POSITION]) { - // Property: positon + // Property: position if (passValidateProperty(compiler, prop, token[TOKEN_POSITION], VAL_VECTOR3)) { Vec3 val; diff --git a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h index 03a97973ff..d3bded8a11 100644 --- a/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h +++ b/extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h @@ -107,7 +107,7 @@ public: bool alwaysUsePosition(void) const {return _alwaysUsePosition;}; /** Set the boolean to indicate whether the position of the particle that is handled must be used for emission of - the new particle or whether the contact point of the physics actor must be used. This only applies if a physics angine + the new particle or whether the contact point of the physics actor must be used. This only applies if a physics engine is used, otherwise the default is used. */ void setAlwaysUsePosition(bool alwaysUsePosition) {_alwaysUsePosition = alwaysUsePosition;}; @@ -143,14 +143,14 @@ protected: /** Store the technique value to keep up to speed. @remarks - If the ParticleTechnique has been destroyed, the DoPlacementParticleEventHandler isn´t automatically + If the ParticleTechnique has been destroyed, the DoPlacementParticleEventHandler isn't automatically notified. Using the pointer causes an exception. */ PUParticleSystem3D* _system; /** Store the emitter value to keep up to speed. @remarks - If the ParticleEmitter has been destroyed, the DoPlacementParticleEventHandler isn´t automatically + If the ParticleEmitter has been destroyed, the DoPlacementParticleEventHandler isn't automatically notified. Using the pointer causes an exception. */ PUEmitter* _emitter; diff --git a/extensions/Particle3D/PU/CCPUDynamicAttribute.h b/extensions/Particle3D/PU/CCPUDynamicAttribute.h index 2a235756f3..70dc447305 100644 --- a/extensions/Particle3D/PU/CCPUDynamicAttribute.h +++ b/extensions/Particle3D/PU/CCPUDynamicAttribute.h @@ -258,7 +258,7 @@ class CC_DLL PUDynamicAttributeCurved : public PUDynamicAttribute inline ControlPointList::iterator getLastValidIterator(void); }; -/* This class generates values based on an oscillating functione (i.e. Sine). +/* This class generates values based on an oscillating function (i.e. Sine). */ class CC_DLL PUDynamicAttributeOscillate : public PUDynamicAttribute { diff --git a/extensions/Particle3D/PU/CCPUEmitterTranslator.cpp b/extensions/Particle3D/PU/CCPUEmitterTranslator.cpp index e760b5e51b..0cfa89f37f 100644 --- a/extensions/Particle3D/PU/CCPUEmitterTranslator.cpp +++ b/extensions/Particle3D/PU/CCPUEmitterTranslator.cpp @@ -108,7 +108,7 @@ void PUEmitterTranslator::translate(PUScriptCompiler* compiler, PUAbstractNode * } else if (prop->name == token[TOKEN_POSITION]) { - // Property: positon + // Property: position if (passValidateProperty(compiler, prop, token[TOKEN_POSITION], VAL_VECTOR3)) { Vec3 val; diff --git a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h index cb153007d7..a779fa174b 100644 --- a/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h +++ b/extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h @@ -133,7 +133,7 @@ public: /** Destructor **/ ~MeshInfo (void); - /** Generate a random number. The ´high?argument determines that numbers are + /** Generate a random number. The high argument determines that numbers are returned between [0..high] **/ float getGaussianRandom (float high, float cutoff = 4); @@ -196,7 +196,7 @@ public: /** Returns the type op distribution. @remarks There are several ways to emit particles on the surface of a mesh. This attribute indicates - the type of distrubution on the surface. + the type of distribution on the surface. */ const MeshInfo::MeshSurfaceDistribution getDistribution (void) const; diff --git a/extensions/Particle3D/PU/CCPUObserver.cpp b/extensions/Particle3D/PU/CCPUObserver.cpp index 9920da403a..ca2111b9aa 100644 --- a/extensions/Particle3D/PU/CCPUObserver.cpp +++ b/extensions/Particle3D/PU/CCPUObserver.cpp @@ -198,7 +198,7 @@ void PUObserver::destroyEventHandler(PUEventHandler* eventHandler) { if (*it == eventHandler) { - // Detroy it + // Destroy it //ParticleSystemManager::getSingletonPtr()->destroyEventHandler(*it); (*it)->release(); _eventHandlers.erase(it); diff --git a/extensions/Particle3D/PU/CCPUObserver.h b/extensions/Particle3D/PU/CCPUObserver.h index 06afd0e012..1939254d2e 100644 --- a/extensions/Particle3D/PU/CCPUObserver.h +++ b/extensions/Particle3D/PU/CCPUObserver.h @@ -159,7 +159,7 @@ public: bool getObserveUntilEvent(void) const; /** Sets the value of mObserveUntilEvent. This value determines whether observation must be continued - after an event ocurred and the event handlers are called. + after an event occurred and the event handlers are called. */ void setObserveUntilEvent(bool observeUntilEvent); @@ -213,8 +213,8 @@ protected: // Particle type to be observed. Default is that all particles are observed. PUParticle3D::ParticleType _particleTypeToObserve; - /** Determines whether mParticleTypeToObserve is set. If ´true? only that particles of the specified type - are observed. If ´false?(= default), all particles are observed. + /** Determines whether mParticleTypeToObserve is set. If true only that particles of the specified type + are observed. If false (= default), all particles are observed. */ bool _particleTypeToObserveSet; diff --git a/extensions/Particle3D/PU/CCPUOnClearObserver.h b/extensions/Particle3D/PU/CCPUOnClearObserver.h index b54ffc97bd..be06b9cbff 100644 --- a/extensions/Particle3D/PU/CCPUOnClearObserver.h +++ b/extensions/Particle3D/PU/CCPUOnClearObserver.h @@ -50,13 +50,13 @@ public: */ virtual bool observe (PUParticle3D* particle, float timeElapsed) override; - /** The _processParticle() function is overridden, because we don´t observe an individual particle. - even if there isn´t a particle left anymore (and that is the situation we want to validate). + /** The _processParticle() function is overridden, because we don't observe an individual particle. + even if there isn't a particle left anymore (and that is the situation we want to validate). */ virtual void updateObserver(PUParticle3D* particle, float timeElapsed, bool firstParticle) override; /** Instead of the _processParticle(), the _postProcessParticles() is used because it is called - even if there isn´t a particle left anymore (and that is the situation we want to validate). + even if there isn't a particle left anymore (and that is the situation we want to validate). */ virtual void postUpdateObserver(float timeElapsed) override; diff --git a/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp b/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp index 13542a0609..5281b66a1c 100755 --- a/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp +++ b/extensions/Particle3D/PU/CCPUParticleSystem3D.cpp @@ -1011,7 +1011,7 @@ void PUParticleSystem3D::initParticleForExpiration( PUParticle3D* particle, floa it->particleExpired(this, particle); } ///** Externs are also called to perform expiration activities. If needed, affectors and emitters may be added, but at the moment - // there is no reason for (and we don´t want to waste cpu resources). + // there is no reason for (and we don't want to waste cpu resources). //*/ //if (!mExterns.empty()) //{ diff --git a/extensions/Particle3D/PU/CCPURandomiserTranslator.cpp b/extensions/Particle3D/PU/CCPURandomiserTranslator.cpp index 1c734cc23d..27d4162237 100644 --- a/extensions/Particle3D/PU/CCPURandomiserTranslator.cpp +++ b/extensions/Particle3D/PU/CCPURandomiserTranslator.cpp @@ -55,7 +55,7 @@ bool PURandomiserTranslator::translateChildProperty( PUScriptCompiler* compiler, } else if (prop->name == token[TOKEN_RND_MAX_DEVIATION_X]) { - // Property: rand_aff_max_deviation_x (depreacted and replaced by 'max_deviation_x') + // Property: rand_aff_max_deviation_x (deprecated and replaced by 'max_deviation_x') if (passValidateProperty(compiler, prop, token[TOKEN_RND_MAX_DEVIATION_X], VAL_REAL)) { float val = 0.0f; diff --git a/extensions/Particle3D/PU/CCPUTechniqueTranslator.cpp b/extensions/Particle3D/PU/CCPUTechniqueTranslator.cpp index 4425a63518..0c2149173f 100644 --- a/extensions/Particle3D/PU/CCPUTechniqueTranslator.cpp +++ b/extensions/Particle3D/PU/CCPUTechniqueTranslator.cpp @@ -89,7 +89,7 @@ void PUTechniqueTranslator::translate(PUScriptCompiler* compiler, PUAbstractNode } else if (prop->name == token[TOKEN_POSITION]) { - // Property: positon + // Property: position if (passValidateProperty(compiler, prop, token[TOKEN_POSITION], VAL_VECTOR3)) { Vec3 val; diff --git a/extensions/Particle3D/PU/CCPUTextureRotator.h b/extensions/Particle3D/PU/CCPUTextureRotator.h index ec9504c5a7..3dc1b71f9f 100644 --- a/extensions/Particle3D/PU/CCPUTextureRotator.h +++ b/extensions/Particle3D/PU/CCPUTextureRotator.h @@ -62,7 +62,7 @@ public: */ void setRotationSpeed(PUDynamicAttribute* dynRotationSpeed); - /** Returns the rotation defined in the the affector. + /** Returns the rotation defined in the affector. */ PUDynamicAttribute* getRotation(void) const; diff --git a/extensions/Particle3D/PU/CCPUVertexEmitter.h b/extensions/Particle3D/PU/CCPUVertexEmitter.h index 4945d66047..7940d36082 100644 --- a/extensions/Particle3D/PU/CCPUVertexEmitter.h +++ b/extensions/Particle3D/PU/CCPUVertexEmitter.h @@ -62,9 +62,9 @@ NS_CC_BEGIN // /** Defines the speed of generating spawnpoints. In each Particle Technique update // 'mIterations' vertices are traversed. // @remarks -// Setting this attribute to a higher value is needed if the emssion rate of the emitter +// Setting this attribute to a higher value is needed if the emission rate of the emitter // is high. On slower computers, emitting the particles may exceed generating the -// spawnpoints (because this is not done at once, but per Particle Tehcnique update). +// spawnpoints (because this is not done at once, but per Particle Technique update). // */ // unsigned short mIterations; // diff --git a/extensions/assets-manager/AssetsManager.cpp b/extensions/assets-manager/AssetsManager.cpp index 50b71da88b..962019fcee 100644 --- a/extensions/assets-manager/AssetsManager.cpp +++ b/extensions/assets-manager/AssetsManager.cpp @@ -253,7 +253,7 @@ void AssetsManager::downloadAndUncompress() void AssetsManager::update() { // all operation in checkUpdate, nothing need to do - // keep this function for compatiblity + // keep this function for compatibility } bool AssetsManager::uncompress() @@ -308,8 +308,8 @@ bool AssetsManager::uncompress() const size_t filenameLength = strlen(fileName); if (fileName[filenameLength-1] == '/') { - // Entry is a direcotry, so create it. - // If the directory exists, it will failed scilently. + // Entry is a directory, so create it. + // If the directory exists, it will failed silently. if (!FileUtils::getInstance()->createDirectory(fullPath)) { CCLOG("can not create directory %s", fullPath.c_str()); diff --git a/extensions/assets-manager/AssetsManager.h b/extensions/assets-manager/AssetsManager.h index 23d55ac7ce..f3452650b2 100644 --- a/extensions/assets-manager/AssetsManager.h +++ b/extensions/assets-manager/AssetsManager.h @@ -55,7 +55,7 @@ public: // Error caused by creating a file to store downloaded data CREATE_FILE, /** Error caused by network - -- network unavaivable + -- network unavailable -- timeout -- ... */ diff --git a/extensions/assets-manager/AssetsManagerEx.cpp b/extensions/assets-manager/AssetsManagerEx.cpp index 58e8e82ae1..936dcf0b96 100644 --- a/extensions/assets-manager/AssetsManagerEx.cpp +++ b/extensions/assets-manager/AssetsManagerEx.cpp @@ -833,7 +833,7 @@ void AssetsManagerEx::onError(const network::DownloadTask& task, int errorCodeInternal, const std::string& errorStr) { - // Skip version error occured + // Skip version error occurred if (task.identifier == VERSION_ID) { CCLOG("AssetsManagerEx : Fail to download version file, step skipped\n"); diff --git a/extensions/assets-manager/AssetsManagerEx.h b/extensions/assets-manager/AssetsManagerEx.h index 1fd166d26b..4dbfec62fc 100644 --- a/extensions/assets-manager/AssetsManagerEx.h +++ b/extensions/assets-manager/AssetsManagerEx.h @@ -149,7 +149,7 @@ protected: */ const DownloadUnits& getFailedAssets() const; - /** @brief Function for destorying the downloaded version file and manifest file + /** @brief Function for destroying the downloaded version file and manifest file */ void destroyDownloadedVersion();