mirror of https://github.com/axmolengine/axmol.git
misspelling check on cocos directory (#16522)
Misspelling fix on some comments, cocos/editor-support/cocostudio/CSParseBinary_generated.h fix misspelling postion -> position
This commit is contained in:
parent
50a1e75373
commit
7c298bdcd7
|
@ -356,7 +356,7 @@ void Mesh::setMaterial(Material* material)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Was the texture set before teh GLProgramState ? Set it
|
// Was the texture set before the GLProgramState ? Set it
|
||||||
for(auto& tex : _textures)
|
for(auto& tex : _textures)
|
||||||
setTexture(tex.second, tex.first);
|
setTexture(tex.second, tex.first);
|
||||||
|
|
||||||
|
|
|
@ -640,7 +640,7 @@ Frame* ActionTimelineCache::loadPositionFrameWithFlatBuffers(const flatbuffers::
|
||||||
{
|
{
|
||||||
PositionFrame* frame = PositionFrame::create();
|
PositionFrame* frame = PositionFrame::create();
|
||||||
|
|
||||||
auto f_position = flatbuffers->postion();
|
auto f_position = flatbuffers->position();
|
||||||
Vec2 position(f_position->x(), f_position->y());
|
Vec2 position(f_position->x(), f_position->y());
|
||||||
frame->setPosition(position);
|
frame->setPosition(position);
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ public:
|
||||||
virtual const cocos2d::BlendFunc & getBlendFunc() const override { return _blendFunc; }
|
virtual const cocos2d::BlendFunc & getBlendFunc() const override { return _blendFunc; }
|
||||||
|
|
||||||
// debug draw show, bone's debugdraw can be draw when bone is visible
|
// debug draw show, bone's debugdraw can be draw when bone is visible
|
||||||
// when bone's added to skeleton, DebugDrawEnabled controled by skeleton's DebugDrawEnabled
|
// when bone's added to skeleton, DebugDrawEnabled controlled by skeleton's DebugDrawEnabled
|
||||||
virtual void setDebugDrawEnabled(bool isDebugDraw);
|
virtual void setDebugDrawEnabled(bool isDebugDraw);
|
||||||
virtual bool isDebugDrawEnabled() const { return _isRackShow; }
|
virtual bool isDebugDrawEnabled() const { return _isRackShow; }
|
||||||
|
|
||||||
|
|
|
@ -2167,13 +2167,13 @@ inline flatbuffers::Offset<Frame> CreateFrame(flatbuffers::FlatBufferBuilder &_f
|
||||||
struct PointFrame : private flatbuffers::Table {
|
struct PointFrame : private flatbuffers::Table {
|
||||||
int32_t frameIndex() const { return GetField<int32_t>(4, 0); }
|
int32_t frameIndex() const { return GetField<int32_t>(4, 0); }
|
||||||
uint8_t tween() const { return GetField<uint8_t>(6, 1); }
|
uint8_t tween() const { return GetField<uint8_t>(6, 1); }
|
||||||
const Position *postion() const { return GetStruct<const Position *>(8); }
|
const Position *position() const { return GetStruct<const Position *>(8); }
|
||||||
const EasingData *easingData() const { return GetPointer<const EasingData *>(10); }
|
const EasingData *easingData() const { return GetPointer<const EasingData *>(10); }
|
||||||
bool Verify(flatbuffers::Verifier &verifier) const {
|
bool Verify(flatbuffers::Verifier &verifier) const {
|
||||||
return VerifyTableStart(verifier) &&
|
return VerifyTableStart(verifier) &&
|
||||||
VerifyField<int32_t>(verifier, 4 /* frameIndex */) &&
|
VerifyField<int32_t>(verifier, 4 /* frameIndex */) &&
|
||||||
VerifyField<uint8_t>(verifier, 6 /* tween */) &&
|
VerifyField<uint8_t>(verifier, 6 /* tween */) &&
|
||||||
VerifyField<Position>(verifier, 8 /* postion */) &&
|
VerifyField<Position>(verifier, 8 /* position */) &&
|
||||||
VerifyField<flatbuffers::uoffset_t>(verifier, 10 /* easingData */) &&
|
VerifyField<flatbuffers::uoffset_t>(verifier, 10 /* easingData */) &&
|
||||||
verifier.VerifyTable(easingData()) &&
|
verifier.VerifyTable(easingData()) &&
|
||||||
verifier.EndTable();
|
verifier.EndTable();
|
||||||
|
@ -2185,7 +2185,7 @@ struct PointFrameBuilder {
|
||||||
flatbuffers::uoffset_t start_;
|
flatbuffers::uoffset_t start_;
|
||||||
void add_frameIndex(int32_t frameIndex) { fbb_.AddElement<int32_t>(4, frameIndex, 0); }
|
void add_frameIndex(int32_t frameIndex) { fbb_.AddElement<int32_t>(4, frameIndex, 0); }
|
||||||
void add_tween(uint8_t tween) { fbb_.AddElement<uint8_t>(6, tween, 1); }
|
void add_tween(uint8_t tween) { fbb_.AddElement<uint8_t>(6, tween, 1); }
|
||||||
void add_postion(const Position *postion) { fbb_.AddStruct(8, postion); }
|
void add_postion(const Position *position) { fbb_.AddStruct(8, position); }
|
||||||
void add_easingData(flatbuffers::Offset<EasingData> easingData) { fbb_.AddOffset(10, easingData); }
|
void add_easingData(flatbuffers::Offset<EasingData> easingData) { fbb_.AddOffset(10, easingData); }
|
||||||
PointFrameBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
|
PointFrameBuilder(flatbuffers::FlatBufferBuilder &_fbb) : fbb_(_fbb) { start_ = fbb_.StartTable(); }
|
||||||
PointFrameBuilder &operator=(const PointFrameBuilder &);
|
PointFrameBuilder &operator=(const PointFrameBuilder &);
|
||||||
|
@ -2198,11 +2198,11 @@ struct PointFrameBuilder {
|
||||||
inline flatbuffers::Offset<PointFrame> CreatePointFrame(flatbuffers::FlatBufferBuilder &_fbb,
|
inline flatbuffers::Offset<PointFrame> CreatePointFrame(flatbuffers::FlatBufferBuilder &_fbb,
|
||||||
int32_t frameIndex = 0,
|
int32_t frameIndex = 0,
|
||||||
uint8_t tween = 1,
|
uint8_t tween = 1,
|
||||||
const Position *postion = 0,
|
const Position *position = 0,
|
||||||
flatbuffers::Offset<EasingData> easingData = 0) {
|
flatbuffers::Offset<EasingData> easingData = 0) {
|
||||||
PointFrameBuilder builder_(_fbb);
|
PointFrameBuilder builder_(_fbb);
|
||||||
builder_.add_easingData(easingData);
|
builder_.add_easingData(easingData);
|
||||||
builder_.add_postion(postion);
|
builder_.add_postion(position);
|
||||||
builder_.add_frameIndex(frameIndex);
|
builder_.add_frameIndex(frameIndex);
|
||||||
builder_.add_tween(tween);
|
builder_.add_tween(tween);
|
||||||
return builder_.Finish();
|
return builder_.Finish();
|
||||||
|
|
|
@ -92,7 +92,7 @@ static int readLine (const char** begin, const char* end, Str* str) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Moves str->begin past the first occurence of c. Returns 0 on failure. */
|
/* Moves str->begin past the first occurrence of c. Returns 0 on failure. */
|
||||||
static int beginPast (Str* str, char c) {
|
static int beginPast (Str* str, char c) {
|
||||||
const char* begin = str->begin;
|
const char* begin = str->begin;
|
||||||
while (1) {
|
while (1) {
|
||||||
|
|
|
@ -89,7 +89,7 @@ public:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the corresponding HttpRequest object which leads to this response.
|
* Get the corresponding HttpRequest object which leads to this response.
|
||||||
* There's no paired setter for it, because it's already setted in class constructor
|
* There's no paired setter for it, because it's already set in class constructor
|
||||||
* @return HttpRequest* the corresponding HttpRequest object which leads to this response.
|
* @return HttpRequest* the corresponding HttpRequest object which leads to this response.
|
||||||
*/
|
*/
|
||||||
inline HttpRequest* getHttpRequest() const
|
inline HttpRequest* getHttpRequest() const
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class Cocos2dxReflectionHelper {
|
||||||
Log.e("error", "can not find " + constantName + " in " + aClass.getName());
|
Log.e("error", "can not find " + constantName + " in " + aClass.getName());
|
||||||
}
|
}
|
||||||
catch (IllegalAccessException e) {
|
catch (IllegalAccessException e) {
|
||||||
Log.e("error", constantName + " is not accessable");
|
Log.e("error", constantName + " is not accessible");
|
||||||
}
|
}
|
||||||
catch (IllegalArgumentException e) {
|
catch (IllegalArgumentException e) {
|
||||||
Log.e("error", "arguments error when get " + constantName);
|
Log.e("error", "arguments error when get " + constantName);
|
||||||
|
|
|
@ -568,7 +568,7 @@ bool GLProgram::link()
|
||||||
// Calling glGetProgramiv(...GL_LINK_STATUS...) will force linking of the program at this moment.
|
// Calling glGetProgramiv(...GL_LINK_STATUS...) will force linking of the program at this moment.
|
||||||
// Otherwise, they might be linked when they are used for the first time. (I guess this depends on the driver implementation)
|
// Otherwise, they might be linked when they are used for the first time. (I guess this depends on the driver implementation)
|
||||||
// So it might slow down the "booting" process on certain devices. But, on the other hand it is important to know if the shader
|
// So it might slow down the "booting" process on certain devices. But, on the other hand it is important to know if the shader
|
||||||
// linked succesfully. Some shaders might be downloaded in runtime so, release version should have this check.
|
// linked successfully. Some shaders might be downloaded in runtime so, release version should have this check.
|
||||||
// For more info, see Github issue #16231
|
// For more info, see Github issue #16231
|
||||||
glGetProgramiv(_program, GL_LINK_STATUS, &status);
|
glGetProgramiv(_program, GL_LINK_STATUS, &status);
|
||||||
|
|
||||||
|
|
|
@ -67,11 +67,11 @@ vec4 getPosition()
|
||||||
}
|
}
|
||||||
|
|
||||||
vec4 _skinnedPosition;
|
vec4 _skinnedPosition;
|
||||||
vec4 postion = vec4(a_position, 1.0);
|
vec4 position = vec4(a_position, 1.0);
|
||||||
_skinnedPosition.x = dot(postion, matrixPalette1);
|
_skinnedPosition.x = dot(position, matrixPalette1);
|
||||||
_skinnedPosition.y = dot(postion, matrixPalette2);
|
_skinnedPosition.y = dot(position, matrixPalette2);
|
||||||
_skinnedPosition.z = dot(postion, matrixPalette3);
|
_skinnedPosition.z = dot(position, matrixPalette3);
|
||||||
_skinnedPosition.w = postion.w;
|
_skinnedPosition.w = position.w;
|
||||||
|
|
||||||
return _skinnedPosition;
|
return _skinnedPosition;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1170,7 +1170,7 @@ DebuggerServer.ObjectActorPreviewers = {
|
||||||
* The thread actor to use to create a value grip.
|
* The thread actor to use to create a value grip.
|
||||||
* @return object|null
|
* @return object|null
|
||||||
* An object with one property, "value", which holds the value grip that
|
* An object with one property, "value", which holds the value grip that
|
||||||
* represents the given object. Null is returned if we cant preview the
|
* represents the given object. Null is returned if we can't preview the
|
||||||
* object.
|
* object.
|
||||||
*/
|
*/
|
||||||
function genericObjectPreviewer(className, classObj, obj, hooks) {
|
function genericObjectPreviewer(className, classObj, obj, hooks) {
|
||||||
|
|
|
@ -452,7 +452,7 @@ var WebConsoleUtils = {
|
||||||
/**
|
/**
|
||||||
* Helper function to deduce the name of the provided function.
|
* Helper function to deduce the name of the provided function.
|
||||||
*
|
*
|
||||||
* @param funtion aFunction
|
* @param function aFunction
|
||||||
* The function whose name will be returned.
|
* The function whose name will be returned.
|
||||||
* @return string
|
* @return string
|
||||||
* Function name.
|
* Function name.
|
||||||
|
@ -1527,7 +1527,7 @@ var WebConsoleCommands = {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Register a new command.
|
* Register a new command.
|
||||||
* @param {string} name The command name (exemple: "$")
|
* @param {string} name The command name (example: "$")
|
||||||
* @param {(function|object)} command The command to register.
|
* @param {(function|object)} command The command to register.
|
||||||
* It can be a function so the command is a function (like "$()"),
|
* It can be a function so the command is a function (like "$()"),
|
||||||
* or it can also be a property descriptor to describe a getter / value (like
|
* or it can also be a property descriptor to describe a getter / value (like
|
||||||
|
|
|
@ -1063,7 +1063,7 @@ var _initSys = function () {
|
||||||
* @constant
|
* @constant
|
||||||
* @type {Number}
|
* @type {Number}
|
||||||
*/
|
*/
|
||||||
sys.LANGUAGE_UNKNOWN = "unkonwn";
|
sys.LANGUAGE_UNKNOWN = "unknown";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @memberof cc.sys
|
* @memberof cc.sys
|
||||||
|
|
|
@ -615,7 +615,7 @@ cc._reuse_color4b = {r:255, g:255, b:255, a:255 };
|
||||||
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Basic sturcture : Point
|
// Basic structure : Point
|
||||||
//
|
//
|
||||||
cc.p = function( x, y )
|
cc.p = function( x, y )
|
||||||
{
|
{
|
||||||
|
@ -948,7 +948,7 @@ cc._g = function( x, y )
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
// Basic sturcture : Size
|
// Basic structure : Size
|
||||||
//
|
//
|
||||||
cc.size = function(w,h)
|
cc.size = function(w,h)
|
||||||
{
|
{
|
||||||
|
@ -1089,7 +1089,7 @@ cc.RectZero = function () {
|
||||||
return cc.rect(0, 0, 0, 0);
|
return cc.rect(0, 0, 0, 0);
|
||||||
};
|
};
|
||||||
|
|
||||||
// Basic sturcture : Color
|
// Basic structure : Color
|
||||||
cc.Color = function (r, g, b, a) {
|
cc.Color = function (r, g, b, a) {
|
||||||
this.r = r || 0;
|
this.r = r || 0;
|
||||||
this.g = g || 0;
|
this.g = g || 0;
|
||||||
|
@ -1101,7 +1101,7 @@ cc.Color = function (r, g, b, a) {
|
||||||
* Generate a color object based on multiple forms of parameters
|
* Generate a color object based on multiple forms of parameters
|
||||||
* @example
|
* @example
|
||||||
*
|
*
|
||||||
* // 1. All channels seperately as parameters
|
* // 1. All channels separately as parameters
|
||||||
* var color1 = cc.color(255, 255, 255, 255);
|
* var color1 = cc.color(255, 255, 255, 255);
|
||||||
*
|
*
|
||||||
* // 2. Convert a hex string to a color
|
* // 2. Convert a hex string to a color
|
||||||
|
@ -1695,7 +1695,7 @@ cc.arrayVerifyType = function (arr, type) {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Searches for the first occurance of object and removes it. If object is not found the function has no effect.
|
* Searches for the first occurrence of object and removes it. If object is not found the function has no effect.
|
||||||
* @function
|
* @function
|
||||||
* @param {Array} arr Source Array
|
* @param {Array} arr Source Array
|
||||||
* @param {*} delObj remove object
|
* @param {*} delObj remove object
|
||||||
|
@ -2601,7 +2601,7 @@ cc.MenuItem.prototype.setCallback = function (callback, target) {
|
||||||
};
|
};
|
||||||
|
|
||||||
//
|
//
|
||||||
// MenuItemImage support sprite frame name as paramter
|
// MenuItemImage support sprite frame name as parameter
|
||||||
//
|
//
|
||||||
var _p = cc.MenuItemImage.prototype;
|
var _p = cc.MenuItemImage.prototype;
|
||||||
_p._setNormalSpriteFrame = _p.setNormalSpriteFrame;
|
_p._setNormalSpriteFrame = _p.setNormalSpriteFrame;
|
||||||
|
|
|
@ -105,7 +105,7 @@ cc.KEY = {
|
||||||
'-':109,
|
'-':109,
|
||||||
'numdel':110,
|
'numdel':110,
|
||||||
'/':111,
|
'/':111,
|
||||||
f1:112, //f1-f12 dont work on ie
|
f1:112, //f1-f12 don't work on ie
|
||||||
f2:113,
|
f2:113,
|
||||||
f3:114,
|
f3:114,
|
||||||
f4:115,
|
f4:115,
|
||||||
|
@ -139,7 +139,7 @@ cc.KEY = {
|
||||||
closebracket:221,
|
closebracket:221,
|
||||||
quote:222,
|
quote:222,
|
||||||
|
|
||||||
// gamepad controll
|
// gamepad control
|
||||||
dpadLeft:1000,
|
dpadLeft:1000,
|
||||||
dpadRight:1001,
|
dpadRight:1001,
|
||||||
dpadUp:1003,
|
dpadUp:1003,
|
||||||
|
|
|
@ -270,7 +270,7 @@
|
||||||
|
|
||||||
--------------------------------
|
--------------------------------
|
||||||
-- Percent content size is used to adapt node's content size based on parent's content size.<br>
|
-- Percent content size is used to adapt node's content size based on parent's content size.<br>
|
||||||
-- If set to true then node's content size will be changed based on the value setted by @see setPercentContentSize<br>
|
-- If set to true then node's content size will be changed based on the value set by @see setPercentContentSize<br>
|
||||||
-- param isUsed True to enable percent content size, false otherwise.
|
-- param isUsed True to enable percent content size, false otherwise.
|
||||||
-- @function [parent=#LayoutComponent] setUsingPercentContentSize
|
-- @function [parent=#LayoutComponent] setUsingPercentContentSize
|
||||||
-- @param self
|
-- @param self
|
||||||
|
|
|
@ -95,7 +95,7 @@ namespace ui {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Percent content size is used to adapt node's content size based on parent's content size.
|
* Percent content size is used to adapt node's content size based on parent's content size.
|
||||||
* If set to true then node's content size will be changed based on the value setted by @see setPercentContentSize
|
* If set to true then node's content size will be changed based on the value set by @see setPercentContentSize
|
||||||
*@param isUsed True to enable percent content size, false otherwise.
|
*@param isUsed True to enable percent content size, false otherwise.
|
||||||
*/
|
*/
|
||||||
void setUsingPercentContentSize(bool isUsed);
|
void setUsingPercentContentSize(bool isUsed);
|
||||||
|
|
|
@ -171,7 +171,7 @@ public:
|
||||||
* Scroll to a page with a given index and with a given scroll time.
|
* Scroll to a page with a given index and with a given scroll time.
|
||||||
*
|
*
|
||||||
* @param idx A given index in the PageView. Index start from 0 to pageCount -1.
|
* @param idx A given index in the PageView. Index start from 0 to pageCount -1.
|
||||||
* @param time Scroll time must be >= 0. Otherwise last setted scroll time will be used.
|
* @param time Scroll time must be >= 0. Otherwise last set scroll time will be used.
|
||||||
*/
|
*/
|
||||||
void scrollToPage(ssize_t idx, float time);
|
void scrollToPage(ssize_t idx, float time);
|
||||||
|
|
||||||
|
@ -186,7 +186,7 @@ public:
|
||||||
* Scroll to a item with a given index and with a given scroll time.
|
* Scroll to a item with a given index and with a given scroll time.
|
||||||
*
|
*
|
||||||
* @param idx A given index in the PageView. Index start from 0 to pageCount -1.
|
* @param idx A given index in the PageView. Index start from 0 to pageCount -1.
|
||||||
* @param time Scroll time must be >= 0. Otherwise last setted scrolltime will be used.
|
* @param time Scroll time must be >= 0. Otherwise last set scrolltime will be used.
|
||||||
*/
|
*/
|
||||||
void scrollToItem(ssize_t idx, float time);
|
void scrollToItem(ssize_t idx, float time);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue