diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-01 16:20:18 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-01 16:20:18 +0400 |
commit | ea13ec1699bcf59960daa57fd2cd9d24e195a71b (patch) | |
tree | 8f3b48f2b535426b425388181ed0b9a598ca2d06 /source/gameengine | |
parent | 6a36b6249b8dc5bd0f60572fdbc2e42e79c14981 (diff) |
Spelling Cleanup
Diffstat (limited to 'source/gameengine')
42 files changed, 51 insertions, 51 deletions
diff --git a/source/gameengine/Converter/BL_ShapeActionActuator.cpp b/source/gameengine/Converter/BL_ShapeActionActuator.cpp index d679d1a5792..a730041cdae 100644 --- a/source/gameengine/Converter/BL_ShapeActionActuator.cpp +++ b/source/gameengine/Converter/BL_ShapeActionActuator.cpp @@ -221,7 +221,7 @@ bool BL_ShapeActionActuator::Update(double curtime, bool frame) priority = m_priority; - /* Determine pre-incrementation behaviour and set appropriate flags */ + /* Determine pre-incrementation behavior and set appropriate flags */ switch (m_playtype){ case ACT_ACTION_MOTION: if (bNegativeEvent){ diff --git a/source/gameengine/Converter/KX_ConvertControllers.cpp b/source/gameengine/Converter/KX_ConvertControllers.cpp index 9ba79e26f7e..503876b13c7 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.cpp +++ b/source/gameengine/Converter/KX_ConvertControllers.cpp @@ -228,7 +228,7 @@ void BL_ConvertControllers( else { /* We cant do this because importing runs the script which could end up accessing * internal BGE functions, this is unstable while we're converting the scene. - * This is a pitty because its useful to see errors at startup but cant help it */ + * This is a pity because its useful to see errors at startup but cant help it */ // pyctrl->Import(); } diff --git a/source/gameengine/Converter/KX_ConvertSensors.cpp b/source/gameengine/Converter/KX_ConvertSensors.cpp index 9391d12a3ce..a672e9cd9b8 100644 --- a/source/gameengine/Converter/KX_ConvertSensors.cpp +++ b/source/gameengine/Converter/KX_ConvertSensors.cpp @@ -315,7 +315,7 @@ void BL_ConvertSensors(struct Object* blenderobject, bMouseSensor *bmouse = (bMouseSensor *)sens->data; /* There are two main types of mouse sensors. If there is - * no focus-related behaviour requested, we can make do + * no focus-related behavior requested, we can make do * with a basic sensor. This cuts down memory usage and * gives a slight performance gain. */ diff --git a/source/gameengine/Expressions/InputParser.cpp b/source/gameengine/Expressions/InputParser.cpp index 726fea795ba..9f0def6e866 100644 --- a/source/gameengine/Expressions/InputParser.cpp +++ b/source/gameengine/Expressions/InputParser.cpp @@ -581,7 +581,7 @@ CExpression* CParser::ProcessText ch = text[0]; /*if (ch != '=') { expr = new CConstExpr(new CStringValue(text)); - *dependant = deplist; + *dependent = deplist; return expr; } else */ diff --git a/source/gameengine/Expressions/PyObjectPlus.cpp b/source/gameengine/Expressions/PyObjectPlus.cpp index d50ec0f414e..9f3b62b34d8 100644 --- a/source/gameengine/Expressions/PyObjectPlus.cpp +++ b/source/gameengine/Expressions/PyObjectPlus.cpp @@ -295,7 +295,7 @@ PyObject *PyObjectPlus::py_get_attrdef(PyObject *self_py, const PyAttributeDef * } if (attrdef->m_type == KX_PYATTRIBUTE_TYPE_FUNCTION) { - // the attribute has no field correspondance, handover processing to function. + // the attribute has no field correspondence, handover processing to function. if (attrdef->m_getFunction == NULL) return NULL; return (*attrdef->m_getFunction)(ptr, attrdef); diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 49150fc775f..cc7c7f9b281 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -433,7 +433,7 @@ int CValue::GetPropertyCount() double* CValue::GetVector3(bool bGetTransformedVec) { - assertd(false); // don;t get vector from me + assertd(false); // don't get vector from me return m_sZeroVec;//::sZero; } diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index 917cf409198..64d7496a4e5 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -181,7 +181,7 @@ public: * * Together with CExpression, CValue and it's derived classes can be used to * parse expressions into a parsetree with error detecting/correcting capabilities - * also expandible by a CFactory pluginsystem + * also expandable by a CFactory pluginsystem * * Base class for all editor functionality, flexible object type that allows * calculations and uses reference counting for memory management. diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index ee9fa97c992..443faef6338 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -295,7 +295,7 @@ public: virtual int GetNumActiveEvents(); /** - * Get the number of ramping events (just_activated, just_released) + * Get the number of remapping events (just_activated, just_released) */ virtual int GetNumJustEvents(); diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp index 2a903e4f8b6..09d81c7f14b 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.cpp +++ b/source/gameengine/GameLogic/SCA_ISensor.cpp @@ -257,7 +257,7 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr) } } else { - /* First, the pulsing behaviour, if pulse mode is + /* First, the pulsing behavior, if pulse mode is * active. It seems something goes wrong if pulse mode is * not set :( */ if (m_pos_pulsemode) { diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index 1e10bcc08fd..8a7a29ef5b9 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -107,7 +107,7 @@ public: ~SCA_ISensor(); virtual void ReParent(SCA_IObject* parent); - /** Because we want sensors to share some behaviour, the Activate has */ + /** Because we want sensors to share some behavior, the Activate has */ /* an implementation on this level. It requires an evaluate on the lower */ /* level of individual sensors. Mapping the old activate()s is easy. */ /* The IsPosTrig() also has to change, to keep things consistent. */ @@ -118,7 +118,7 @@ public: virtual CValue* GetReplica()=0; - /** Set parameters for the pulsing behaviour. + /** Set parameters for the pulsing behavior. * @param posmode Trigger positive pulses? * @param negmode Trigger negative pulses? * @param freq Frequency to use when doing pulsing. diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index 97cd01dff38..399ea8d80dd 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -294,7 +294,7 @@ bool SCA_KeyboardSensor::Evaluate() } /* Modify the key state based on qual(s) - * Tested carefuly. dont touch unless your really sure. + * Tested carefully. dont touch unless your really sure. * note, this will only change the results if key modifiers are set. * * When all modifiers and keys are positive diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp index a684ce93aed..c5346c16fc9 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.cpp +++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * Regulates the top-level logic behaviour for one scene. + * Regulates the top-level logic behavior for one scene. */ /** \file gameengine/GameLogic/SCA_LogicManager.cpp diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index 8671aa6c796..d0bd49e71af 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -26,7 +26,7 @@ */ /** \file SCA_IController.h * \ingroup gamelogic - * \brief Regulates the top-level logic behaviour for one scene. + * \brief Regulates the top-level logic behavior for one scene. */ #ifndef __SCA_LOGICMANAGER_H__ #define __SCA_LOGICMANAGER_H__ diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp index 82950f571f9..15211247d26 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp @@ -111,7 +111,7 @@ void GPC_Canvas::SetViewPort(int x1, int y1, int x2, int y2) */ /* XXX, nasty, this needs to go somewhere else, - * but where... definitly need to clean up this + * but where... definitely need to clean up this * whole canvas/rendertools mess. */ glEnable(GL_SCISSOR_TEST); diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.h b/source/gameengine/GamePlayer/common/GPC_Canvas.h index e865c662eda..28105a8cdd8 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.h +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.h @@ -158,7 +158,7 @@ public: /** * @section Methods inherited from abstract base class RAS_ICanvas. - * Semantics are not yet honoured. + * Semantics are not yet honored. */ void SetMouseState(RAS_MouseState mousestate) @@ -187,8 +187,8 @@ public: * @param imageWidth Width of the banner image in pixels. * @param imageHeight Height of the banner image in pixels. * @param imageData Pointer to the pixels of the image to display. - * @param alignement Where the banner will be positioned on the canvas. - * @param enabled Whether the banner will be displayed intiallly. + * @param alignment Where the banner will be positioned on the canvas. + * @param enabled Whether the banner will be displayed initially. * @return A banner id. */ TBannerId AddBanner( @@ -199,7 +199,7 @@ public: /** * Disposes a banner. - * @param id Bannner to be disposed. + * @param id Banner to be disposed. */ void DisposeBanner(TBannerId id); @@ -224,7 +224,7 @@ public: protected: /** * Disposes a banner. - * @param it Bannner to be disposed. + * @param it Banner to be disposed. */ void DisposeBanner(TBannerData& banner); diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.cpp b/source/gameengine/GamePlayer/common/GPC_Engine.cpp index 171ea266f49..6eb52413a4e 100644 --- a/source/gameengine/GamePlayer/common/GPC_Engine.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Engine.cpp @@ -225,7 +225,7 @@ void GPC_Engine::StartLoadingAnimation() } -// will be platform dependant +// will be platform dependent float GPC_Engine::DetermineProgress(void) { #if 0 diff --git a/source/gameengine/GamePlayer/common/GPC_Engine.h b/source/gameengine/GamePlayer/common/GPC_Engine.h index 095efee7895..60f0d2af199 100644 --- a/source/gameengine/GamePlayer/common/GPC_Engine.h +++ b/source/gameengine/GamePlayer/common/GPC_Engine.h @@ -113,7 +113,7 @@ public: bool Loading(void) {return m_loading;} bool Running(void) const {return m_running;} - virtual float DetermineProgress(void); // will be platform dependant + virtual float DetermineProgress(void); // will be platform dependent void UpdateLoadingAnimation(void); private: diff --git a/source/gameengine/GamePlayer/common/GPC_RawImage.h b/source/gameengine/GamePlayer/common/GPC_RawImage.h index 6fa5a9f607b..86a5feb8ea3 100644 --- a/source/gameengine/GamePlayer/common/GPC_RawImage.h +++ b/source/gameengine/GamePlayer/common/GPC_RawImage.h @@ -60,7 +60,7 @@ public: * @param width The width of the image created. * @param height The height of the image created. * @param alignment How the resource image is located in the image created. - * @param offsetX Amount of horzontal offset applied to the resource image. + * @param offsetX Amount of horizontal offset applied to the resource image. * @param offsetY Amount of vertical offset applied to the resource image. */ virtual bool Load(const char *srcName, diff --git a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp index 9166f0dded4..36c38682244 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp +++ b/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp @@ -437,7 +437,7 @@ int main(int argc, char** argv) break; case SCREEN_SAVER_MODE_PASSWORD: /* This is W95 only, which we currently do not support. - Fall-back to normal screen saver behaviour in that case... */ + Fall-back to normal screen saver behavior in that case... */ case SCREEN_SAVER_MODE_SAVER: fullScreen = true; fullScreenParFound = true; diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp index 014641a2d10..8c6392ee825 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * Ketsji Logic Extenstion: Network Event Manager generic implementation + * Ketsji Logic Extension: Network Event Manager generic implementation */ /** \file gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h index 4f560428fbb..3202785ee81 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h @@ -27,7 +27,7 @@ /** \file KX_NetworkEventManager.h * \ingroup ketsjinet - * \brief Ketsji Logic Extenstion: Network Event Manager class + * \brief Ketsji Logic Extension: Network Event Manager class */ #ifndef __KX_NETWORKEVENTMANAGER_H__ diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp index 9d5a6907c46..2741907bfe6 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * Ketsji Logic Extenstion: Network Message Actuator generic implementation + * Ketsji Logic Extension: Network Message Actuator generic implementation */ /** \file gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h index 3c8d8ec23d2..980e1cda6dc 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h @@ -27,7 +27,7 @@ /** \file KX_NetworkMessageActuator.h * \ingroup ketsjinet - * \brief Ketsji Logic Extenstion: Network Message Actuator class + * \brief Ketsji Logic Extension: Network Message Actuator class */ #ifndef __KX_NETWORKMESSAGEACTUATOR_H__ diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index a39c8ede6c1..a69f02baa57 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -23,7 +23,7 @@ * Contributor(s): none yet. * * ***** END GPL LICENSE BLOCK ***** - * Ketsji Logic Extenstion: Network Message Sensor generic implementation + * Ketsji Logic Extension: Network Message Sensor generic implementation */ /** \file gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h index 0c76e718fa2..66f723d072c 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h @@ -27,7 +27,7 @@ /** \file KX_NetworkMessageSensor.h * \ingroup ketsjinet - * \brief Ketsji Logic Extenstion: Network Message Sensor class + * \brief Ketsji Logic Extension: Network Message Sensor class */ #ifndef __KX_NETWORKMESSAGESENSOR_H__ #define __KX_NETWORKMESSAGESENSOR_H__ diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index ac83200cb2e..610200cc235 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -344,7 +344,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, ci.m_linearDamping = 1.f - shapeprops->m_lin_drag; ci.m_angularDamping = 1.f - shapeprops->m_ang_drag; //need a bit of damping, else system doesn't behave well - ci.m_inertiaFactor = shapeprops->m_inertia/0.4f;//defaults to 0.4, don't want to change behaviour + ci.m_inertiaFactor = shapeprops->m_inertia/0.4f;//defaults to 0.4, don't want to change behavior ci.m_do_anisotropic = shapeprops->m_do_anisotropic; ci.m_anisotropicFriction.setValue(shapeprops->m_friction_scaling[0],shapeprops->m_friction_scaling[1],shapeprops->m_friction_scaling[2]); diff --git a/source/gameengine/Ketsji/KX_GameObject.cpp b/source/gameengine/Ketsji/KX_GameObject.cpp index c32dc6c1096..2740a2921d2 100644 --- a/source/gameengine/Ketsji/KX_GameObject.cpp +++ b/source/gameengine/Ketsji/KX_GameObject.cpp @@ -1271,7 +1271,7 @@ const MT_Point3& KX_GameObject::NodeGetLocalPosition() const } -/* Suspend/ resume: for the dynamic behaviour, there is a simple +/* Suspend/ resume: for the dynamic behavior, there is a simple * method. For the residual motion, there is not. I wonder what the * correct solution is for Sumo. Remove from the motion-update tree? * diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp index 29727dc04da..b754e82046f 100644 --- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp +++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp @@ -1447,7 +1447,7 @@ void KX_KetsjiEngine::RenderDebugProperties() { STR_String debugtxt; int xcoord = 10; // mmmm, these constants were taken from blender source - int ycoord = 14; // to 'mimic' behaviour + int ycoord = 14; // to 'mimic' behavior float tottime = m_logger->GetAverage(); if (tottime < 1e-6f) { diff --git a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp index ed38694d2ca..c8a916e85b6 100644 --- a/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp +++ b/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp @@ -100,7 +100,7 @@ bool KX_MouseFocusSensor::Evaluate() // cout << "evaluate focus mouse sensor "<<endl; m_reset = false; if (m_focusmode) { - /* Focus behaviour required. Test mouse-on. The rest is + /* Focus behavior required. Test mouse-on. The rest is * equivalent to handling a key. */ obHasFocus = ParentObjectHasFocus(); @@ -123,7 +123,7 @@ bool KX_MouseFocusSensor::Evaluate() result = true; } } else { - /* No focus behaviour required: revert to the basic mode. This + /* No focus behavior required: revert to the basic mode. This * mode is never used, because the converter never makes this * sensor for a mouse-key event. It is here for * completeness. */ diff --git a/source/gameengine/Ketsji/KX_Scene.h b/source/gameengine/Ketsji/KX_Scene.h index ca57548be2a..2aae58d564f 100644 --- a/source/gameengine/Ketsji/KX_Scene.h +++ b/source/gameengine/Ketsji/KX_Scene.h @@ -191,7 +191,7 @@ protected: NG_NetworkScene* m_networkScene; /** - * A temoprary variable used to parent objects together on + * A temporary variable used to parent objects together on * replication. Don't get confused by the name it is not * the scene's root node! */ diff --git a/source/gameengine/Ketsji/KX_SteeringActuator.cpp b/source/gameengine/Ketsji/KX_SteeringActuator.cpp index bc8c5ec92a8..f9af9fc3b8e 100644 --- a/source/gameengine/Ketsji/KX_SteeringActuator.cpp +++ b/source/gameengine/Ketsji/KX_SteeringActuator.cpp @@ -536,7 +536,7 @@ PyMethodDef KX_SteeringActuator::Methods[] = { }; PyAttributeDef KX_SteeringActuator::Attributes[] = { - KX_PYATTRIBUTE_INT_RW("behaviour", KX_STEERING_NODEF+1, KX_STEERING_MAX-1, true, KX_SteeringActuator, m_mode), + KX_PYATTRIBUTE_INT_RW("behavior", KX_STEERING_NODEF+1, KX_STEERING_MAX-1, true, KX_SteeringActuator, m_mode), KX_PYATTRIBUTE_RW_FUNCTION("target", KX_SteeringActuator, pyattr_get_target, pyattr_set_target), KX_PYATTRIBUTE_RW_FUNCTION("navmesh", KX_SteeringActuator, pyattr_get_navmesh, pyattr_set_navmesh), KX_PYATTRIBUTE_FLOAT_RW("distance", 0.0f, 1000.0f, KX_SteeringActuator, m_distance), diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 9972f9916b9..cf8a729aa88 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -1566,7 +1566,7 @@ bool CcdShapeConstructionInfo::SetMesh(RAS_MeshObject* meshobj, DerivedMesh* dm, MVert *v2= &mvert[mf->v2]; MVert *v3= &mvert[mf->v3]; - // the face indicies + // the face indices tri_pt[0]= vert_remap_array[mf->v1]; tri_pt[1]= vert_remap_array[mf->v2]; tri_pt[2]= vert_remap_array[mf->v3]; diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index b9e78d9ff1f..2228b6511ce 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -178,7 +178,7 @@ public: // original mesh that correspond to shape triangles. // only set for concave mesh shape. - std::vector<int> m_triFaceArray; // Contains an array of triplets of face indicies + std::vector<int> m_triFaceArray; // Contains an array of triplets of face indices // quads turn into 2 tris std::vector<UVco> m_triFaceUVcoArray; // Contains an array of pair of UV coordinate for each vertex of faces diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index f64f55b6592..a2597f917e3 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -129,7 +129,7 @@ class PHY_IPhysicsEnvironment virtual void setContactBreakingTreshold(float contactBreakingTreshold) {} ///continuous collision detection mode, very experimental for Bullet virtual void setCcdMode(int ccdMode) {} - ///successive overrelaxation constant, in case PSOR is used, values in between 1 and 2 guarantee converging behaviour + ///successive overrelaxation constant, in case PSOR is used, values in between 1 and 2 guarantee converging behavior virtual void setSolverSorConstant(float sor) {} ///setSolverType, internal setting, chooses solvertype, PSOR, Dantzig, impulse based, penalty based virtual void setSolverType(int solverType) {} diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h index d1991537cf9..48bbe943892 100644 --- a/source/gameengine/SceneGraph/SG_Node.h +++ b/source/gameengine/SceneGraph/SG_Node.h @@ -81,7 +81,7 @@ public: ); /** - * Return true if the node is the ancessor of child + * Return true if the node is the ancestor of child */ bool IsAncessor( diff --git a/source/gameengine/SceneGraph/SG_Spatial.h b/source/gameengine/SceneGraph/SG_Spatial.h index 085c2d12267..32f91103369 100644 --- a/source/gameengine/SceneGraph/SG_Spatial.h +++ b/source/gameengine/SceneGraph/SG_Spatial.h @@ -83,14 +83,14 @@ public: m_ogldirty = false; } /** - * Define the realtionship this node has with it's parent + * Define the relationship this node has with it's parent * node. You should pass an unshared instance of an SG_ParentRelation * allocated on the heap to this method. Ownership of this * instance is assumed by this class. * You may call this function several times in the lifetime * of a node to change the relationship dynamically. * You must call this method before the first call to UpdateSpatialData(). - * An assertion willl be fired at run-time in debug if this is not + * An assertion will be fired at run-time in debug if this is not * the case. * The relation is activated only if no controllers of this object * updated the coordinates of the child. diff --git a/source/gameengine/VideoTexture/ImageBase.h b/source/gameengine/VideoTexture/ImageBase.h index e6469f4cb86..cb2187f00ef 100644 --- a/source/gameengine/VideoTexture/ImageBase.h +++ b/source/gameengine/VideoTexture/ImageBase.h @@ -166,7 +166,7 @@ protected: // copy pixel *dstBuff = filter.convert(srcBuff, x, y, srcSize, pixSize); } - // else scale picture (nearest neighbour) + // else scale picture (nearest neighbor) else { // interpolation accumulator diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index d9e3a592f6f..899a9f9782e 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -370,7 +370,7 @@ static PyGetSetDef imageBuffGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp index d06ea485c8c..e2409920230 100644 --- a/source/gameengine/VideoTexture/ImageMix.cpp +++ b/source/gameengine/VideoTexture/ImageMix.cpp @@ -162,7 +162,7 @@ static PyGetSetDef imageMixGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index a349b45e403..ef371d05f86 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -383,7 +383,7 @@ static PyGetSetDef imageRenderGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} @@ -545,7 +545,7 @@ static PyGetSetDef imageMirrorGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index a9354564d0e..729b9ab9777 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -308,7 +308,7 @@ static PyGetSetDef imageViewportGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index acc09931859..0ee2f23521c 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -1188,7 +1188,7 @@ static PyGetSetDef videoGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {(char*)"preseek", (getter)VideoFFmpeg_getPreseek, (setter)VideoFFmpeg_setPreseek, (char*)"nb of frames of preseek", NULL}, @@ -1309,7 +1309,7 @@ static PyGetSetDef imageGetSets[] = {(char*)"valid", (getter)Image_valid, NULL, (char*)"bool to tell if an image is available", NULL}, {(char*)"image", (getter)Image_getImage, NULL, (char*)"image data", NULL}, {(char*)"size", (getter)Image_getSize, NULL, (char*)"image size", NULL}, - {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbour)", NULL}, + {(char*)"scale", (getter)Image_getScale, (setter)Image_setScale, (char*)"fast scale of image (near neighbor)", NULL}, {(char*)"flip", (getter)Image_getFlip, (setter)Image_setFlip, (char*)"flip image vertically", NULL}, {(char*)"filter", (getter)Image_getFilter, (setter)Image_setFilter, (char*)"pixel filter", NULL}, {NULL} |