Skip to content

Commit bce8c68

Browse files
xiaofeng11xiaofeng11
committed
Merge pull request cocos2d#14635 from xiaofeng11/v3.10
Merge new commits from v3 branch
2 parents 936ff93 + aa66e3a commit bce8c68

File tree

39 files changed

+157
-133
lines changed

39 files changed

+157
-133
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ _ReSharper*/
3434
[Tt]est[Rr]esult*
3535
ipch/
3636
*.opensdf
37+
*.opendb
3738
SubmissionInfo
3839
Generated Files
3940
AppPackages

‎README.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,38 @@ $ adb install ../tests/cpp-empty-test/proj.android/bin/CppEmptyTest-debug.apk
259259

260260
Then click item on Android device to run tests. Available value of `-p` is the API level, cocos2d-x supports from level 10.
261261

262+
Learning Resources
263+
--------------------------------
264+
265+
* [Programmers Guide](http://cocos2d-x.org/programmersguide/)
266+
* [Sonar Systems Videos](https://www.youtube.com/user/sonarsystemslimited/search?query=cocos2d-x)
267+
* [Android Fundamentals](https://developer.android.com/guide/components/fundamentals.html)
268+
* [Make School Tutorials](https://www.makeschool.com/tutorials/)
269+
* [Games From Scratch](http://www.gamefromscratch.com/page/Cocos2d-x-CPP-Game-Programming-Tutorial-Series.aspx)
270+
* [Cocos2d sample games](https://github.com/cocos2d/cocos2d-x-samples)
271+
272+
Spreading the word!
273+
--------------------------------
274+
You can help us spread the word about cocos2d-x! We would surely appreciate it!
275+
276+
* Talk about us on Facebook! Our [Facebook Page](https://www.facebook.com/cocos2dx/)
277+
* Tweet, Tweet! Our [Twitter](https://twitter.com/cocos2dx)
278+
* Read our [Blog](http://blog.cocos2d-x.org/) and promote it on your social media.
279+
* Become a [Regional Coordinator](http://discuss.cocos2d-x.org/t/we-need-regional-coordinators/24104)
280+
281+
Where to get help
282+
--------------------------------
283+
284+
* [Forums](http://discuss.cocos2d-x.org)
285+
* [Bug Tracker](https://github.com/cocos2d/cocos2d-x/issues)
286+
* IRC. We are in [Freenode](https://webchat.freenode.net/) in the _#cocos2d_ channel
287+
* `cpp-tests` project. This project is our basis for testing. Use this project to
288+
learn how we implement the functionality of the engine. This project is located in
289+
__cocos2d-x_root/build.__
290+
* [API Reference](http://cocos2d-x.org/wiki/Reference).
291+
* [Temporary Cocos2d-JS documents](http://cocos2d-x.org/docs/manual/framework/html5/en)
292+
* [Latest Release Note](https://github.com/cocos2d/cocos2d-x/blob/v3/docs/RELEASE_NOTES.md)
293+
* [Changelog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)
262294

263295
Contributing to the Project
264296
--------------------------------

‎cocos/2d/CCFontAtlasCache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class CC_DLL FontAtlasCache
5454
*/
5555
static void purgeCachedData();
5656

57-
/** Release current FNT texutre and reload it.
57+
/** Release current FNT texture and reload it.
5858
CAUTION : All component use this font texture should be reset font name, though the file name is same!
5959
otherwise, it will cause program crash!
6060
*/

‎cocos/2d/CCLabel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ bool Label::setBMFontFilePath(const std::string& bmfontFilePath, const Vec2& ima
586586
return false;
587587
}
588588

589-
//asign the default fontSize
589+
//assign the default fontSize
590590
if (fabs(fontSize) < FLT_EPSILON) {
591591
FontFNT *bmFont = (FontFNT*)newAtlas->getFont();
592592
if (bmFont) {
@@ -1939,7 +1939,7 @@ float Label::getRenderingFontSize()const
19391939
fontSize = this->getTTFConfig().fontSize;
19401940
}else if(_currentLabelType == LabelType::STRING_TEXTURE){
19411941
fontSize = _systemFontSize;
1942-
}else{ //FIXME: find a way to caculate char map font size
1942+
}else{ //FIXME: find a way to calculate char map font size
19431943
fontSize = this->getLineHeight();
19441944
}
19451945
return fontSize;

‎cocos/2d/CCRenderTexture.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ Image* RenderTexture::newImage(bool fliimage)
496496
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
497497
glBindFramebuffer(GL_FRAMEBUFFER, _FBO);
498498

499-
// TODO: move this to configration, so we don't check it every time
499+
// TODO: move this to configuration, so we don't check it every time
500500
/* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
501501
*/
502502
if (Configuration::getInstance()->checkForGLExtension("GL_QCOM"))
@@ -581,7 +581,7 @@ void RenderTexture::onBegin()
581581
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
582582
glBindFramebuffer(GL_FRAMEBUFFER, _FBO);
583583

584-
// TODO: move this to configration, so we don't check it every time
584+
// TODO: move this to configuration, so we don't check it every time
585585
/* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture. The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture. Create a temporary texture to overcome this. At the end of RenderTexture::begin(), switch the attached texture to the second one, call glClear, and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
586586
*/
587587
if (Configuration::getInstance()->checkForGLExtension("GL_QCOM"))

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,40 +119,40 @@
119119
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
120120
<GenerateManifest>false</GenerateManifest>
121121
<IgnoreImportLibrary>false</IgnoreImportLibrary>
122-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
122+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
123123
<LinkIncremental>
124124
</LinkIncremental>
125125
</PropertyGroup>
126126
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
127127
<GenerateManifest>false</GenerateManifest>
128128
<IgnoreImportLibrary>false</IgnoreImportLibrary>
129-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
129+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
130130
<LinkIncremental>
131131
</LinkIncremental>
132132
</PropertyGroup>
133133
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
134134
<GenerateManifest>false</GenerateManifest>
135135
<IgnoreImportLibrary>false</IgnoreImportLibrary>
136-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
136+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
137137
<LinkIncremental>false</LinkIncremental>
138138
</PropertyGroup>
139139
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
140140
<GenerateManifest>false</GenerateManifest>
141141
<IgnoreImportLibrary>false</IgnoreImportLibrary>
142-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
142+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
143143
<LinkIncremental>false</LinkIncremental>
144144
</PropertyGroup>
145145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
146146
<GenerateManifest>false</GenerateManifest>
147147
<IgnoreImportLibrary>false</IgnoreImportLibrary>
148-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
148+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
149149
<LinkIncremental>
150150
</LinkIncremental>
151151
</PropertyGroup>
152152
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
153153
<GenerateManifest>false</GenerateManifest>
154154
<IgnoreImportLibrary>false</IgnoreImportLibrary>
155-
<TargetName>libcocos2d_v3.9_Windows_8.1</TargetName>
155+
<TargetName>libcocos2d_v3.10_Windows_8.1</TargetName>
156156
<LinkIncremental>
157157
</LinkIncremental>
158158
</PropertyGroup>

‎cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@
9191
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9292
<GenerateManifest>false</GenerateManifest>
9393
<IgnoreImportLibrary>false</IgnoreImportLibrary>
94-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
94+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
9595
</PropertyGroup>
9696
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9797
<GenerateManifest>false</GenerateManifest>
9898
<IgnoreImportLibrary>false</IgnoreImportLibrary>
99-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
99+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
100100
</PropertyGroup>
101101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
102102
<GenerateManifest>false</GenerateManifest>
103103
<IgnoreImportLibrary>false</IgnoreImportLibrary>
104-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
104+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
105105
<LinkIncremental>false</LinkIncremental>
106106
</PropertyGroup>
107107
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
108108
<GenerateManifest>false</GenerateManifest>
109109
<IgnoreImportLibrary>false</IgnoreImportLibrary>
110-
<TargetName>libcocos2d_v3.9_WindowsPhone_8.1</TargetName>
110+
<TargetName>libcocos2d_v3.10_WindowsPhone_8.1</TargetName>
111111
<LinkIncremental>false</LinkIncremental>
112112
</PropertyGroup>
113113
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

‎cocos/2d/libcocos2d_win10/libcocos2d.vcxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
@@ -1526,34 +1526,34 @@
15261526
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
15271527
<GenerateManifest>false</GenerateManifest>
15281528
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1529-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1529+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15301530
</PropertyGroup>
15311531
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
15321532
<GenerateManifest>false</GenerateManifest>
15331533
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1534-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1534+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15351535
</PropertyGroup>
15361536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
15371537
<GenerateManifest>false</GenerateManifest>
15381538
<IgnoreImportLibrary>false</IgnoreImportLibrary>
15391539
<LinkIncremental>false</LinkIncremental>
1540-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1540+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15411541
</PropertyGroup>
15421542
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
15431543
<GenerateManifest>false</GenerateManifest>
15441544
<IgnoreImportLibrary>false</IgnoreImportLibrary>
15451545
<LinkIncremental>false</LinkIncremental>
1546-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1546+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15471547
</PropertyGroup>
15481548
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
15491549
<GenerateManifest>false</GenerateManifest>
15501550
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1551-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1551+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15521552
</PropertyGroup>
15531553
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
15541554
<GenerateManifest>false</GenerateManifest>
15551555
<IgnoreImportLibrary>false</IgnoreImportLibrary>
1556-
<TargetName>libcocos2d_v3.9_Windows_10.0</TargetName>
1556+
<TargetName>libcocos2d_v3.10_Windows_10.0</TargetName>
15571557
</PropertyGroup>
15581558
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
15591559
<ClCompile>
@@ -1675,4 +1675,4 @@
16751675
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
16761676
<ImportGroup Label="ExtensionTargets">
16771677
</ImportGroup>
1678-
</Project>
1678+
</Project>

‎cocos/3d/CCMesh.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ class CC_DLL Mesh : public Ref
9696
int getVertexSizeInBytes() const;
9797

9898
/**
99-
* set texture (diffuse), which is responsible for the main apearence. It is also means main textrue, you can also call setTexture(texPath, NTextureData::Usage::Diffuse)
99+
* set texture (diffuse), which is responsible for the main appearance. It is also means main texture, you can also call setTexture(texPath, NTextureData::Usage::Diffuse)
100100
* @param texPath texture path
101101
*/
102102
void setTexture(const std::string& texPath);
103103
/**
104-
* set texture (diffuse), which is responsible for the main apearence. It is also means main textrue, you can also call setTexture(texPath, NTextureData::Usage::Diffuse)
104+
* set texture (diffuse), which is responsible for the main appearance. It is also means main texture, you can also call setTexture(texPath, NTextureData::Usage::Diffuse)
105105
* @param tex texture to be set
106106
*/
107107
void setTexture(Texture2D* tex);
@@ -118,14 +118,14 @@ class CC_DLL Mesh : public Ref
118118
*/
119119
void setTexture(const std::string& texPath, NTextureData::Usage usage);
120120
/**
121-
* Get texture (diffuse), which is responsible for the main apearence. It is also means main textrue, you can also call getTexture(NTextureData::Usage::Diffuse)
121+
* Get texture (diffuse), which is responsible for the main appearance. It is also means main texture, you can also call getTexture(NTextureData::Usage::Diffuse)
122122
* @return Texture used, return the texture of first mesh if multiple meshes exist
123123
*/
124124
Texture2D* getTexture() const;
125125
/**
126-
* Get textrue
126+
* Get texture
127127
* @param usage Usage of returned texture
128-
* @return The texture of this usage, return the textrue of first mesh if multiple meshes exist
128+
* @return The texture of this usage, return the texture of first mesh if multiple meshes exist
129129
*/
130130
Texture2D* getTexture(NTextureData::Usage usage);
131131

@@ -230,7 +230,7 @@ class CC_DLL Mesh : public Ref
230230
void checkTexture();
231231

232232
/**
233-
* set enable check texture, check texture each frame if eanble is true. It is false by default
233+
* set enable check texture, check texture each frame if enable is true. It is false by default
234234
*/
235235
void setEnableCheckTexture(bool enableCheckTexture) { _enableCheckTexture = enableCheckTexture; }
236236
/**

‎cocos/3d/CCMeshSkin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Skeleton3D;
4343

4444
/**
4545
* @brief MeshSkin, A class maintain a collection of bones that affect Mesh vertex.
46-
* And it is responsible for computing matrix palletes that used by skin mesh rendering.
46+
* And it is responsible for computing matrix palettes that used by skin mesh rendering.
4747
* @js NA
4848
* @lua NA
4949
*/

‎cocos/3d/CCObjLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// Copyright 2012-2015, Syoyo Fujita.
33
//
4-
// Licensed under 2-clause BSD liecense.
4+
// Licensed under 2-clause BSD license.
55
//
66

77
//

‎cocos/3d/CCObjLoader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// Copyright 2012-2015, Syoyo Fujita.
33
//
4-
// Licensed under 2-clause BSD liecense.
4+
// Licensed under 2-clause BSD license.
55
//
66
//https://github.com/syoyo/tinyobjloader
77
#ifndef _TINY_OBJ_LOADER_H

‎cocos/3d/CCTerrain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ class CC_DLL Terrain : public Node
265265

266266
/**
267267
*QuadTree
268-
* @breif use to hierarchically frustum culling and set LOD
268+
* @brief use to hierarchically frustum culling and set LOD
269269
**/
270270
struct CC_DLL QuadTree
271271
{

‎cocos/audio/ios/CDAudioManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ typedef enum {
120120
-(void) load:(NSString*) filePath;
121121
/** Plays the audio source */
122122
-(void) play;
123-
/** Stops playing the audio soruce */
123+
/** Stops playing the audio source */
124124
-(void) stop;
125125
/** Pauses the audio source */
126126
-(void) pause;

‎cocos/audio/ios/CDAudioManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ -(void) dealloc {
6161
}
6262

6363
-(void) load:(NSString*) filePath {
64-
//We have alread loaded a file previously, check if we are being asked to load the same file
64+
//We have already loaded a file previously, check if we are being asked to load the same file
6565
if (state == kLAS_Init || ![filePath isEqualToString:audioSourceFilePath]) {
6666
CDLOGINFO(@"Denshion::CDLongAudioSource - Loading new audio source %@",filePath);
6767
//New file
@@ -627,7 +627,7 @@ -(void) setResignBehavior:(tAudioManagerResignBehavior) resignBehavior autoHandl
627627
- (void) applicationWillResignActive {
628628
_resigned = YES;
629629

630-
//Set the audio sesssion to one that allows sharing so that other audio won't be clobbered on resume
630+
//Set the audio session to one that allows sharing so that other audio won't be clobbered on resume
631631
[self audioSessionSetCategory:AVAudioSessionCategoryAmbient];
632632

633633
switch (_resignBehavior) {

‎cocos/audio/mac/CDAudioManager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ typedef enum {
119119
-(void) load:(NSString*) filePath;
120120
/** Plays the audio source */
121121
-(void) play;
122-
/** Stops playing the audio soruce */
122+
/** Stops playing the audio source */
123123
-(void) stop;
124124
/** Pauses the audio source */
125125
-(void) pause;

‎cocos/audio/mac/CDAudioManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ -(void) dealloc {
6060
}
6161

6262
-(void) load:(NSString*) filePath {
63-
//We have alread loaded a file previously, check if we are being asked to load the same file
63+
//We have already loaded a file previously, check if we are being asked to load the same file
6464
if (state == kLAS_Init || ![filePath isEqualToString:audioSourceFilePath]) {
6565
CDLOGINFO(@"Denshion::CDLongAudioSource - Loading new audio source %@",filePath);
6666
//New file
@@ -621,7 +621,7 @@ -(void) setResignBehavior:(tAudioManagerResignBehavior) resignBehavior autoHandl
621621
- (void) applicationWillResignActive {
622622
_resigned = YES;
623623

624-
//Set the audio sesssion to one that allows sharing so that other audio won't be clobbered on resume
624+
//Set the audio session to one that allows sharing so that other audio won't be clobbered on resume
625625
[self audioSessionSetCategory:AVAudioSessionCategoryAmbient];
626626

627627
switch (_resignBehavior) {

‎cocos/audio/win32/MciPlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void MciPlayer::Resume()
143143
{
144144
if (strExt == ".mid")
145145
{
146-
// midi not supprt MCI_RESUME, should get the position and use MCI_FROM
146+
// midi not support MCI_RESUME, should get the position and use MCI_FROM
147147
MCI_STATUS_PARMS mciStatusParms;
148148
MCI_PLAY_PARMS mciPlayParms;
149149
mciStatusParms.dwItem = MCI_STATUS_POSITION;

‎cocos/audio/winrt/Audio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Audio
122122
void Start();
123123
void Render();
124124

125-
// This flag can be used to tell when the audio system is experiencing critial errors.
125+
// This flag can be used to tell when the audio system is experiencing critical errors.
126126
// XAudio2 gives a critical error when the user unplugs their headphones, and a new
127127
// speaker configuration is generated.
128128
void SetEngineExperiencedCriticalError()

‎cocos/base/CCDirector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ void Director::setNextDeltaTimeZero(bool nextDeltaTimeZero)
445445
//
446446
// FIXME TODO
447447
// Matrix code MUST NOT be part of the Director
448-
// MUST BE moved outide.
448+
// MUST BE moved outside.
449449
// Why the Director must have this code ?
450450
//
451451
void Director::initMatrixStack()

‎cocos/base/ZipUtils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ typedef struct unz_file_info_s unz_file_info;
225225
* Zip file - reader helper class.
226226
*
227227
* It will cache the file list of a particular zip file with positions inside an archive,
228-
* so it would be much faster to read some particular files or to check their existance.
228+
* so it would be much faster to read some particular files or to check their existence.
229229
*
230230
* @since v2.0.5
231231
*/
@@ -258,7 +258,7 @@ typedef struct unz_file_info_s unz_file_info;
258258
/**
259259
* Check does a file exists or not in zip file
260260
*
261-
* @param fileName File to be checked on existance
261+
* @param fileName File to be checked on existence
262262
* @return true whenever file exists, false otherwise
263263
*
264264
* @since v2.0.5

0 commit comments

Comments
 (0)