Skip to content

Commit

Permalink
Fix typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys committed Sep 23, 2014
1 parent 3ad7801 commit 0507005
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion DESIGN-MANIFESTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Oryol Apps:
- should never require a big upfront download.
- should be self-contained executables with no external dependencies
- should not require installation (unless enforced by the host system)
- should not require adminstration rights (unless enforced by the host system)
- should not require administration rights (unless enforced by the host system)
- should be able to load required data from web servers (unless forbidden by the host system)


Expand Down
2 changes: 1 addition & 1 deletion code/Modules/Core/Assert.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#endif

#if !(__GNUC__ || __GNUC__)
// on Visual Studio, replace __PRETTY_FUNCTION__ with __FUNCSIC__
// on Visual Studio, replace __PRETTY_FUNCTION__ with __FUNCSIG__
#define __PRETTY_FUNCTION__ __FUNCSIG__
#endif

Expand Down
4 changes: 2 additions & 2 deletions code/Modules/Core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ There's a few things to keep in mind when using ref-counted objects in Oryol:
1. classes which use ref-counting should be subclasses of RefCounted (or provide a specific set of methods to manage the refcount, but that's an advanced topic)
2. the destructor must be virtual
3. a class annoation macro must be used to add creation methods to refcounted class
3. a class annotation macro must be used to add creation methods to refcounted class
4. the Ptr<> class must be used as smart-pointer class

With this in place, creating an object then looks like this:
Expand All @@ -127,7 +127,7 @@ public:
};
```
Non-default constructors can be invoked throught the Create method as well, and
Non-default constructors can be invoked through the Create method as well, and
of course you can also use the new C++11 auto keyword:
```cpp
Expand Down
4 changes: 2 additions & 2 deletions code/Modules/Core/UnitTests/StringTest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ TEST(StringTest) {
CHECK(subStr.Front() == 0);
CHECK(subStr.Back() == 0);

// construction and assignment from nullpointers is explicitely allowed
// construction and assignment from nullpointers is explicitly allowed
const char* nullPointer = nullptr;
String nullString(nullPointer);
CHECK(nullString.Empty());
Expand All @@ -150,4 +150,4 @@ TEST(StringTest) {
CHECK(nullString.Empty());
CHECK(nullString.AsCStr() != nullptr);
CHECK(nullString.AsCStr()[0] == 0);
}
}
6 changes: 3 additions & 3 deletions code/Modules/Gfx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ the [Clear sample](http://floooh.github.com/oryol/Clear.html):
Gfx::Setup(GfxSetup::Window(400, 300, "Oryol Clear Sample"));
...

// in each invokation of App::OnRunning(), a single frame is rendered:
// in each invocation of App::OnRunning(), a single frame is rendered:
// - need to apply a render target (default render target in this case)
// - clear the render target to black
// - commit the rendered frame
Expand All @@ -48,7 +48,7 @@ Gfx::Discard();
#### Gfx initialization and teardown
Before an Oryol app can render anything, the Gfx module must be initialized in
the App::OnInit() method. In each invokation of App::OnRunning(), one frame
the App::OnInit() method. In each invocation of App::OnRunning(), one frame
is rendered, finished with a call to Gfx::CommitFrame(). In App::OnCleanup()
the Gfx module is destroyed with a call to Gfx::Discard(). The Gfx::IsValid()
method can be used to check whether the Gfx module has been initialized:
Expand Down Expand Up @@ -111,7 +111,7 @@ The Setup Object describes the type of the resource to be created, how it should
created (for instance from a file, or a chunk of memory), and (usually) additional
initialization attributes.

There is no explicite Gfx method to discard a resource. This is handled under the
There is no explicit Gfx method to discard a resource. This is handled under the
hood by the *GfxId* object, which manages a resource use count (and thus works like a
smart pointer to the resource). When the last *GfxId* of a resource is destroyed,
the resource itself is also destroyed.
Expand Down
2 changes: 1 addition & 1 deletion code/Samples/Gfx/SimpleRenderTarget/SimpleRenderTarget.cc
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SimpleRenderTargetApp::OnInit() {
gfxSetup.Loaders.Add(RawMeshLoader::Creator());
Gfx::Setup(gfxSetup);

// create an offscreen render target, we explicitely want repeat texture wrap mode
// create an offscreen render target, we explicitly want repeat texture wrap mode
// and linear blending...
auto rtSetup = TextureSetup::RenderTarget(128, 128);
rtSetup.ColorFormat = PixelFormat::RGB8;
Expand Down
2 changes: 1 addition & 1 deletion doc/stringatoms.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ structures as keys and the precomputed hash values for hashing into the buckets.
This is implemented in the private method StringAtom::setupFromCString():

* the hash value of the input string is computed
* the unordered set in the thread-local string atom table is searched (inolves comparing the
* the unordered set in the thread-local string atom table is searched (involves comparing the
hash values, and on hash-collisions actual string-comparisons)
* if the string is already in the table we're done
* otherwise a new entry in the stringAtomBuffer is created, this involves copying the computed hash and string data
Expand Down
4 changes: 2 additions & 2 deletions oryol
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ def runBuild(config, target) :
if target != None :
args.append(target)
else :
# generic invokation of cmake --build
# generic invocation of cmake --build
args = ['cmake', '--build', '.', '--config', buildType]
if subprocess.call(args=args, cwd=buildPath) != 0 :
error("Build failed.")
Expand All @@ -353,7 +353,7 @@ def runRebuild(config, target) :
# run ninja
exitCode = subprocess.call(args=['ninja', 'clean'], cwd=buildPath)
else :
# generic invokation of cmake --build
# generic invocation of cmake --build
exitCode = subprocess.call(args=['cmake', '--build', '.', '--target', 'clean'], cwd=buildPath)
if exitCode != 0 :
error("Clean failed.")
Expand Down

0 comments on commit 0507005

Please sign in to comment.