From 129b7f23a75f55ec9da0f0315d3ef7979154559b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 13 Aug 2012 22:46:46 +0200 Subject: [PATCH] Fixed typos (substract -> subtract). --- doc/building.dox | 2 +- src/Math/Test/VectorTest.cpp | 4 ++-- src/Math/Test/VectorTest.h | 2 +- src/Math/Vector.h | 4 ++-- src/Physics/ShapeGroup.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/building.dox b/doc/building.dox index 5f85874d8..5153bf4b4 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -15,7 +15,7 @@ Minimal set of tools and libraries required for building is: which are tested to support everything needed: **GCC** >= 4.6 and **Clang** >= 3.1. - **CMake** >= 2.8.8 (needed for `OBJECT` library target) -- **OpenGL** headers, on Linux most probably shipped with Mesa or +- **OpenGL** headers, on Linux most probably shipped with Mesa, or **OpenGL ES 2** headers, if targeting OpenGL ES (see below). - **GLEW** - OpenGL extension wrangler - **Corrade** - Plugin management and utility library. You can get it at diff --git a/src/Math/Test/VectorTest.cpp b/src/Math/Test/VectorTest.cpp index 327c2cb49..41bd037ec 100644 --- a/src/Math/Test/VectorTest.cpp +++ b/src/Math/Test/VectorTest.cpp @@ -36,7 +36,7 @@ VectorTest::VectorTest() { &VectorTest::copy, &VectorTest::dot, &VectorTest::multiplyDivide, - &VectorTest::addSubstract, + &VectorTest::addSubtract, &VectorTest::dotSelf, &VectorTest::length, &VectorTest::normalized, @@ -103,7 +103,7 @@ void VectorTest::multiplyDivide() { CORRADE_COMPARE(multipliedChar/-1.5f, vecChar); } -void VectorTest::addSubstract() { +void VectorTest::addSubtract() { Vector4 a(0.5f, -7.5f, 9.0f, -11.0f); Vector4 b(-0.5, 1.0f, 0.0f, 7.5f); Vector4 expected(0.0f, -6.5f, 9.0f, -3.5f); diff --git a/src/Math/Test/VectorTest.h b/src/Math/Test/VectorTest.h index 662865119..bbf02d783 100644 --- a/src/Math/Test/VectorTest.h +++ b/src/Math/Test/VectorTest.h @@ -28,7 +28,7 @@ class VectorTest: public Corrade::TestSuite::Tester { void copy(); void dot(); void multiplyDivide(); - void addSubstract(); + void addSubtract(); void dotSelf(); void length(); void normalized(); diff --git a/src/Math/Vector.h b/src/Math/Vector.h index bfdb1681f..9e7800cdd 100644 --- a/src/Math/Vector.h +++ b/src/Math/Vector.h @@ -218,13 +218,13 @@ template class Vector { return *this; } - /** @brief Substract two vectors */ + /** @brief Subtract two vectors */ inline Vector operator-(const Vector& other) const { return Vector(*this)-=other; } /** - * @brief Substract and assign vector + * @brief Subtract and assign vector * * More efficient than operator-(), because it does the computation * in-place. diff --git a/src/Physics/ShapeGroup.h b/src/Physics/ShapeGroup.h index 2e1174c82..074474719 100644 --- a/src/Physics/ShapeGroup.h +++ b/src/Physics/ShapeGroup.h @@ -31,7 +31,7 @@ namespace Magnum { namespace Physics { /** @brief Collider group with defined set operation -Result of union, intersection, substraction or XOR of two collider objects. +Result of union, intersection, subtraction or XOR of two collider objects. See @ref collision-detection for brief introduction. */ class PHYSICS_EXPORT ShapeGroup: public AbstractShape {