[Scummvm-git-logs] scummvm master -> d0763f78bc23e31d705ba412516be571b46551e4
grisenti
noreply at scummvm.org
Wed Mar 29 19:23:40 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d0763f78bc HPL1: run clang-format on engine code
Commit: d0763f78bc23e31d705ba412516be571b46551e4
https://github.com/scummvm/scummvm/commit/d0763f78bc23e31d705ba412516be571b46551e4
Author: grisenti (emanuele at grisenti.net)
Date: 2023-03-29T21:23:19+02:00
Commit Message:
HPL1: run clang-format on engine code
Changed paths:
engines/hpl1/algorithms.h
engines/hpl1/debug.h
engines/hpl1/detection.cpp
engines/hpl1/detection_tables.h
engines/hpl1/engine/ai/AI.cpp
engines/hpl1/engine/ai/AI.h
engines/hpl1/engine/ai/AINodeContainer.cpp
engines/hpl1/engine/ai/AINodeContainer.h
engines/hpl1/engine/ai/AINodeGenerator.cpp
engines/hpl1/engine/ai/AINodeGenerator.h
engines/hpl1/engine/ai/AStar.h
engines/hpl1/engine/ai/StateMachine.h
engines/hpl1/engine/engine.h
engines/hpl1/engine/game/Game.cpp
engines/hpl1/engine/game/Game.h
engines/hpl1/engine/game/GameTypes.h
engines/hpl1/engine/game/SaveGame.h
engines/hpl1/engine/game/ScriptFuncs.cpp
engines/hpl1/engine/game/ScriptFuncs.h
engines/hpl1/engine/game/Updater.h
engines/hpl1/engine/game/low_level_game_setup.cpp
engines/hpl1/engine/game/low_level_game_setup.h
engines/hpl1/engine/graphics/Animation.h
engines/hpl1/engine/graphics/AnimationTrack.cpp
engines/hpl1/engine/graphics/AnimationTrack.h
engines/hpl1/engine/graphics/BackgroundImage.h
engines/hpl1/engine/graphics/Beam.h
engines/hpl1/engine/graphics/BillBoard.h
engines/hpl1/engine/graphics/Bone.h
engines/hpl1/engine/graphics/BoneState.h
engines/hpl1/engine/graphics/Color.h
engines/hpl1/engine/graphics/GPUProgram.h
engines/hpl1/engine/graphics/GfxObject.h
engines/hpl1/engine/graphics/Graphics.cpp
engines/hpl1/engine/graphics/Graphics.h
engines/hpl1/engine/graphics/GraphicsDrawer.h
engines/hpl1/engine/graphics/GraphicsTypes.h
engines/hpl1/engine/graphics/ImageEntityData.h
engines/hpl1/engine/graphics/LowLevelGraphics.h
engines/hpl1/engine/graphics/LowLevelPicture.h
engines/hpl1/engine/graphics/Material.cpp
engines/hpl1/engine/graphics/Material.h
engines/hpl1/engine/graphics/MaterialHandler.cpp
engines/hpl1/engine/graphics/MaterialHandler.h
engines/hpl1/engine/graphics/Material_Additive.h
engines/hpl1/engine/graphics/Material_Alpha.h
engines/hpl1/engine/graphics/Material_BaseLight.cpp
engines/hpl1/engine/graphics/Material_BaseLight.h
engines/hpl1/engine/graphics/Material_Bump.h
engines/hpl1/engine/graphics/Material_BumpColorSpec.cpp
engines/hpl1/engine/graphics/Material_BumpSpec.cpp
engines/hpl1/engine/graphics/Material_BumpSpec.h
engines/hpl1/engine/graphics/Material_BumpSpec2D.h
engines/hpl1/engine/graphics/Material_Diffuse.cpp
engines/hpl1/engine/graphics/Material_Diffuse.h
engines/hpl1/engine/graphics/Material_Diffuse2D.h
engines/hpl1/engine/graphics/Material_DiffuseAdditive2D.h
engines/hpl1/engine/graphics/Material_DiffuseAlpha2D.h
engines/hpl1/engine/graphics/Material_DiffuseSpec.h
engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.cpp
engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.h
engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.cpp
engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.h
engines/hpl1/engine/graphics/Material_Flat.h
engines/hpl1/engine/graphics/Material_FontNormal.h
engines/hpl1/engine/graphics/Material_Modulative.h
engines/hpl1/engine/graphics/Material_ModulativeX2.h
engines/hpl1/engine/graphics/Material_Smoke2D.h
engines/hpl1/engine/graphics/Material_Water.cpp
engines/hpl1/engine/graphics/Material_Water.h
engines/hpl1/engine/graphics/Mesh.cpp
engines/hpl1/engine/graphics/Mesh.h
engines/hpl1/engine/graphics/Mesh2d.h
engines/hpl1/engine/graphics/MeshCreator.cpp
engines/hpl1/engine/graphics/MeshCreator.h
engines/hpl1/engine/graphics/OcclusionQuery.h
engines/hpl1/engine/graphics/ParticleEmitter.h
engines/hpl1/engine/graphics/ParticleSystem3D.h
engines/hpl1/engine/graphics/RenderList.cpp
engines/hpl1/engine/graphics/RenderList.h
engines/hpl1/engine/graphics/RenderObject2D.h
engines/hpl1/engine/graphics/RenderState.cpp
engines/hpl1/engine/graphics/Renderable.h
engines/hpl1/engine/graphics/Renderer2D.cpp
engines/hpl1/engine/graphics/Renderer2D.h
engines/hpl1/engine/graphics/Renderer3D.cpp
engines/hpl1/engine/graphics/Renderer3D.h
engines/hpl1/engine/graphics/RendererPostEffects.cpp
engines/hpl1/engine/graphics/RendererPostEffects.h
engines/hpl1/engine/graphics/Skeleton.cpp
engines/hpl1/engine/graphics/Skeleton.h
engines/hpl1/engine/graphics/SubMesh.h
engines/hpl1/engine/graphics/Texture.h
engines/hpl1/engine/graphics/VertexBuffer.h
engines/hpl1/engine/graphics/VideoStream.h
engines/hpl1/engine/graphics/bitmap2D.cpp
engines/hpl1/engine/graphics/bitmap2D.h
engines/hpl1/engine/graphics/font_data.cpp
engines/hpl1/engine/graphics/font_data.h
engines/hpl1/engine/gui/Gui.h
engines/hpl1/engine/gui/GuiGfxElement.h
engines/hpl1/engine/gui/GuiMaterial.h
engines/hpl1/engine/gui/GuiMaterialBasicTypes.h
engines/hpl1/engine/gui/GuiPopUp.h
engines/hpl1/engine/gui/GuiPopUpMessageBox.h
engines/hpl1/engine/gui/GuiSet.cpp
engines/hpl1/engine/gui/GuiSet.h
engines/hpl1/engine/gui/GuiSkin.cpp
engines/hpl1/engine/gui/GuiSkin.h
engines/hpl1/engine/gui/GuiTypes.h
engines/hpl1/engine/gui/Widget.h
engines/hpl1/engine/gui/WidgetBaseClasses.h
engines/hpl1/engine/gui/WidgetButton.h
engines/hpl1/engine/gui/WidgetCheckBox.h
engines/hpl1/engine/gui/WidgetComboBox.cpp
engines/hpl1/engine/gui/WidgetComboBox.h
engines/hpl1/engine/gui/WidgetFrame.h
engines/hpl1/engine/gui/WidgetImage.h
engines/hpl1/engine/gui/WidgetLabel.cpp
engines/hpl1/engine/gui/WidgetLabel.h
engines/hpl1/engine/gui/WidgetListBox.h
engines/hpl1/engine/gui/WidgetSlider.h
engines/hpl1/engine/gui/WidgetTextBox.cpp
engines/hpl1/engine/gui/WidgetTextBox.h
engines/hpl1/engine/gui/WidgetWindow.h
engines/hpl1/engine/impl/CGProgram.cpp
engines/hpl1/engine/impl/CGProgram.h
engines/hpl1/engine/impl/CharacterBodyNewton.h
engines/hpl1/engine/impl/CollideShapeNewton.cpp
engines/hpl1/engine/impl/CollideShapeNewton.h
engines/hpl1/engine/impl/KeyboardSDL.cpp
engines/hpl1/engine/impl/KeyboardSDL.h
engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp
engines/hpl1/engine/impl/LowLevelGraphicsSDL.h
engines/hpl1/engine/impl/LowLevelInputSDL.cpp
engines/hpl1/engine/impl/LowLevelInputSDL.h
engines/hpl1/engine/impl/LowLevelPhysicsNewton.h
engines/hpl1/engine/impl/LowLevelSoundOpenAL.cpp
engines/hpl1/engine/impl/LowLevelSoundOpenAL.h
engines/hpl1/engine/impl/MeshLoaderCollada.cpp
engines/hpl1/engine/impl/MeshLoaderCollada.h
engines/hpl1/engine/impl/MeshLoaderColladaHelpers.cpp
engines/hpl1/engine/impl/MeshLoaderColladaLoader.cpp
engines/hpl1/engine/impl/MeshLoaderMSH.cpp
engines/hpl1/engine/impl/MeshLoaderMSH.h
engines/hpl1/engine/impl/MouseSDL.cpp
engines/hpl1/engine/impl/MouseSDL.h
engines/hpl1/engine/impl/OcclusionQueryOGL.cpp
engines/hpl1/engine/impl/OcclusionQueryOGL.h
engines/hpl1/engine/impl/OpenALSoundChannel.cpp
engines/hpl1/engine/impl/OpenALSoundChannel.h
engines/hpl1/engine/impl/OpenALSoundData.h
engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
engines/hpl1/engine/impl/PhysicsBodyNewton.h
engines/hpl1/engine/impl/PhysicsControllerNewton.h
engines/hpl1/engine/impl/PhysicsJointBallNewton.h
engines/hpl1/engine/impl/PhysicsJointHingeNewton.h
engines/hpl1/engine/impl/PhysicsJointNewton.h
engines/hpl1/engine/impl/PhysicsJointScrewNewton.h
engines/hpl1/engine/impl/PhysicsJointSliderNewton.cpp
engines/hpl1/engine/impl/PhysicsJointSliderNewton.h
engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
engines/hpl1/engine/impl/PhysicsMaterialNewton.h
engines/hpl1/engine/impl/PhysicsWorldNewton.cpp
engines/hpl1/engine/impl/PhysicsWorldNewton.h
engines/hpl1/engine/impl/SDLTexture.cpp
engines/hpl1/engine/impl/SDLTexture.h
engines/hpl1/engine/impl/SqScript.cpp
engines/hpl1/engine/impl/SqScript.h
engines/hpl1/engine/impl/VertexBufferOGL.h
engines/hpl1/engine/impl/VertexBufferVBO.cpp
engines/hpl1/engine/impl/VertexBufferVBO.h
engines/hpl1/engine/impl/low_level_graphics_tgl.cpp
engines/hpl1/engine/impl/low_level_graphics_tgl.h
engines/hpl1/engine/impl/occlusion_query_tgl.h
engines/hpl1/engine/impl/texture_tgl.cpp
engines/hpl1/engine/impl/texture_tgl.h
engines/hpl1/engine/impl/tinyXML/tinyxml.cpp
engines/hpl1/engine/impl/tinyXML/tinyxml.h
engines/hpl1/engine/impl/tinyXML/tinyxmlparser.cpp
engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
engines/hpl1/engine/impl/vertex_buffer_tgl.h
engines/hpl1/engine/input/Action.h
engines/hpl1/engine/input/ActionKeyboard.cpp
engines/hpl1/engine/input/ActionKeyboard.h
engines/hpl1/engine/input/ActionMouseButton.cpp
engines/hpl1/engine/input/ActionMouseButton.h
engines/hpl1/engine/input/Input.h
engines/hpl1/engine/input/InputDevice.h
engines/hpl1/engine/input/LowLevelInput.h
engines/hpl1/engine/math/BoundingVolume.cpp
engines/hpl1/engine/math/BoundingVolume.h
engines/hpl1/engine/math/Frustum.cpp
engines/hpl1/engine/math/Frustum.h
engines/hpl1/engine/math/Math.cpp
engines/hpl1/engine/math/Math.h
engines/hpl1/engine/math/MathTypes.h
engines/hpl1/engine/math/MeshTypes.h
engines/hpl1/engine/math/PidController.h
engines/hpl1/engine/math/Quaternion.h
engines/hpl1/engine/math/Spring.h
engines/hpl1/engine/math/Vector2.h
engines/hpl1/engine/math/Vector3.h
engines/hpl1/engine/math/hplMatrix.h
engines/hpl1/engine/physics/Body2D.h
engines/hpl1/engine/physics/CharacterBody.cpp
engines/hpl1/engine/physics/CharacterBody.h
engines/hpl1/engine/physics/CollideData.h
engines/hpl1/engine/physics/CollideData2D.h
engines/hpl1/engine/physics/CollideShape.h
engines/hpl1/engine/physics/Collider2D.cpp
engines/hpl1/engine/physics/Collider2D.h
engines/hpl1/engine/physics/LowLevelPhysics.h
engines/hpl1/engine/physics/Physics.cpp
engines/hpl1/engine/physics/Physics.h
engines/hpl1/engine/physics/PhysicsBody.cpp
engines/hpl1/engine/physics/PhysicsBody.h
engines/hpl1/engine/physics/PhysicsController.h
engines/hpl1/engine/physics/PhysicsJoint.h
engines/hpl1/engine/physics/PhysicsJointBall.h
engines/hpl1/engine/physics/PhysicsJointHinge.h
engines/hpl1/engine/physics/PhysicsJointScrew.h
engines/hpl1/engine/physics/PhysicsJointSlider.h
engines/hpl1/engine/physics/PhysicsMaterial.h
engines/hpl1/engine/physics/PhysicsWorld.cpp
engines/hpl1/engine/physics/PhysicsWorld.h
engines/hpl1/engine/physics/SurfaceData.h
engines/hpl1/engine/resources/AnimationManager.cpp
engines/hpl1/engine/resources/AnimationManager.h
engines/hpl1/engine/resources/ConfigFile.cpp
engines/hpl1/engine/resources/ConfigFile.h
engines/hpl1/engine/resources/EntityLoader_Object.cpp
engines/hpl1/engine/resources/EntityLoader_Object.h
engines/hpl1/engine/resources/FileSearcher.cpp
engines/hpl1/engine/resources/FileSearcher.h
engines/hpl1/engine/resources/FontManager.cpp
engines/hpl1/engine/resources/FontManager.h
engines/hpl1/engine/resources/FrameBase.h
engines/hpl1/engine/resources/FrameBitmap.cpp
engines/hpl1/engine/resources/FrameBitmap.h
engines/hpl1/engine/resources/FrameTexture.h
engines/hpl1/engine/resources/GpuProgramManager.h
engines/hpl1/engine/resources/ImageEntityManager.cpp
engines/hpl1/engine/resources/ImageEntityManager.h
engines/hpl1/engine/resources/ImageManager.cpp
engines/hpl1/engine/resources/ImageManager.h
engines/hpl1/engine/resources/LanguageFile.cpp
engines/hpl1/engine/resources/LanguageFile.h
engines/hpl1/engine/resources/MaterialManager.cpp
engines/hpl1/engine/resources/MaterialManager.h
engines/hpl1/engine/resources/MeshLoader.h
engines/hpl1/engine/resources/MeshLoaderHandler.cpp
engines/hpl1/engine/resources/MeshLoaderHandler.h
engines/hpl1/engine/resources/MeshManager.cpp
engines/hpl1/engine/resources/MeshManager.h
engines/hpl1/engine/resources/ParticleManager.h
engines/hpl1/engine/resources/ResourceBase.h
engines/hpl1/engine/resources/ResourceImage.h
engines/hpl1/engine/resources/ResourceManager.cpp
engines/hpl1/engine/resources/ResourceManager.h
engines/hpl1/engine/resources/Resources.cpp
engines/hpl1/engine/resources/Resources.h
engines/hpl1/engine/resources/ResourcesTypes.h
engines/hpl1/engine/resources/ScriptManager.cpp
engines/hpl1/engine/resources/ScriptManager.h
engines/hpl1/engine/resources/SoundEntityManager.cpp
engines/hpl1/engine/resources/SoundEntityManager.h
engines/hpl1/engine/resources/SoundManager.cpp
engines/hpl1/engine/resources/SoundManager.h
engines/hpl1/engine/resources/TextureManager.cpp
engines/hpl1/engine/resources/TextureManager.h
engines/hpl1/engine/resources/TileSetManager.cpp
engines/hpl1/engine/resources/TileSetManager.h
engines/hpl1/engine/resources/VideoManager.cpp
engines/hpl1/engine/resources/VideoManager.h
engines/hpl1/engine/resources/low_level_resources.cpp
engines/hpl1/engine/resources/low_level_resources.h
engines/hpl1/engine/scene/AnimationState.h
engines/hpl1/engine/scene/Area2D.h
engines/hpl1/engine/scene/Camera.h
engines/hpl1/engine/scene/Camera2D.h
engines/hpl1/engine/scene/Camera3D.h
engines/hpl1/engine/scene/ColliderEntity.h
engines/hpl1/engine/scene/Entity.h
engines/hpl1/engine/scene/Entity2D.h
engines/hpl1/engine/scene/Entity3D.h
engines/hpl1/engine/scene/GridMap2D.cpp
engines/hpl1/engine/scene/GridMap2D.h
engines/hpl1/engine/scene/ImageEntity.cpp
engines/hpl1/engine/scene/ImageEntity.h
engines/hpl1/engine/scene/Light.h
engines/hpl1/engine/scene/Light2D.h
engines/hpl1/engine/scene/Light2DPoint.h
engines/hpl1/engine/scene/Light3D.cpp
engines/hpl1/engine/scene/Light3D.h
engines/hpl1/engine/scene/Light3DPoint.h
engines/hpl1/engine/scene/Light3DSpot.cpp
engines/hpl1/engine/scene/Light3DSpot.h
engines/hpl1/engine/scene/MeshEntity.cpp
engines/hpl1/engine/scene/MeshEntity.h
engines/hpl1/engine/scene/MultiImageEntity.cpp
engines/hpl1/engine/scene/MultiImageEntity.h
engines/hpl1/engine/scene/Node.h
engines/hpl1/engine/scene/Node2D.h
engines/hpl1/engine/scene/Node3D.h
engines/hpl1/engine/scene/NodeState.h
engines/hpl1/engine/scene/PortalContainer.h
engines/hpl1/engine/scene/RenderableContainer.h
engines/hpl1/engine/scene/Scene.h
engines/hpl1/engine/scene/SectorVisibility.h
engines/hpl1/engine/scene/SoundEntity.cpp
engines/hpl1/engine/scene/SoundEntity.h
engines/hpl1/engine/scene/SoundSource.h
engines/hpl1/engine/scene/SubMeshEntity.h
engines/hpl1/engine/scene/Tile.h
engines/hpl1/engine/scene/TileData.h
engines/hpl1/engine/scene/TileLayer.h
engines/hpl1/engine/scene/TileMap.h
engines/hpl1/engine/scene/TileMapIt.h
engines/hpl1/engine/scene/TileMapLineIt.h
engines/hpl1/engine/scene/TileMapRectIt.h
engines/hpl1/engine/scene/TileSet.h
engines/hpl1/engine/scene/World2D.cpp
engines/hpl1/engine/scene/World2D.h
engines/hpl1/engine/scene/World3D.cpp
engines/hpl1/engine/scene/World3D.h
engines/hpl1/engine/sound/LowLevelSound.h
engines/hpl1/engine/sound/MusicHandler.cpp
engines/hpl1/engine/sound/MusicHandler.h
engines/hpl1/engine/sound/Sound.h
engines/hpl1/engine/sound/SoundChannel.h
engines/hpl1/engine/sound/SoundData.h
engines/hpl1/engine/sound/SoundEntityData.cpp
engines/hpl1/engine/sound/SoundEntityData.h
engines/hpl1/engine/sound/SoundHandler.cpp
engines/hpl1/engine/sound/SoundHandler.h
engines/hpl1/engine/system/BinTree.h
engines/hpl1/engine/system/Container.h
engines/hpl1/engine/system/LogicTimer.h
engines/hpl1/engine/system/MemoryManager.h
engines/hpl1/engine/system/Script.h
engines/hpl1/engine/system/SerializeClass.cpp
engines/hpl1/engine/system/SerializeClass.h
engines/hpl1/engine/system/String.cpp
engines/hpl1/engine/system/String.h
engines/hpl1/engine/system/System.cpp
engines/hpl1/engine/system/System.h
engines/hpl1/engine/system/SystemTypes.h
engines/hpl1/engine/system/low_level_system.cpp
engines/hpl1/engine/system/low_level_system.h
engines/hpl1/graphics.cpp
engines/hpl1/graphics.h
engines/hpl1/hpl1.cpp
engines/hpl1/hpl1.h
engines/hpl1/metaengine.cpp
engines/hpl1/opengl.cpp
engines/hpl1/opengl.h
engines/hpl1/penumbra-overture/AttackHandler.cpp
engines/hpl1/penumbra-overture/ButtonHandler.cpp
engines/hpl1/penumbra-overture/DemoEndText.h
engines/hpl1/penumbra-overture/EffectHandler.cpp
engines/hpl1/penumbra-overture/GameEnemy.cpp
engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
engines/hpl1/penumbra-overture/GameEnemy_Dog.h
engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
engines/hpl1/penumbra-overture/GameEnemy_Spider.h
engines/hpl1/penumbra-overture/GameEnemy_Worm.cpp
engines/hpl1/penumbra-overture/GameEntity.cpp
engines/hpl1/penumbra-overture/GameForceArea.cpp
engines/hpl1/penumbra-overture/GameItem.cpp
engines/hpl1/penumbra-overture/GameLadder.cpp
engines/hpl1/penumbra-overture/GameLiquidArea.cpp
engines/hpl1/penumbra-overture/GameObject.cpp
engines/hpl1/penumbra-overture/GameScripts.cpp
engines/hpl1/penumbra-overture/GameSwingDoor.cpp
engines/hpl1/penumbra-overture/GraphicsHelper.cpp
engines/hpl1/penumbra-overture/HudModel_Throw.cpp
engines/hpl1/penumbra-overture/HudModel_Weapon.cpp
engines/hpl1/penumbra-overture/Init.cpp
engines/hpl1/penumbra-overture/Inventory.cpp
engines/hpl1/penumbra-overture/Inventory.h
engines/hpl1/penumbra-overture/MainMenu.cpp
engines/hpl1/penumbra-overture/MapHandler.cpp
engines/hpl1/penumbra-overture/Notebook.cpp
engines/hpl1/penumbra-overture/Player.cpp
engines/hpl1/penumbra-overture/Player.h
engines/hpl1/penumbra-overture/PlayerHands.cpp
engines/hpl1/penumbra-overture/PlayerHelper.h
engines/hpl1/penumbra-overture/PlayerMoveStates.h
engines/hpl1/penumbra-overture/PlayerState_Interact.cpp
engines/hpl1/penumbra-overture/PlayerState_Misc.cpp
engines/hpl1/penumbra-overture/PlayerState_Misc.h
engines/hpl1/penumbra-overture/SaveHandler.cpp
engines/hpl1/serialize.cpp
engines/hpl1/static_string.h
engines/hpl1/std/map.h
engines/hpl1/std/multimap.h
engines/hpl1/std/multiset.h
engines/hpl1/std/set.h
engines/hpl1/string.cpp
engines/hpl1/string.h
diff --git a/engines/hpl1/algorithms.h b/engines/hpl1/algorithms.h
index 4e1d873691d..6d4e75b773c 100644
--- a/engines/hpl1/algorithms.h
+++ b/engines/hpl1/algorithms.h
@@ -34,7 +34,7 @@ void resizeAndFill(Common::Array<T> &container, const typename Common::Array<T>:
container[i] = value;
}
-template<typename RandomIt, typename V, typename Comp = Common::Less<V>>
+template<typename RandomIt, typename V, typename Comp = Common::Less<V> >
RandomIt lowerBound(RandomIt begin, RandomIt end, V const &val, Comp comp = {}) {
while (begin < end) {
const auto mid = begin + Common::distance(begin, end) / 2;
@@ -46,7 +46,7 @@ RandomIt lowerBound(RandomIt begin, RandomIt end, V const &val, Comp comp = {})
return begin;
}
-template<typename RandomIt, typename V, typename Comp = Common::Less<V>>
+template<typename RandomIt, typename V, typename Comp = Common::Less<V> >
RandomIt upperBound(RandomIt begin, RandomIt end, V const &val, Comp comp = {}) {
while (begin < end) {
const auto mid = begin + Common::distance(begin, end) / 2;
@@ -60,7 +60,7 @@ RandomIt upperBound(RandomIt begin, RandomIt end, V const &val, Comp comp = {})
template<typename RandomIt, typename Pred>
RandomIt removeIf(RandomIt begin, RandomIt end, Pred pred) {
- for(auto i = begin; i != end; ++i) {
+ for (auto i = begin; i != end; ++i) {
if (!pred(*i))
*begin++ = *i;
}
diff --git a/engines/hpl1/debug.h b/engines/hpl1/debug.h
index d036035f124..3755dd7502a 100644
--- a/engines/hpl1/debug.h
+++ b/engines/hpl1/debug.h
@@ -61,6 +61,6 @@ void logInfo(uint32 channels, const char *fmt, Args... args) {
debugCN(kDebugLevelLog, channels, fmt, args...);
}
-}
+} // namespace Hpl1
#endif
diff --git a/engines/hpl1/detection.cpp b/engines/hpl1/detection.cpp
index d6ca4b23305..9e5f2feab68 100644
--- a/engines/hpl1/detection.cpp
+++ b/engines/hpl1/detection.cpp
@@ -19,31 +19,30 @@
*
*/
+#include "hpl1/detection.h"
#include "base/plugins.h"
#include "common/config-manager.h"
#include "common/file.h"
#include "common/md5.h"
#include "common/str-array.h"
#include "common/util.h"
-#include "hpl1/detection.h"
-#include "hpl1/detection_tables.h"
#include "hpl1/debug.h"
+#include "hpl1/detection_tables.h"
const DebugChannelDef Hpl1MetaEngineDetection::debugFlagList[] = {
- { Hpl1::kDebugGraphics, "Graphics", "Graphics debug channel" },
- { Hpl1::kDebugResourceLoading, "ResourceLoading", "Resource loading debug channel" },
- { Hpl1::kDebugFilePath, "FilePath", "File path debug channel" },
- { Hpl1::kDebugOpenGL, "OpenGL", "OpenGL debug channel"},
- { Hpl1::kDebugRenderer, "Renderer", "Rederer debug channel"},
- { Hpl1::kDebugAudio, "Audio", "Audio debug channel"},
- { Hpl1::kDebugSaves, "Saves", "Channel for debugging game saving and loading"},
- { Hpl1::kDebugTextures, "Textures", "Texture debug channel"},
- { Hpl1::kDebugScripts, "Scripts", "Scripts debug channel"},
- DEBUG_CHANNEL_END
-};
+ {Hpl1::kDebugGraphics, "Graphics", "Graphics debug channel"},
+ {Hpl1::kDebugResourceLoading, "ResourceLoading", "Resource loading debug channel"},
+ {Hpl1::kDebugFilePath, "FilePath", "File path debug channel"},
+ {Hpl1::kDebugOpenGL, "OpenGL", "OpenGL debug channel"},
+ {Hpl1::kDebugRenderer, "Renderer", "Rederer debug channel"},
+ {Hpl1::kDebugAudio, "Audio", "Audio debug channel"},
+ {Hpl1::kDebugSaves, "Saves", "Channel for debugging game saving and loading"},
+ {Hpl1::kDebugTextures, "Textures", "Texture debug channel"},
+ {Hpl1::kDebugScripts, "Scripts", "Scripts debug channel"},
+ DEBUG_CHANNEL_END};
Hpl1MetaEngineDetection::Hpl1MetaEngineDetection() : AdvancedMetaEngineDetection(Hpl1::GAME_DESCRIPTIONS,
- sizeof(ADGameDescription), Hpl1::GAME_NAMES) {
+ sizeof(ADGameDescription), Hpl1::GAME_NAMES) {
}
REGISTER_PLUGIN_STATIC(HPL1_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, Hpl1MetaEngineDetection);
diff --git a/engines/hpl1/detection_tables.h b/engines/hpl1/detection_tables.h
index 804d1db8265..22c09502dc7 100644
--- a/engines/hpl1/detection_tables.h
+++ b/engines/hpl1/detection_tables.h
@@ -34,8 +34,7 @@ const ADGameDescription GAME_DESCRIPTIONS[] = {
Common::Language::EN_ANY,
Common::Platform::kPlatformWindows,
ADGF_UNSTABLE,
- GUIO0()
- },
+ GUIO0()},
// GOG release
{
"penumbraoverture",
@@ -44,8 +43,7 @@ const ADGameDescription GAME_DESCRIPTIONS[] = {
Common::Language::EN_ANY,
Common::Platform::kPlatformWindows,
ADGF_UNSTABLE,
- GUIO0()
- },
+ GUIO0()},
AD_TABLE_END_MARKER};
diff --git a/engines/hpl1/engine/ai/AI.cpp b/engines/hpl1/engine/ai/AI.cpp
index 25c54c059e5..2a106b4ca93 100644
--- a/engines/hpl1/engine/ai/AI.cpp
+++ b/engines/hpl1/engine/ai/AI.cpp
@@ -28,8 +28,8 @@
#include "hpl1/engine/ai/AI.h"
#include "hpl1/engine/ai/AINodeGenerator.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/MemoryManager.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/ai/AI.h b/engines/hpl1/engine/ai/AI.h
index ed9b9595728..31919a46a23 100644
--- a/engines/hpl1/engine/ai/AI.h
+++ b/engines/hpl1/engine/ai/AI.h
@@ -53,6 +53,6 @@ private:
cAINodeGenerator *mpAINodeGenerator;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_AI_H
diff --git a/engines/hpl1/engine/ai/AINodeContainer.cpp b/engines/hpl1/engine/ai/AINodeContainer.cpp
index 460dd70c7c0..7ec1c88f7d3 100644
--- a/engines/hpl1/engine/ai/AINodeContainer.cpp
+++ b/engines/hpl1/engine/ai/AINodeContainer.cpp
@@ -29,8 +29,8 @@
#include "hpl1/engine/physics/PhysicsBody.h"
#include "hpl1/engine/scene/World3D.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/math/Math.h"
diff --git a/engines/hpl1/engine/ai/AINodeContainer.h b/engines/hpl1/engine/ai/AINodeContainer.h
index 39f24742da0..1148a96d432 100644
--- a/engines/hpl1/engine/ai/AINodeContainer.h
+++ b/engines/hpl1/engine/ai/AINodeContainer.h
@@ -31,9 +31,9 @@
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "hpl1/engine/physics/PhysicsWorld.h"
-#include "common/list.h"
#include "common/array.h"
+#include "common/list.h"
+#include "hpl1/engine/physics/PhysicsWorld.h"
namespace hpl {
@@ -298,6 +298,6 @@ private:
float mfMaxHeight;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_AI_NODE_CONTAINER_H
diff --git a/engines/hpl1/engine/ai/AINodeGenerator.cpp b/engines/hpl1/engine/ai/AINodeGenerator.cpp
index 465514a14bf..24f1966175c 100644
--- a/engines/hpl1/engine/ai/AINodeGenerator.cpp
+++ b/engines/hpl1/engine/ai/AINodeGenerator.cpp
@@ -29,9 +29,9 @@
#include "hpl1/engine/scene/World3D.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/Resources.h"
@@ -102,7 +102,7 @@ cAINodeGenerator::~cAINodeGenerator() {
//-----------------------------------------------------------------------
-//static cCollideRayCallback gCollideRayCallback;
+// static cCollideRayCallback gCollideRayCallback;
//-----------------------------------------------------------------------
@@ -112,9 +112,9 @@ void cAINodeGenerator::Generate(cWorld3D *apWorld, cAINodeGeneratorParams *apPar
iPhysicsWorld *pPhysicsWorld = apWorld->GetPhysicsWorld();
- //bool mbLoadFromFile = false;
+ // bool mbLoadFromFile = false;
- /*cSystem *pSystem = */apWorld->GetSystem();
+ /*cSystem *pSystem = */ apWorld->GetSystem();
cResources *pResources = apWorld->GetResources();
cFileSearcher *pFileSearcher = pResources->GetFileSearcher();
@@ -260,7 +260,7 @@ bool cAINodeGenerator::OnIntersect(iPhysicsBody *pBody, cPhysicsRayParams *apPar
if (pBody->GetMass() != 0)
return true;
- /*iPhysicsWorld *pPhysicsWorld = */mpWorld->GetPhysicsWorld();
+ /*iPhysicsWorld *pPhysicsWorld = */ mpWorld->GetPhysicsWorld();
cVector3f vPosition = apParams->mvPoint + cVector3f(0, mpParams->mfHeightFromGround, 0);
@@ -275,7 +275,7 @@ void cAINodeGenerator::SaveToFile() {
if (mpWorld->GetFileName() == "")
return;
- /*cSystem *pSystem = */mpWorld->GetSystem();
+ /*cSystem *pSystem = */ mpWorld->GetSystem();
cResources *pResources = mpWorld->GetResources();
cFileSearcher *pFileSearcher = pResources->GetFileSearcher();
@@ -310,7 +310,7 @@ void cAINodeGenerator::LoadFromFile() {
if (mpWorld->GetFileName() == "")
return;
- /*cSystem *pSystem = */mpWorld->GetSystem();
+ /*cSystem *pSystem = */ mpWorld->GetSystem();
cResources *pResources = mpWorld->GetResources();
cFileSearcher *pFileSearcher = pResources->GetFileSearcher();
diff --git a/engines/hpl1/engine/ai/AINodeGenerator.h b/engines/hpl1/engine/ai/AINodeGenerator.h
index f7de91806d5..dc6464b0269 100644
--- a/engines/hpl1/engine/ai/AINodeGenerator.h
+++ b/engines/hpl1/engine/ai/AINodeGenerator.h
@@ -86,6 +86,6 @@ private:
cCollideRayCallback _rayCallback;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_AI_NODE_GENERATOR_H
diff --git a/engines/hpl1/engine/ai/AStar.h b/engines/hpl1/engine/ai/AStar.h
index 8c38423c8e2..9734d9eaabb 100644
--- a/engines/hpl1/engine/ai/AStar.h
+++ b/engines/hpl1/engine/ai/AStar.h
@@ -28,10 +28,10 @@
#ifndef HPL_A_STAR_H
#define HPL_A_STAR_H
+#include "common/list.h"
#include "hpl1/engine/game/GameTypes.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
namespace hpl {
@@ -123,6 +123,6 @@ private:
tAStarNodeSet m_setClosedList;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_A_STAR_H
diff --git a/engines/hpl1/engine/ai/StateMachine.h b/engines/hpl1/engine/ai/StateMachine.h
index c6820630840..f5e8105aec4 100644
--- a/engines/hpl1/engine/ai/StateMachine.h
+++ b/engines/hpl1/engine/ai/StateMachine.h
@@ -103,6 +103,6 @@ private:
iAIState *mpCurrentState;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_STATE_MACHINE_H
diff --git a/engines/hpl1/engine/engine.h b/engines/hpl1/engine/engine.h
index 66bb7ca24a1..768f9493676 100644
--- a/engines/hpl1/engine/engine.h
+++ b/engines/hpl1/engine/engine.h
@@ -29,21 +29,19 @@
#include "hpl1/engine/ai/StateMachine.h"
#include "hpl1/engine/game/Game.h"
#include "hpl1/engine/game/GameTypes.h"
-#include "hpl1/engine/game/low_level_game_setup.h"
#include "hpl1/engine/game/SaveGame.h"
#include "hpl1/engine/game/ScriptFuncs.h"
#include "hpl1/engine/game/Updateable.h"
#include "hpl1/engine/game/Updater.h"
+#include "hpl1/engine/game/low_level_game_setup.h"
#include "hpl1/engine/graphics/Animation.h"
#include "hpl1/engine/graphics/AnimationTrack.h"
#include "hpl1/engine/graphics/BackgroundImage.h"
#include "hpl1/engine/graphics/Beam.h"
#include "hpl1/engine/graphics/BillBoard.h"
-#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/graphics/Bone.h"
#include "hpl1/engine/graphics/BoneState.h"
#include "hpl1/engine/graphics/Color.h"
-#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/graphics/GPUProgram.h"
#include "hpl1/engine/graphics/GfxObject.h"
#include "hpl1/engine/graphics/Graphics.h"
@@ -96,6 +94,8 @@
#include "hpl1/engine/graphics/Texture.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
#include "hpl1/engine/graphics/VideoStream.h"
+#include "hpl1/engine/graphics/bitmap2D.h"
+#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/gui/Gui.h"
#include "hpl1/engine/gui/GuiGfxElement.h"
#include "hpl1/engine/gui/GuiMaterial.h"
@@ -131,13 +131,13 @@
#include "hpl1/engine/math/Frustum.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "hpl1/engine/math/hplMatrix.h"
#include "hpl1/engine/math/MeshTypes.h"
#include "hpl1/engine/math/PidController.h"
#include "hpl1/engine/math/Quaternion.h"
#include "hpl1/engine/math/Spring.h"
#include "hpl1/engine/math/Vector2.h"
#include "hpl1/engine/math/Vector3.h"
+#include "hpl1/engine/math/hplMatrix.h"
#include "hpl1/engine/physics/Body2D.h"
#include "hpl1/engine/physics/CharacterBody.h"
#include "hpl1/engine/physics/CollideData.h"
@@ -168,7 +168,6 @@
#include "hpl1/engine/resources/ImageEntityManager.h"
#include "hpl1/engine/resources/ImageManager.h"
#include "hpl1/engine/resources/LanguageFile.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/MaterialManager.h"
#include "hpl1/engine/resources/MeshLoader.h"
#include "hpl1/engine/resources/MeshLoaderHandler.h"
@@ -185,6 +184,7 @@
#include "hpl1/engine/resources/TextureManager.h"
#include "hpl1/engine/resources/TileSetManager.h"
#include "hpl1/engine/resources/VideoManager.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/scene/AnimationState.h"
#include "hpl1/engine/scene/Area2D.h"
#include "hpl1/engine/scene/Camera.h"
@@ -236,12 +236,12 @@
#include "hpl1/engine/system/BinTree.h"
#include "hpl1/engine/system/Container.h"
#include "hpl1/engine/system/LogicTimer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/MemoryManager.h"
#include "hpl1/engine/system/Script.h"
#include "hpl1/engine/system/SerializeClass.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
#include "hpl1/engine/system/SystemTypes.h"
+#include "hpl1/engine/system/low_level_system.h"
#endif
diff --git a/engines/hpl1/engine/game/Game.cpp b/engines/hpl1/engine/game/Game.cpp
index 015c67b76a0..3437db7c480 100644
--- a/engines/hpl1/engine/game/Game.cpp
+++ b/engines/hpl1/engine/game/Game.cpp
@@ -334,9 +334,9 @@ void cGame::Run() {
// reset the mouse, really reset the damn thing :P
for (int i = 0; i < 10; i++)
- //mpInput->GetMouse()->Reset();
+ // mpInput->GetMouse()->Reset();
- Log("Game Running\n");
+ Log("Game Running\n");
Log("--------------------------------------------------------\n");
mfFrameTime = 0;
@@ -422,7 +422,7 @@ void cGame::Run() {
// Log("----\nCreations made: %d\n------\n",cMemoryManager::GetCreationCount());
//}
- //g_system->delayMillis(10);
+ // g_system->delayMillis(10);
}
Log("--------------------------------------------------------\n\n");
diff --git a/engines/hpl1/engine/game/Game.h b/engines/hpl1/engine/game/Game.h
index adf79cc3f64..1c85df6dc38 100644
--- a/engines/hpl1/engine/game/Game.h
+++ b/engines/hpl1/engine/game/Game.h
@@ -220,6 +220,6 @@ private:
cGui *mpGui;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GAME_H
diff --git a/engines/hpl1/engine/game/GameTypes.h b/engines/hpl1/engine/game/GameTypes.h
index c6bb345f379..d58fec19850 100644
--- a/engines/hpl1/engine/game/GameTypes.h
+++ b/engines/hpl1/engine/game/GameTypes.h
@@ -28,7 +28,6 @@
#ifndef HPL_GAME_TYPES_H
#define HPL_GAME_TYPES_H
-
#include "hpl1/engine/system/SerializeClass.h"
#include "hpl1/std/map.h"
diff --git a/engines/hpl1/engine/game/SaveGame.h b/engines/hpl1/engine/game/SaveGame.h
index 596fc3b7f7e..dc161dd384f 100644
--- a/engines/hpl1/engine/game/SaveGame.h
+++ b/engines/hpl1/engine/game/SaveGame.h
@@ -35,13 +35,13 @@
class TiXmlElement;
-#define kSaveData_LoadFromBegin(aClass) \
- super::LoadFromSaveData(apSaveData); \
+#define kSaveData_LoadFromBegin(aClass) \
+ super::LoadFromSaveData(apSaveData); \
cSaveData_##aClass *pData = static_cast<cSaveData_##aClass *>(apSaveData); \
assert(pData != nullptr);
-#define kSaveData_SaveToBegin(aClass) \
- super::SaveToSaveData(apSaveData); \
+#define kSaveData_SaveToBegin(aClass) \
+ super::SaveToSaveData(apSaveData); \
cSaveData_##aClass *pData = static_cast<cSaveData_##aClass *>(apSaveData); \
assert(pData != nullptr);
@@ -234,6 +234,6 @@ private:
//---------------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SAVE_GAME_H
diff --git a/engines/hpl1/engine/game/ScriptFuncs.cpp b/engines/hpl1/engine/game/ScriptFuncs.cpp
index f6a15bc6616..df11b9875d0 100644
--- a/engines/hpl1/engine/game/ScriptFuncs.cpp
+++ b/engines/hpl1/engine/game/ScriptFuncs.cpp
@@ -58,10 +58,10 @@
#include "hpl1/engine/sound/SoundData.h"
#include "hpl1/engine/sound/SoundEntityData.h"
#include "hpl1/engine/sound/SoundHandler.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/Script.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -394,7 +394,7 @@ SCRIPT_DEFINE_FUNC_2(void, SetParticleSystemActive, string, bool)
* \param X Y and Z the variables of the particle system.
**/
static void CreateParticleSystem(tString asName, tString asType, tString asArea,
- float afX, float afY, float afZ) {
+ float afX, float afY, float afZ) {
cAreaEntity *pArea = gpScene->GetWorld3D()->GetAreaEntity(asArea);
if (pArea == NULL) {
Warning("Couldn't find area '%s'\n", asArea.c_str());
@@ -456,7 +456,7 @@ SCRIPT_DEFINE_FUNC_1(void, KillParticleSystem, string)
* \param asEndArea
*/
static void CreateBeam(tString asName, tString asFile,
- tString asStartArea, tString asEndArea) {
+ tString asStartArea, tString asEndArea) {
cAreaEntity *pStartArea = gpScene->GetWorld3D()->GetAreaEntity(asStartArea);
if (pStartArea == NULL) {
Warning("Couldn't find area '%s'\n", asStartArea.c_str());
@@ -518,7 +518,7 @@ SCRIPT_DEFINE_FUNC_1(void, DestroyBeam, string)
* \param afTime The amount of seconds the fade should last.
**/
static void FadeLight3D(tString asName, float afR, float afG, float afB, float afA,
- float afRadius, float afTime) {
+ float afRadius, float afTime) {
iLight3D *pLight = gpScene->GetWorld3D()->GetLight(asName);
if (pLight == NULL) {
Warning("Couldn't find light '%s'\n", asName.c_str());
@@ -633,17 +633,17 @@ SCRIPT_DEFINE_FUNC_2(void, SetLight3DFlickerActive, string, bool)
* \param afOffFadeLength Fade length from on to off.
**/
static void SetLight3DFlicker(tString asName,
- float afR, float afG, float afB, float afA,
- float afRadius,
+ float afR, float afG, float afB, float afA,
+ float afRadius,
- float afOnMinLength, float afOnMaxLength,
- tString asOnSound, tString asOnPS,
+ float afOnMinLength, float afOnMaxLength,
+ tString asOnSound, tString asOnPS,
- float afOffMinLength, float afOffMaxLength,
- tString asOffSound, tString asOffPS,
+ float afOffMinLength, float afOffMaxLength,
+ tString asOffSound, tString asOffPS,
- bool abFade,
- float afOnFadeLength, float afOffFadeLength) {
+ bool abFade,
+ float afOnFadeLength, float afOffFadeLength) {
iLight3D *pLight = gpScene->GetWorld3D()->GetLight(asName);
if (pLight == NULL) {
Warning("Couldn't find light '%s'\n", asName.c_str());
@@ -674,7 +674,7 @@ SCRIPT_DEFINE_FUNC_17(void, SetLight3DFlicker, string,
* \param asArea The area to create at.
*/
static void CreateSoundEntity(tString asName, tString asFile,
- tString asArea) {
+ tString asArea) {
cAreaEntity *pArea = gpScene->GetWorld3D()->GetAreaEntity(asArea);
if (pArea == NULL) {
Warning("Couldn't find area '%s'\n", asArea.c_str());
@@ -798,7 +798,7 @@ SCRIPT_DEFINE_FUNC_2(void, PlayGuiSound, string, float)
* \param asFunc The script function to be called. Must be in the current script file. "" = disabled.
**/
static void SetJointCallback(tString asJointName, tString asType,
- tString asFunc) {
+ tString asFunc) {
iPhysicsJoint *pJoint = gpScene->GetWorld3D()->GetPhysicsWorld()->GetJoint(asJointName);
if (pJoint == NULL) {
Warning("Couldn't find joint '%s'\n", asJointName.c_str());
@@ -903,7 +903,7 @@ SCRIPT_DEFINE_FUNC_2(void, ChangeJointController, string, string)
* \param afValue Value to set it to.
**/
static void SetJointControllerPropertyFloat(tString asJointName, tString asCtrlName,
- tString asProperty, float afValue) {
+ tString asProperty, float afValue) {
iPhysicsJoint *pJoint = gpScene->GetWorld3D()->GetPhysicsWorld()->GetJoint(asJointName);
if (pJoint == NULL) {
Warning("Couldn't find joint '%s'\n", asJointName.c_str());
@@ -1197,7 +1197,7 @@ SCRIPT_DEFINE_FUNC_3(void, SetJointProperty, string, string, float)
* \param afZ force in the z direction. (in newton, kg*m/s^2)
**/
static void AddBodyForce(tString asBodyName, tString asCoordType,
- float afX, float afY, float afZ) {
+ float afX, float afY, float afZ) {
iPhysicsBody *pBody = gpScene->GetWorld3D()->GetPhysicsWorld()->GetBody(asBodyName);
if (pBody == NULL) {
Warning("Couldn't find Body '%s'\n", asBodyName.c_str());
@@ -1238,7 +1238,7 @@ SCRIPT_DEFINE_FUNC_5(void, AddBodyForce, string, string, float, float, float)
* \param afZ velocity in the z direction. (in m/s)
**/
static void AddBodyImpulse(tString asBodyName, tString asCoordType,
- float afX, float afY, float afZ) {
+ float afX, float afY, float afZ) {
iPhysicsBody *pBody = gpScene->GetWorld3D()->GetPhysicsWorld()->GetBody(asBodyName);
if (pBody == NULL) {
Warning("Couldn't find Body '%s'\n", asBodyName.c_str());
diff --git a/engines/hpl1/engine/game/ScriptFuncs.h b/engines/hpl1/engine/game/ScriptFuncs.h
index c64e73411cf..239a3649d7e 100644
--- a/engines/hpl1/engine/game/ScriptFuncs.h
+++ b/engines/hpl1/engine/game/ScriptFuncs.h
@@ -70,6 +70,6 @@ public:
cGame *apGame);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SCRIPT_FUNCS_H
diff --git a/engines/hpl1/engine/game/Updater.h b/engines/hpl1/engine/game/Updater.h
index 89b65b75ca4..e1676b622f9 100644
--- a/engines/hpl1/engine/game/Updater.h
+++ b/engines/hpl1/engine/game/Updater.h
@@ -28,8 +28,8 @@
#ifndef HPL_UPDATER_H
#define HPL_UPDATER_H
-#include "hpl1/engine/system/SystemTypes.h"
#include "common/list.h"
+#include "hpl1/engine/system/SystemTypes.h"
#include "hpl1/std/map.h"
namespace hpl {
@@ -105,6 +105,6 @@ private:
tUpdateableList mlstGlobalUpdateableList;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_UPDATER_H
diff --git a/engines/hpl1/engine/game/low_level_game_setup.cpp b/engines/hpl1/engine/game/low_level_game_setup.cpp
index 76256dd73c5..0a99b3c5445 100644
--- a/engines/hpl1/engine/game/low_level_game_setup.cpp
+++ b/engines/hpl1/engine/game/low_level_game_setup.cpp
@@ -20,21 +20,20 @@
*/
#include "hpl1/engine/game/low_level_game_setup.h"
-#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/impl/low_level_graphics_tgl.h"
#include "hpl1/engine/impl/KeyboardSDL.h"
#include "hpl1/engine/impl/LowLevelGraphicsSDL.h"
#include "hpl1/engine/impl/LowLevelInputSDL.h"
#include "hpl1/engine/impl/LowLevelPhysicsNewton.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/impl/LowLevelSoundOpenAL.h"
#include "hpl1/engine/impl/MouseSDL.h"
+#include "hpl1/engine/impl/low_level_graphics_tgl.h"
+#include "hpl1/engine/resources/low_level_resources.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/graphics.h"
namespace hpl {
-static iLowLevelGraphics *createLowLevelGfx()
-{
+static iLowLevelGraphics *createLowLevelGfx() {
#ifdef USE_OPENGL
if (Hpl1::useOpenGL())
return hplNew(cLowLevelGraphicsSDL, ());
diff --git a/engines/hpl1/engine/game/low_level_game_setup.h b/engines/hpl1/engine/game/low_level_game_setup.h
index 89f50d67443..a73a53ab679 100644
--- a/engines/hpl1/engine/game/low_level_game_setup.h
+++ b/engines/hpl1/engine/game/low_level_game_setup.h
@@ -49,10 +49,11 @@ public:
cGraphics *createGraphics();
cResources *createResources(cGraphics *graphics);
cScene *createScene(cGraphics *graphics, cResources *resources, cSound *sound,
- cPhysics *physics, cSystem *system, cAI *ai);
+ cPhysics *physics, cSystem *system, cAI *ai);
cSound *createSound();
cPhysics *createPhysics();
cAI *createAi();
+
private:
LowLevelSystem *_lowLevelSystem;
iLowLevelGraphics *_lowLevelGraphics;
@@ -62,6 +63,6 @@ private:
iLowLevelPhysics *_lowLevelPhysics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELGAMESETUP_H
diff --git a/engines/hpl1/engine/graphics/Animation.h b/engines/hpl1/engine/graphics/Animation.h
index 5ac18322f1c..27dc24b825c 100644
--- a/engines/hpl1/engine/graphics/Animation.h
+++ b/engines/hpl1/engine/graphics/Animation.h
@@ -28,11 +28,11 @@
#ifndef HPL_ANIMATION_H
#define HPL_ANIMATION_H
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/resources/ResourceBase.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
namespace hpl {
@@ -74,6 +74,6 @@ private:
tAnimationTrackVec mvTracks;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ANIMATION_H
diff --git a/engines/hpl1/engine/graphics/AnimationTrack.cpp b/engines/hpl1/engine/graphics/AnimationTrack.cpp
index 725aa044dd5..932bdfb18ff 100644
--- a/engines/hpl1/engine/graphics/AnimationTrack.cpp
+++ b/engines/hpl1/engine/graphics/AnimationTrack.cpp
@@ -159,7 +159,7 @@ float cAnimationTrack::GetKeyFramesAtTime(float afTime, cKeyFrame **apKeyFrameA,
// Get T between end to start again. (the last frame doesn't mean the anim is over.
// In that case wrap to the first frame).
- //float fDeltaT = fTotalAnimLength - (*apKeyFrameA)->time;
+ // float fDeltaT = fTotalAnimLength - (*apKeyFrameA)->time;
// If animation time is >= max time might as well just return the last frame.
// Not sure if this is good for some looping anims, in that case check the code.
diff --git a/engines/hpl1/engine/graphics/AnimationTrack.h b/engines/hpl1/engine/graphics/AnimationTrack.h
index 8b346cf5fba..1893f374ac8 100644
--- a/engines/hpl1/engine/graphics/AnimationTrack.h
+++ b/engines/hpl1/engine/graphics/AnimationTrack.h
@@ -97,6 +97,6 @@ private:
cAnimation *mpParent;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ANIMATION_TRACK_H
diff --git a/engines/hpl1/engine/graphics/BackgroundImage.h b/engines/hpl1/engine/graphics/BackgroundImage.h
index 2c8b2dbcc44..04a0d9ef18d 100644
--- a/engines/hpl1/engine/graphics/BackgroundImage.h
+++ b/engines/hpl1/engine/graphics/BackgroundImage.h
@@ -60,6 +60,6 @@ private:
typedef Hpl1::Std::map<float, cBackgroundImage *> tBackgroundImageMap;
typedef tBackgroundImageMap::iterator tBackgroundImageMapIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BACKGROUND_IMAGE_H
diff --git a/engines/hpl1/engine/graphics/Beam.h b/engines/hpl1/engine/graphics/Beam.h
index 6042fa4fb52..f2d83705b13 100644
--- a/engines/hpl1/engine/graphics/Beam.h
+++ b/engines/hpl1/engine/graphics/Beam.h
@@ -167,6 +167,6 @@ private:
cColor mColor;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BEAM_H
diff --git a/engines/hpl1/engine/graphics/BillBoard.h b/engines/hpl1/engine/graphics/BillBoard.h
index a0c46ea52aa..427a28912be 100644
--- a/engines/hpl1/engine/graphics/BillBoard.h
+++ b/engines/hpl1/engine/graphics/BillBoard.h
@@ -182,6 +182,6 @@ private:
float mfHaloAlpha;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BILLBOARD_H
diff --git a/engines/hpl1/engine/graphics/Bone.h b/engines/hpl1/engine/graphics/Bone.h
index d0ba115527a..310a61fb730 100644
--- a/engines/hpl1/engine/graphics/Bone.h
+++ b/engines/hpl1/engine/graphics/Bone.h
@@ -28,10 +28,10 @@
#ifndef HPL_BONE_H
#define HPL_BONE_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
#include "hpl1/std/map.h"
namespace hpl {
@@ -92,6 +92,6 @@ private:
int mlValue;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BONE_H
diff --git a/engines/hpl1/engine/graphics/BoneState.h b/engines/hpl1/engine/graphics/BoneState.h
index d1d914c5bad..f9eb34eab17 100644
--- a/engines/hpl1/engine/graphics/BoneState.h
+++ b/engines/hpl1/engine/graphics/BoneState.h
@@ -56,6 +56,6 @@ private:
iPhysicsBody *mpColliderBody;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BONE_STATE_H
diff --git a/engines/hpl1/engine/graphics/Color.h b/engines/hpl1/engine/graphics/Color.h
index f176d3b2906..510709de98f 100644
--- a/engines/hpl1/engine/graphics/Color.h
+++ b/engines/hpl1/engine/graphics/Color.h
@@ -28,9 +28,9 @@
#ifndef HPL_COLOR_H
#define HPL_COLOR_H
-#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
#include "common/array.h"
+#include "common/list.h"
+#include "hpl1/engine/system/SystemTypes.h"
namespace hpl {
@@ -67,6 +67,6 @@ typedef tColorList::iterator tColorListIt;
typedef Common::Array<cColor> tColorVec;
typedef tColorVec::iterator tColorVecIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLOR_H
diff --git a/engines/hpl1/engine/graphics/GPUProgram.h b/engines/hpl1/engine/graphics/GPUProgram.h
index 42d9cad10f5..6ae17688324 100644
--- a/engines/hpl1/engine/graphics/GPUProgram.h
+++ b/engines/hpl1/engine/graphics/GPUProgram.h
@@ -99,10 +99,11 @@ public:
virtual bool SetMatrixf(const tString &asName, const cMatrixf &mMtx) = 0;
virtual bool SetMatrixf(const tString &asName, eGpuProgramMatrix mType,
eGpuProgramMatrixOp mOp) = 0;
+
protected:
static bool mbDebugInfo;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GPU_PROGRAM_H
diff --git a/engines/hpl1/engine/graphics/GfxObject.h b/engines/hpl1/engine/graphics/GfxObject.h
index 4292656d850..25c1532ce16 100644
--- a/engines/hpl1/engine/graphics/GfxObject.h
+++ b/engines/hpl1/engine/graphics/GfxObject.h
@@ -28,8 +28,8 @@
#ifndef HPL_GFX_OBJECT_H
#define HPL_GFX_OBJECT_H
-#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "common/array.h"
+#include "hpl1/engine/graphics/GraphicsTypes.h"
namespace hpl {
@@ -51,7 +51,7 @@ public:
private:
tVertexVec mvVtx;
iMaterial *mpMat;
- //float mfZ;
+ // float mfZ;
bool mbIsImage;
tString msSourceFile;
@@ -60,6 +60,6 @@ private:
typedef Common::Array<cGfxObject> tGfxObjectVec;
typedef tGfxObjectVec::iterator tGfxObjectVecIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GFX_OBJECT_H
diff --git a/engines/hpl1/engine/graphics/Graphics.cpp b/engines/hpl1/engine/graphics/Graphics.cpp
index d34a4d25612..0b7af21b405 100644
--- a/engines/hpl1/engine/graphics/Graphics.cpp
+++ b/engines/hpl1/engine/graphics/Graphics.cpp
@@ -36,8 +36,8 @@
#include "hpl1/engine/graphics/Renderer2D.h"
#include "hpl1/engine/graphics/Renderer3D.h"
#include "hpl1/engine/graphics/RendererPostEffects.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/Resources.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/system/low_level_system.h"
// 2D Materials
diff --git a/engines/hpl1/engine/graphics/Graphics.h b/engines/hpl1/engine/graphics/Graphics.h
index 3aede921b43..677c05e3f99 100644
--- a/engines/hpl1/engine/graphics/Graphics.h
+++ b/engines/hpl1/engine/graphics/Graphics.h
@@ -81,6 +81,6 @@ private:
cRenderList *mpRenderList;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GRAPHICS_H
diff --git a/engines/hpl1/engine/graphics/GraphicsDrawer.h b/engines/hpl1/engine/graphics/GraphicsDrawer.h
index 71cb457b25a..787a0c3edc6 100644
--- a/engines/hpl1/engine/graphics/GraphicsDrawer.h
+++ b/engines/hpl1/engine/graphics/GraphicsDrawer.h
@@ -28,10 +28,10 @@
#ifndef HPL_GRAPHICSDRAWER_H
#define HPL_GRAPHICSDRAWER_H
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/graphics/BackgroundImage.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
-#include "common/list.h"
-#include "common/array.h"
#include "hpl1/std/multiset.h"
namespace hpl {
@@ -151,6 +151,6 @@ private:
tBackgroundImageMap m_mapBackgroundImages;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GRAPHICSDRAWER_H
diff --git a/engines/hpl1/engine/graphics/GraphicsTypes.h b/engines/hpl1/engine/graphics/GraphicsTypes.h
index 9e52ff938e5..611e2083111 100644
--- a/engines/hpl1/engine/graphics/GraphicsTypes.h
+++ b/engines/hpl1/engine/graphics/GraphicsTypes.h
@@ -28,10 +28,10 @@
#ifndef HPL_GRAPHICSTYPES_H
#define HPL_GRAPHICSTYPES_H
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/graphics/Color.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "common/list.h"
-#include "common/array.h"
namespace hpl {
diff --git a/engines/hpl1/engine/graphics/ImageEntityData.h b/engines/hpl1/engine/graphics/ImageEntityData.h
index a969389586a..d36c0828ea6 100644
--- a/engines/hpl1/engine/graphics/ImageEntityData.h
+++ b/engines/hpl1/engine/graphics/ImageEntityData.h
@@ -125,6 +125,6 @@ private:
void GetFrameNum(TiXmlElement *apElement);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_IMAGE_ENTITY_DATA_H
diff --git a/engines/hpl1/engine/graphics/LowLevelGraphics.h b/engines/hpl1/engine/graphics/LowLevelGraphics.h
index f843452b785..3738d34c69e 100644
--- a/engines/hpl1/engine/graphics/LowLevelGraphics.h
+++ b/engines/hpl1/engine/graphics/LowLevelGraphics.h
@@ -28,11 +28,11 @@
#ifndef HPL_LOWLEVELGRAPHICS_H
#define HPL_LOWLEVELGRAPHICS_H
-#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/graphics/GPUProgram.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/Texture.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
+#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
@@ -421,6 +421,6 @@ public:
virtual void SwapBuffers() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELGRAPHICS_H
diff --git a/engines/hpl1/engine/graphics/LowLevelPicture.h b/engines/hpl1/engine/graphics/LowLevelPicture.h
index 2f555f4df18..4dbf8de7f8e 100644
--- a/engines/hpl1/engine/graphics/LowLevelPicture.h
+++ b/engines/hpl1/engine/graphics/LowLevelPicture.h
@@ -28,9 +28,9 @@
#ifndef HPL_LOWLEVEL_PICTURE_H
#define HPL_LOWLEVEL_PICTURE_H
+#include "common/system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/system.h"
namespace hpl {
@@ -61,6 +61,6 @@ private:
tString _path;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVEL_PICTURE_H
diff --git a/engines/hpl1/engine/graphics/Material.cpp b/engines/hpl1/engine/graphics/Material.cpp
index 550c93b7742..6acde5e92bc 100644
--- a/engines/hpl1/engine/graphics/Material.cpp
+++ b/engines/hpl1/engine/graphics/Material.cpp
@@ -33,8 +33,8 @@
#include "hpl1/engine/resources/ImageManager.h"
#include "hpl1/engine/resources/TextureManager.h"
#include "hpl1/engine/scene/Camera.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/graphics/Material.h b/engines/hpl1/engine/graphics/Material.h
index 4b475729fa7..43d1cca299c 100644
--- a/engines/hpl1/engine/graphics/Material.h
+++ b/engines/hpl1/engine/graphics/Material.h
@@ -28,14 +28,14 @@
#ifndef HPL_MATERIAL_H
#define HPL_MATERIAL_H
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/graphics/GPUProgram.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/Texture.h"
#include "hpl1/engine/resources/ResourceBase.h"
#include "hpl1/engine/resources/ResourceImage.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
-#include "common/array.h"
class TiXmlElement;
@@ -400,6 +400,6 @@ public:
typedef Common::List<iMaterialType *> tMaterialTypeList;
typedef tMaterialTypeList::iterator tMaterialTypeListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_H
diff --git a/engines/hpl1/engine/graphics/MaterialHandler.cpp b/engines/hpl1/engine/graphics/MaterialHandler.cpp
index 9e2781decf9..a1d107fac7e 100644
--- a/engines/hpl1/engine/graphics/MaterialHandler.cpp
+++ b/engines/hpl1/engine/graphics/MaterialHandler.cpp
@@ -73,7 +73,7 @@ iMaterial *cMaterialHandler::Create(tString asMatName, eMaterialPicture mPicType
iMaterial *cMaterialHandler::Create(const tString &asName, tString asMatName, eMaterialPicture mPicType) {
iMaterial *pMat = NULL;
- //cResourceImage *pImage = NULL;
+ // cResourceImage *pImage = NULL;
unsigned int lIdCount = 1;
for (tMaterialTypeListIt it = mlstMatTypes.begin(); it != mlstMatTypes.end(); it++) {
diff --git a/engines/hpl1/engine/graphics/MaterialHandler.h b/engines/hpl1/engine/graphics/MaterialHandler.h
index 826749dfa0e..e09353401be 100644
--- a/engines/hpl1/engine/graphics/MaterialHandler.h
+++ b/engines/hpl1/engine/graphics/MaterialHandler.h
@@ -61,6 +61,6 @@ private:
cGraphics *mpGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIALHANDLER_H
diff --git a/engines/hpl1/engine/graphics/Material_Additive.h b/engines/hpl1/engine/graphics/Material_Additive.h
index d5a466baaa5..04bba1c457d 100644
--- a/engines/hpl1/engine/graphics/Material_Additive.h
+++ b/engines/hpl1/engine/graphics/Material_Additive.h
@@ -93,6 +93,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_ADDITIVE_H
diff --git a/engines/hpl1/engine/graphics/Material_Alpha.h b/engines/hpl1/engine/graphics/Material_Alpha.h
index d5dc267d8fb..ab384119ba5 100644
--- a/engines/hpl1/engine/graphics/Material_Alpha.h
+++ b/engines/hpl1/engine/graphics/Material_Alpha.h
@@ -93,6 +93,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_ALPHA_H
diff --git a/engines/hpl1/engine/graphics/Material_BaseLight.cpp b/engines/hpl1/engine/graphics/Material_BaseLight.cpp
index 894395635a2..0a279a41639 100644
--- a/engines/hpl1/engine/graphics/Material_BaseLight.cpp
+++ b/engines/hpl1/engine/graphics/Material_BaseLight.cpp
@@ -95,7 +95,7 @@ iMaterial_BaseLight::iMaterial_BaseLight(const tString &asLightVertexProgram,
} else {
mbUsesTwoPassSpot = true;
tString sSpotFragProgram1 = "Diffuse_Light_Spot_pass1"; // cString::Sub(asLightFragmentProgram,0, (int)asLightFragmentProgram.size() - 5) +
- // "Spot_fp_pass1.cg";
+ // "Spot_fp_pass1.cg";
tString sSpotFragProgram2 = asLightFragmentProgram + "_Spot_pass2";
_shaders[eBaseLightProgram_Spot1] = mpProgramManager->CreateProgram(sSpotVtxProgram, sSpotFragProgram1);
_shaders[eBaseLightProgram_Spot2] = mpProgramManager->CreateProgram(sSpotVtxProgram, sSpotFragProgram2);
diff --git a/engines/hpl1/engine/graphics/Material_BaseLight.h b/engines/hpl1/engine/graphics/Material_BaseLight.h
index b9d55802fe2..f2bee811964 100644
--- a/engines/hpl1/engine/graphics/Material_BaseLight.h
+++ b/engines/hpl1/engine/graphics/Material_BaseLight.h
@@ -109,6 +109,6 @@ protected:
iGpuProgram *_shaders[eBaseLightProgram_LastEnum];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_BASE_LIGHT_H
diff --git a/engines/hpl1/engine/graphics/Material_Bump.h b/engines/hpl1/engine/graphics/Material_Bump.h
index 0ead729e070..0fc4e11c0a8 100644
--- a/engines/hpl1/engine/graphics/Material_Bump.h
+++ b/engines/hpl1/engine/graphics/Material_Bump.h
@@ -55,6 +55,6 @@ public:
eMaterialPicture aPicture, cRenderer3D *apRenderer3D);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_BUMPE_H
diff --git a/engines/hpl1/engine/graphics/Material_BumpColorSpec.cpp b/engines/hpl1/engine/graphics/Material_BumpColorSpec.cpp
index bab217c1a48..31c31ff69d0 100644
--- a/engines/hpl1/engine/graphics/Material_BumpColorSpec.cpp
+++ b/engines/hpl1/engine/graphics/Material_BumpColorSpec.cpp
@@ -74,8 +74,8 @@ iMaterial *cMaterialType_BumpColorSpec::Create(const tString &asName, iLowLevelG
if (!apLowLevelGraphics->GetCaps(eGraphicCaps_GL_GpuPrograms) || iMaterial::GetQuality() == eMaterialQuality_VeryLow) {
return hplNew(cMaterial_Flat, (asName, apLowLevelGraphics,
- apImageManager, apTextureManager, apRenderer,
- apProgramManager, aPicture, apRenderer3D));
+ apImageManager, apTextureManager, apRenderer,
+ apProgramManager, aPicture, apRenderer3D));
}
if (iMaterial::GetQuality() >= eMaterialQuality_High) {
if (apLowLevelGraphics->GetCaps(eGraphicCaps_MaxTextureImageUnits) >= 7) {
diff --git a/engines/hpl1/engine/graphics/Material_BumpSpec.cpp b/engines/hpl1/engine/graphics/Material_BumpSpec.cpp
index 50f83099c55..efcd880bf43 100644
--- a/engines/hpl1/engine/graphics/Material_BumpSpec.cpp
+++ b/engines/hpl1/engine/graphics/Material_BumpSpec.cpp
@@ -72,8 +72,8 @@ iMaterial *cMaterialType_BumpSpec::Create(const tString &asName, iLowLevelGraphi
if (!apLowLevelGraphics->GetCaps(eGraphicCaps_GL_GpuPrograms) || iMaterial::GetQuality() == eMaterialQuality_VeryLow) {
return hplNew(cMaterial_Flat, (asName, apLowLevelGraphics,
- apImageManager, apTextureManager, apRenderer,
- apProgramManager, aPicture, apRenderer3D));
+ apImageManager, apTextureManager, apRenderer,
+ apProgramManager, aPicture, apRenderer3D));
}
if (iMaterial::GetQuality() >= eMaterialQuality_High) {
return hplNew(cMaterial_BumpSpec, (asName, apLowLevelGraphics,
diff --git a/engines/hpl1/engine/graphics/Material_BumpSpec.h b/engines/hpl1/engine/graphics/Material_BumpSpec.h
index f03f2f0d0f7..f6a976ba984 100644
--- a/engines/hpl1/engine/graphics/Material_BumpSpec.h
+++ b/engines/hpl1/engine/graphics/Material_BumpSpec.h
@@ -55,6 +55,6 @@ public:
eMaterialPicture aPicture, cRenderer3D *apRenderer3D);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_BUMP_SPEC_H
diff --git a/engines/hpl1/engine/graphics/Material_BumpSpec2D.h b/engines/hpl1/engine/graphics/Material_BumpSpec2D.h
index d1d89ce16c5..6581f7fa857 100644
--- a/engines/hpl1/engine/graphics/Material_BumpSpec2D.h
+++ b/engines/hpl1/engine/graphics/Material_BumpSpec2D.h
@@ -75,6 +75,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_BUMP_SPEC2D_H
diff --git a/engines/hpl1/engine/graphics/Material_Diffuse.cpp b/engines/hpl1/engine/graphics/Material_Diffuse.cpp
index 72e8e3c0bbe..88e40c39d19 100644
--- a/engines/hpl1/engine/graphics/Material_Diffuse.cpp
+++ b/engines/hpl1/engine/graphics/Material_Diffuse.cpp
@@ -75,8 +75,8 @@ iMaterial *cMaterialType_Diffuse::Create(const tString &asName, iLowLevelGraphic
if (!apLowLevelGraphics->GetCaps(eGraphicCaps_GL_GpuPrograms) || iMaterial::GetQuality() == eMaterialQuality_VeryLow) {
return hplNew(cMaterial_Flat, (asName, apLowLevelGraphics,
- apImageManager, apTextureManager, apRenderer,
- apProgramManager, aPicture, apRenderer3D));
+ apImageManager, apTextureManager, apRenderer,
+ apProgramManager, aPicture, apRenderer3D));
}
if (iMaterial::GetQuality() >= eMaterialQuality_High) {
return hplNew(cMaterial_Diffuse, (asName, apLowLevelGraphics,
diff --git a/engines/hpl1/engine/graphics/Material_Diffuse.h b/engines/hpl1/engine/graphics/Material_Diffuse.h
index cde715fae8f..191f041b2b7 100644
--- a/engines/hpl1/engine/graphics/Material_Diffuse.h
+++ b/engines/hpl1/engine/graphics/Material_Diffuse.h
@@ -60,6 +60,6 @@ private:
int mlTechLevel;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_DIFFUSE_H
diff --git a/engines/hpl1/engine/graphics/Material_Diffuse2D.h b/engines/hpl1/engine/graphics/Material_Diffuse2D.h
index b5b3c3153d9..005145045af 100644
--- a/engines/hpl1/engine/graphics/Material_Diffuse2D.h
+++ b/engines/hpl1/engine/graphics/Material_Diffuse2D.h
@@ -70,6 +70,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_DIFFUSE2D_H
diff --git a/engines/hpl1/engine/graphics/Material_DiffuseAdditive2D.h b/engines/hpl1/engine/graphics/Material_DiffuseAdditive2D.h
index 3fcfd086143..1ae0d9d3d75 100644
--- a/engines/hpl1/engine/graphics/Material_DiffuseAdditive2D.h
+++ b/engines/hpl1/engine/graphics/Material_DiffuseAdditive2D.h
@@ -74,6 +74,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_DIFFUSE_ADDITIVE_H
diff --git a/engines/hpl1/engine/graphics/Material_DiffuseAlpha2D.h b/engines/hpl1/engine/graphics/Material_DiffuseAlpha2D.h
index c44ebaefc90..dea721b3c7e 100644
--- a/engines/hpl1/engine/graphics/Material_DiffuseAlpha2D.h
+++ b/engines/hpl1/engine/graphics/Material_DiffuseAlpha2D.h
@@ -70,6 +70,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_DIFFUSE_ALPHA2D_H
diff --git a/engines/hpl1/engine/graphics/Material_DiffuseSpec.h b/engines/hpl1/engine/graphics/Material_DiffuseSpec.h
index 03a7ba1f848..526742a3bd0 100644
--- a/engines/hpl1/engine/graphics/Material_DiffuseSpec.h
+++ b/engines/hpl1/engine/graphics/Material_DiffuseSpec.h
@@ -55,6 +55,6 @@ public:
eMaterialPicture aPicture, cRenderer3D *apRenderer3D);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_DIFFUSE_SPEC_H
diff --git a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
index 46829692322..accda42d6a9 100644
--- a/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
+++ b/engines/hpl1/engine/graphics/Material_EnvMap_Reflect.h
@@ -85,7 +85,6 @@ public:
private:
iGpuProgram *_diffuseProgram;
iGpuProgram *_diffuseReflectProgram;
-
};
class cMaterialType_EnvMap_Reflect : public iMaterialType {
@@ -104,6 +103,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_ENVMAP_REFLECT_H
diff --git a/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.cpp b/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.cpp
index 0353d78e335..6d7711d71e1 100644
--- a/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.cpp
+++ b/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.cpp
@@ -26,18 +26,18 @@
*/
#include "hpl1/engine/graphics/Material_Fallback01_BaseLight.h"
-#include "hpl1/engine/graphics/Renderer3D.h"
+#include "common/algorithm.h"
#include "hpl1/engine/graphics/GPUProgram.h"
#include "hpl1/engine/graphics/Renderer2D.h"
+#include "hpl1/engine/graphics/Renderer3D.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/resources/GpuProgramManager.h"
#include "hpl1/engine/resources/TextureManager.h"
#include "hpl1/engine/scene/Camera.h"
#include "hpl1/engine/scene/Light.h"
#include "hpl1/engine/scene/Light3DSpot.h"
-#include "hpl1/engine/system/String.h"
#include "hpl1/engine/scene/PortalContainer.h"
-#include "common/algorithm.h"
+#include "hpl1/engine/system/String.h"
//#include <GL/GLee.h>
diff --git a/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.h b/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.h
index dea2beca6d3..38507923bf4 100644
--- a/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.h
+++ b/engines/hpl1/engine/graphics/Material_Fallback01_BaseLight.h
@@ -130,6 +130,6 @@ public:
//---------------------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_FALLBACK01_BASE_LIGHT_H
diff --git a/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.cpp b/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.cpp
index 132e0e51b54..1873e615aeb 100644
--- a/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.cpp
+++ b/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.cpp
@@ -26,8 +26,9 @@
*/
#include "hpl1/engine/graphics/Material_Fallback02_BaseLight.h"
-#include "hpl1/engine/graphics/Material_BaseLight.h"
+#include "common/algorithm.h"
#include "hpl1/engine/graphics/GPUProgram.h"
+#include "hpl1/engine/graphics/Material_BaseLight.h"
#include "hpl1/engine/graphics/Renderer2D.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/resources/GpuProgramManager.h"
@@ -35,9 +36,8 @@
#include "hpl1/engine/scene/Camera.h"
#include "hpl1/engine/scene/Light.h"
#include "hpl1/engine/scene/Light3DSpot.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
-#include "common/algorithm.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -56,7 +56,7 @@ iMaterial_Fallback02_BaseLight::iMaterial_Fallback02_BaseLight(
Common::fill(_gpuPrograms, _gpuPrograms + eBaseLightProgram_LastEnum, nullptr);
_gpuPrograms[eBaseLightProgram_Point1] = mpProgramManager->CreateProgram("hpl1_Fallback02_Diffuse_Light_p1", "hpl1_Fallback02_Diffuse_Light_p1");
- //the second pass is the same as the second pass of fallback01
+ // the second pass is the same as the second pass of fallback01
_gpuPrograms[eBaseLightProgram_Point2] = mpProgramManager->CreateProgram("hpl1_Fallback02_Diffuse_Light_p2", "hpl1_Fallback01_Diffuse_Light_p2");
_gpuPrograms[eBaseLightProgram_Spot1] = mpProgramManager->CreateProgram("hpl1_Fallback02_Diffuse_Light_p1", "hpl1_Fallback02_Diffuse_Light_p1");
_gpuPrograms[eBaseLightProgram_Spot2] = mpProgramManager->CreateProgram("hpl1_Fallback02_Diffuse_Light_Spot_p2", "hpl1_Fallback02_Diffuse_Light_Spot_p2");
diff --git a/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.h b/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.h
index 7703b67c475..65b86742a4a 100644
--- a/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.h
+++ b/engines/hpl1/engine/graphics/Material_Fallback02_BaseLight.h
@@ -109,6 +109,6 @@ public:
//---------------------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_FALLBACK02_BASE_LIGHT_H
diff --git a/engines/hpl1/engine/graphics/Material_Flat.h b/engines/hpl1/engine/graphics/Material_Flat.h
index 1cdd73b0329..defb26cbf2f 100644
--- a/engines/hpl1/engine/graphics/Material_Flat.h
+++ b/engines/hpl1/engine/graphics/Material_Flat.h
@@ -87,6 +87,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_FLAT_H
diff --git a/engines/hpl1/engine/graphics/Material_FontNormal.h b/engines/hpl1/engine/graphics/Material_FontNormal.h
index 64ca399334e..b2b308a857c 100644
--- a/engines/hpl1/engine/graphics/Material_FontNormal.h
+++ b/engines/hpl1/engine/graphics/Material_FontNormal.h
@@ -70,6 +70,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_FONTNORMAL_H
diff --git a/engines/hpl1/engine/graphics/Material_Modulative.h b/engines/hpl1/engine/graphics/Material_Modulative.h
index 04a0e78b1d8..6d676756132 100644
--- a/engines/hpl1/engine/graphics/Material_Modulative.h
+++ b/engines/hpl1/engine/graphics/Material_Modulative.h
@@ -93,6 +93,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_MODULATIVE_H
diff --git a/engines/hpl1/engine/graphics/Material_ModulativeX2.h b/engines/hpl1/engine/graphics/Material_ModulativeX2.h
index a5c120287ff..cb7eeee392d 100644
--- a/engines/hpl1/engine/graphics/Material_ModulativeX2.h
+++ b/engines/hpl1/engine/graphics/Material_ModulativeX2.h
@@ -93,6 +93,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_MODULATIVE_X_2_H
diff --git a/engines/hpl1/engine/graphics/Material_Smoke2D.h b/engines/hpl1/engine/graphics/Material_Smoke2D.h
index 3e2797650a3..0acaa180d95 100644
--- a/engines/hpl1/engine/graphics/Material_Smoke2D.h
+++ b/engines/hpl1/engine/graphics/Material_Smoke2D.h
@@ -70,6 +70,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_SMOKE2D_H
diff --git a/engines/hpl1/engine/graphics/Material_Water.cpp b/engines/hpl1/engine/graphics/Material_Water.cpp
index d58d02fc0f5..fd67b561166 100644
--- a/engines/hpl1/engine/graphics/Material_Water.cpp
+++ b/engines/hpl1/engine/graphics/Material_Water.cpp
@@ -51,8 +51,6 @@ public:
}
};
-
-
//-----------------------------------------------------------------------
static float globalTime = 0;
@@ -63,7 +61,6 @@ public:
}
};
-
//////////////////////////////////////////////////////////////////////////
// CONSTRUCTORS
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/hpl1/engine/graphics/Material_Water.h b/engines/hpl1/engine/graphics/Material_Water.h
index 0311a076ad2..1a84e1f38ff 100644
--- a/engines/hpl1/engine/graphics/Material_Water.h
+++ b/engines/hpl1/engine/graphics/Material_Water.h
@@ -106,6 +106,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_WATER_H
diff --git a/engines/hpl1/engine/graphics/Mesh.cpp b/engines/hpl1/engine/graphics/Mesh.cpp
index d5911db0605..719f27badd6 100644
--- a/engines/hpl1/engine/graphics/Mesh.cpp
+++ b/engines/hpl1/engine/graphics/Mesh.cpp
@@ -367,7 +367,7 @@ void cMesh::CreateNodeBodies(iPhysicsBody **apRootBodyPtr, Common::Array<iPhysic
iCollideShape *pShape = CreateCollideShapeFromCollider(pColl, apPhysicsWorld);
vShapes.push_back(pShape);
- /*cMatrixf mtxOffset = */pShape->GetOffset();
+ /*cMatrixf mtxOffset = */ pShape->GetOffset();
// Log("Created shape size: %s at %s. Mtx: %s\n",pShape->GetSize().ToString().c_str(),
// pShape->GetOffset().GetTranslation().ToString().c_str(),
// mtxOffset.ToString().c_str());
diff --git a/engines/hpl1/engine/graphics/Mesh.h b/engines/hpl1/engine/graphics/Mesh.h
index 1f62bdc06f5..9126cdf4eb1 100644
--- a/engines/hpl1/engine/graphics/Mesh.h
+++ b/engines/hpl1/engine/graphics/Mesh.h
@@ -36,8 +36,8 @@
#include "hpl1/engine/physics/CollideShape.h"
#include "hpl1/engine/physics/PhysicsJoint.h"
-#include "hpl1/engine/scene/Light3D.h"
#include "common/array.h"
+#include "hpl1/engine/scene/Light3D.h"
#include "hpl1/std/map.h"
#include "hpl1/std/multimap.h"
@@ -349,6 +349,6 @@ private:
tMeshReferenceVec mvReferences;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_H
diff --git a/engines/hpl1/engine/graphics/Mesh2d.h b/engines/hpl1/engine/graphics/Mesh2d.h
index 15be9998a4c..5149899b4a0 100644
--- a/engines/hpl1/engine/graphics/Mesh2d.h
+++ b/engines/hpl1/engine/graphics/Mesh2d.h
@@ -28,10 +28,10 @@
#ifndef HPL_MESH2D_H
#define HPL_MESH2D_H
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
namespace hpl {
class cMesh2DEdge {
@@ -108,6 +108,6 @@ private:
void CalculateEdges(eTileRotation aRotation, tVertexVec &aVtx, tUIntVec &aIdx);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH2D_H
diff --git a/engines/hpl1/engine/graphics/MeshCreator.cpp b/engines/hpl1/engine/graphics/MeshCreator.cpp
index dcaf57b52f0..7cf8b7b716e 100644
--- a/engines/hpl1/engine/graphics/MeshCreator.cpp
+++ b/engines/hpl1/engine/graphics/MeshCreator.cpp
@@ -34,8 +34,8 @@
#include "hpl1/engine/resources/AnimationManager.h"
#include "hpl1/engine/resources/MaterialManager.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/graphics/MeshCreator.h b/engines/hpl1/engine/graphics/MeshCreator.h
index 646b6b9742b..bc101228941 100644
--- a/engines/hpl1/engine/graphics/MeshCreator.h
+++ b/engines/hpl1/engine/graphics/MeshCreator.h
@@ -60,6 +60,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESHCREATOR_H
diff --git a/engines/hpl1/engine/graphics/OcclusionQuery.h b/engines/hpl1/engine/graphics/OcclusionQuery.h
index cdf6f69551b..45b4581facc 100644
--- a/engines/hpl1/engine/graphics/OcclusionQuery.h
+++ b/engines/hpl1/engine/graphics/OcclusionQuery.h
@@ -54,6 +54,6 @@ public:
virtual unsigned int GetSampleCount() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_OCCLUSION_QUERY_H
diff --git a/engines/hpl1/engine/graphics/ParticleEmitter.h b/engines/hpl1/engine/graphics/ParticleEmitter.h
index b77193095ec..c91f5bfd061 100644
--- a/engines/hpl1/engine/graphics/ParticleEmitter.h
+++ b/engines/hpl1/engine/graphics/ParticleEmitter.h
@@ -28,13 +28,13 @@
#ifndef HPL_PARTICLE_EMITTER_H
#define HPL_PARTICLE_EMITTER_H
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
#include "hpl1/std/map.h"
-#include "common/array.h"
namespace hpl {
@@ -236,6 +236,6 @@ protected:
typedef Hpl1::Std::map<tString, iParticleEmitterData *> tParticleEmitterDataMap;
typedef tParticleEmitterDataMap::iterator tParticleEmitterDataMapIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PARTICLE_EMITTER_H
diff --git a/engines/hpl1/engine/graphics/ParticleSystem3D.h b/engines/hpl1/engine/graphics/ParticleSystem3D.h
index c489497b89f..430bdc6e93a 100644
--- a/engines/hpl1/engine/graphics/ParticleSystem3D.h
+++ b/engines/hpl1/engine/graphics/ParticleSystem3D.h
@@ -143,6 +143,6 @@ private:
bool mbFirstUpdate;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PARTICLE_SYSTEM_3D_H
diff --git a/engines/hpl1/engine/graphics/RenderList.cpp b/engines/hpl1/engine/graphics/RenderList.cpp
index 7d570b98856..7ece86c9be0 100644
--- a/engines/hpl1/engine/graphics/RenderList.cpp
+++ b/engines/hpl1/engine/graphics/RenderList.cpp
@@ -391,11 +391,10 @@ bool cRenderList::Add(iRenderable *apObject) {
}
// Add a light to a special container
case eRenderableType_Light: {
- iLight3D *pLight = static_cast<iLight3D *>(apObject);
+ iLight3D *pLight = static_cast<iLight3D *>(apObject);
- m_setLights.insert(pLight);
- }
- break;
+ m_setLights.insert(pLight);
+ } break;
default:
break;
}
diff --git a/engines/hpl1/engine/graphics/RenderList.h b/engines/hpl1/engine/graphics/RenderList.h
index e7be02a5969..0795f2331b6 100644
--- a/engines/hpl1/engine/graphics/RenderList.h
+++ b/engines/hpl1/engine/graphics/RenderList.h
@@ -35,8 +35,8 @@
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Light3D.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "hpl1/std/set.h"
#include "hpl1/std/multiset.h"
+#include "hpl1/std/set.h"
namespace hpl {
@@ -219,6 +219,6 @@ private:
cGraphics *mpGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDER_LIST_H
diff --git a/engines/hpl1/engine/graphics/RenderObject2D.h b/engines/hpl1/engine/graphics/RenderObject2D.h
index ee0282d1ab1..2b2d16d9818 100644
--- a/engines/hpl1/engine/graphics/RenderObject2D.h
+++ b/engines/hpl1/engine/graphics/RenderObject2D.h
@@ -72,6 +72,6 @@ private:
iRenderObject2DRenderer *mpCustomRenderer;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDEROBJECT2D_H
diff --git a/engines/hpl1/engine/graphics/RenderState.cpp b/engines/hpl1/engine/graphics/RenderState.cpp
index 75859f959bc..d1b3092194d 100644
--- a/engines/hpl1/engine/graphics/RenderState.cpp
+++ b/engines/hpl1/engine/graphics/RenderState.cpp
@@ -469,8 +469,8 @@ void iRenderState::SetMatrixMode(cRenderSettings *apSettings) {
if (apSettings->gpuProgram) {
// Might be quicker if this is set directly
apSettings->gpuProgram->SetMatrixf("worldViewProj",
- eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrix_ViewProjection,
+ eGpuProgramMatrixOp_Identity);
if (apSettings->gpuProgramSetup) {
apSettings->gpuProgramSetup->SetupMatrix(mpModelMatrix, apSettings);
}
@@ -497,7 +497,7 @@ void iRenderState::SetMatrixMode(cRenderSettings *apSettings) {
Log("SpotLightViewProj ");
cLight3DSpot *pSpotLight = static_cast<cLight3DSpot *>(apSettings->mpLight);
apSettings->gpuProgram->SetMatrixf("spotViewProj",
- cMath::MatrixMul(pSpotLight->GetViewProjMatrix(), *mpModelMatrix));
+ cMath::MatrixMul(pSpotLight->GetViewProjMatrix(), *mpModelMatrix));
}
} else {
// Light position
diff --git a/engines/hpl1/engine/graphics/Renderable.h b/engines/hpl1/engine/graphics/Renderable.h
index 56c411b8f9d..0001562e5ae 100644
--- a/engines/hpl1/engine/graphics/Renderable.h
+++ b/engines/hpl1/engine/graphics/Renderable.h
@@ -149,6 +149,6 @@ protected:
float mfZ;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDERABLE_H
diff --git a/engines/hpl1/engine/graphics/Renderer2D.cpp b/engines/hpl1/engine/graphics/Renderer2D.cpp
index d59623d6c63..a339e397ab3 100644
--- a/engines/hpl1/engine/graphics/Renderer2D.cpp
+++ b/engines/hpl1/engine/graphics/Renderer2D.cpp
@@ -32,9 +32,9 @@
#include "hpl1/engine/graphics/RenderObject2D.h"
#include "hpl1/engine/graphics/Texture.h"
#include "hpl1/engine/math/Math.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/resources/TextureManager.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/scene/Camera2D.h"
#include "hpl1/engine/scene/GridMap2D.h"
#include "hpl1/engine/scene/Light2D.h"
@@ -752,10 +752,10 @@ void cRenderer2D::FindShadowPoints(tMesh2DEdgeVec *apEdgeVec, cVector2f avLightP
cVector2f vEdgeNormal;
cVector2f vLightNormal;
- //int lPrevWasShadow = -1;
- //int lFirstWasShadow = -1;
+ // int lPrevWasShadow = -1;
+ // int lFirstWasShadow = -1;
mlShadowPointSize = 0;
- //int lMaxEdge = (int)apEdgeVec->size() - 1;
+ // int lMaxEdge = (int)apEdgeVec->size() - 1;
for (int i = 0; i < (int)apEdgeVec->size(); i++) {
int point = (*apEdgeVec)[i].mlStartIndex;
@@ -778,7 +778,7 @@ void cRenderer2D::FindShadowPoints(tMesh2DEdgeVec *apEdgeVec, cVector2f avLightP
int cRenderer2D::CreateVertexes(cVector2f vLightPos, cRect2f LightRect, float fRadius, bool bNonFit,
cVector2f vTilePos, tVertexVec *apVtxVec, cColor ShadowColor, int lFirstIndex, float fSourceSize) {
- //int lNum = 0;
+ // int lNum = 0;
// Walk through the edges
for (int idx = 0; idx < mlShadowPointSize; idx++) {
diff --git a/engines/hpl1/engine/graphics/Renderer2D.h b/engines/hpl1/engine/graphics/Renderer2D.h
index 93a5e3e7ed9..34c08bc3334 100644
--- a/engines/hpl1/engine/graphics/Renderer2D.h
+++ b/engines/hpl1/engine/graphics/Renderer2D.h
@@ -28,14 +28,14 @@
#ifndef HPL_RENDERER2D_H
#define HPL_RENDERER2D_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/graphics/Mesh2d.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Light2D.h"
-#include "common/list.h"
-#include "hpl1/std/set.h"
#include "hpl1/std/multiset.h"
+#include "hpl1/std/set.h"
namespace hpl {
@@ -140,6 +140,6 @@ private:
inline bool ClipPoints(cVector3f *avPoint, cRect2f aRect, cVector2f avPos, float afSize);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDERER2D_H
diff --git a/engines/hpl1/engine/graphics/Renderer3D.cpp b/engines/hpl1/engine/graphics/Renderer3D.cpp
index 6baea1c7488..0a038e72a0f 100644
--- a/engines/hpl1/engine/graphics/Renderer3D.cpp
+++ b/engines/hpl1/engine/graphics/Renderer3D.cpp
@@ -73,8 +73,6 @@ cRenderSettings::cRenderSettings() {
//-----------------------------------------------------------------------
-
-
cRenderer3D::cRenderer3D(iLowLevelGraphics *apLowLevelGraphics, cResources *apResources,
cMeshCreator *apMeshCreator, cRenderList *apRenderList) {
Hpl1::logInfo(Hpl1::kDebugGraphics, "%s", "Creating Renderer3D\n");
@@ -615,7 +613,7 @@ void cRenderer3D::RenderFog(cCamera3D *apCamera) {
*pMtx));
_solidFogProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
}
//////////////////
// NULL Model view matrix (static)
@@ -623,7 +621,7 @@ void cRenderer3D::RenderFog(cCamera3D *apCamera) {
mpLowLevelGraphics->SetMatrix(eMatrix_ModelView, apCamera->GetViewMatrix());
_solidFogProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
}
pObject->GetVertexBuffer()->Bind();
@@ -770,7 +768,7 @@ void cRenderer3D::RenderOcclusionQueries(cCamera3D *apCamera) {
// Set the vertex program matrix.
if (_diffuseProgram)
_diffuseProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
if (mbLog)
Log(" Setting matrix %d\n", pObject->mpMatrix);
@@ -873,7 +871,7 @@ void cRenderer3D::RenderTrans(cCamera3D *apCamera) {
mRenderSettings.mpTexture[i] = NULL;
}*/
- /*cVector3f vForward = */apCamera->GetForward();
+ /*cVector3f vForward = */ apCamera->GetForward();
//////////////////////////////////
// Iterate the query objects
@@ -1112,8 +1110,8 @@ void cRenderer3D::RenderTrans(cCamera3D *apCamera) {
mRenderSettings.mbMatrixWasNULL = true;
}
refractProgram->SetMatrixf("worldViewProj",
- eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrix_ViewProjection,
+ eGpuProgramMatrixOp_Identity);
// Eye position
if (pMaterial->GetRefractionUsesEye()) {
@@ -1324,8 +1322,8 @@ void cRenderer3D::RenderTrans(cCamera3D *apCamera) {
if (mRenderSettings.gpuProgram && bSetVtxProgMatrix) {
// Might be quicker if this is set directly
mRenderSettings.gpuProgram->SetMatrixf("worldViewProj",
- eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrix_ViewProjection,
+ eGpuProgramMatrixOp_Identity);
if (mRenderSettings.gpuProgramSetup) {
mRenderSettings.gpuProgramSetup->SetupMatrix(pModelMatrix, &mRenderSettings);
}
diff --git a/engines/hpl1/engine/graphics/Renderer3D.h b/engines/hpl1/engine/graphics/Renderer3D.h
index cfb80e0719e..c3cc60aea07 100644
--- a/engines/hpl1/engine/graphics/Renderer3D.h
+++ b/engines/hpl1/engine/graphics/Renderer3D.h
@@ -261,6 +261,6 @@ private:
tRendererDebugFlag mDebugFlags;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDERER3D_H
diff --git a/engines/hpl1/engine/graphics/RendererPostEffects.cpp b/engines/hpl1/engine/graphics/RendererPostEffects.cpp
index 3f30d8cb26d..6a3ddd82943 100644
--- a/engines/hpl1/engine/graphics/RendererPostEffects.cpp
+++ b/engines/hpl1/engine/graphics/RendererPostEffects.cpp
@@ -34,8 +34,8 @@
#include "hpl1/engine/graphics/Texture.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/resources/GpuProgramManager.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/Resources.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/scene/Scene.h"
#include "hpl1/engine/system/low_level_system.h"
@@ -421,7 +421,7 @@ void cRendererPostEffects::RenderDepthOfField() {
mpLowLevelGraphics->SetMatrix(eMatrix_ModelView, cMath::MatrixMul(pCam->GetViewMatrix(), *pMtx));
_depthOfFieldProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
}
//////////////////
// NULL Model view matrix (static)
@@ -429,7 +429,7 @@ void cRendererPostEffects::RenderDepthOfField() {
mpLowLevelGraphics->SetMatrix(eMatrix_ModelView, pCam->GetViewMatrix());
_depthOfFieldProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
}
pObject->GetVertexBuffer()->Bind();
@@ -466,7 +466,7 @@ void cRendererPostEffects::RenderMotionBlur() {
iTexture *pScreenTexture = mpScreenBuffer[mImageTrailData.mlCurrentBuffer == 0 ? 1 : 0];
// Size of the virtual screen
- /*cVector2f vVirtSize = */mpLowLevelGraphics->GetVirtualSize();
+ /*cVector2f vVirtSize = */ mpLowLevelGraphics->GetVirtualSize();
// Copy screen to texture
mpLowLevelGraphics->CopyContextToTexure(pScreenTexture, 0, cVector2l((int)mvScreenSize.x, (int)mvScreenSize.y));
@@ -489,8 +489,8 @@ void cRendererPostEffects::RenderMotionBlur() {
_motionBlurProgram->Bind();
_motionBlurProgram->SetFloat("blurScale", mfMotionBlurAmount);
_motionBlurProgram->SetVec2f("halfScreenSize",
- cVector2f((float)pScreenTexture->getWidth() / 2.0f,
- (float)pScreenTexture->getHeight() / 2.0f));
+ cVector2f((float)pScreenTexture->getWidth() / 2.0f,
+ (float)pScreenTexture->getHeight() / 2.0f));
mpLowLevelGraphics->SetTexture(0, pScreenTexture);
@@ -508,7 +508,7 @@ void cRendererPostEffects::RenderMotionBlur() {
mpLowLevelGraphics->SetMatrix(eMatrix_ModelView, cMath::MatrixMul(pCam->GetViewMatrix(), *pMtx));
_motionBlurProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
cMatrixf mtxModelView = cMath::MatrixMul(pCam->GetViewMatrix(), *pMtx);
cMatrixf mtxPrevModelView = cMath::MatrixMul(pCam->GetPrevView(), mtxPrev);
@@ -525,7 +525,7 @@ void cRendererPostEffects::RenderMotionBlur() {
mpLowLevelGraphics->SetMatrix(eMatrix_ModelView, pCam->GetViewMatrix());
_motionBlurProgram->SetMatrixf("worldViewProj", eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrixOp_Identity);
const cMatrixf &mtxModelView = pCam->GetViewMatrix();
const cMatrixf &mtxPrevModelView = pCam->GetPrevView();
@@ -580,7 +580,7 @@ void cRendererPostEffects::RenderBloom() {
RenderBlurTexture(mpBloomBlurTexture, pScreenTexture, mfBloomSpread);
// Size of blur texture
- /*cVector2f vBlurSize = */cVector2f((float)mpBloomBlurTexture->getWidth(), (float)mpBloomBlurTexture->getHeight());
+ /*cVector2f vBlurSize = */ cVector2f((float)mpBloomBlurTexture->getWidth(), (float)mpBloomBlurTexture->getHeight());
// Size of the virtual screen
cVector2f vVirtSize = mpLowLevelGraphics->GetVirtualSize();
diff --git a/engines/hpl1/engine/graphics/RendererPostEffects.h b/engines/hpl1/engine/graphics/RendererPostEffects.h
index 349d44dd261..3e105d9d0f4 100644
--- a/engines/hpl1/engine/graphics/RendererPostEffects.h
+++ b/engines/hpl1/engine/graphics/RendererPostEffects.h
@@ -28,9 +28,9 @@
#ifndef HPL_RENDERER_POST_EFFECTS_H
#define HPL_RENDERER_POST_EFFECTS_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "common/list.h"
#include "hpl1/std/set.h"
namespace hpl {
@@ -178,6 +178,6 @@ private:
bool mbActive;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDERER_POST_EFFECTS_H
diff --git a/engines/hpl1/engine/graphics/Skeleton.cpp b/engines/hpl1/engine/graphics/Skeleton.cpp
index 982cf4ea8d6..c1a6e382f52 100644
--- a/engines/hpl1/engine/graphics/Skeleton.cpp
+++ b/engines/hpl1/engine/graphics/Skeleton.cpp
@@ -28,8 +28,8 @@
#include "hpl1/engine/graphics/Skeleton.h"
#include "hpl1/engine/graphics/Bone.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/MemoryManager.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/graphics/Skeleton.h b/engines/hpl1/engine/graphics/Skeleton.h
index ac915f32634..e950ab481cd 100644
--- a/engines/hpl1/engine/graphics/Skeleton.h
+++ b/engines/hpl1/engine/graphics/Skeleton.h
@@ -65,6 +65,6 @@ private:
tBoneIdxNameMap m_mapBonesIdxByName;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SKELETON_H
diff --git a/engines/hpl1/engine/graphics/SubMesh.h b/engines/hpl1/engine/graphics/SubMesh.h
index 9e8452e3b08..8842ef43cfa 100644
--- a/engines/hpl1/engine/graphics/SubMesh.h
+++ b/engines/hpl1/engine/graphics/SubMesh.h
@@ -129,6 +129,6 @@ private:
cMesh *mpParent;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SUB_MESH_H
diff --git a/engines/hpl1/engine/graphics/Texture.h b/engines/hpl1/engine/graphics/Texture.h
index a726484dca2..4cc8bf2bec6 100644
--- a/engines/hpl1/engine/graphics/Texture.h
+++ b/engines/hpl1/engine/graphics/Texture.h
@@ -28,12 +28,12 @@
#ifndef HPL_TEXTURE_H
#define HPL_TEXTURE_H
-#include "hpl1/engine/graphics/bitmap2D.h"
+#include "common/array.h"
+#include "graphics/pixelformat.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/LowLevelPicture.h"
+#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/resources/ResourceBase.h"
-#include "graphics/pixelformat.h"
-#include "common/array.h"
namespace hpl {
@@ -199,6 +199,6 @@ protected:
typedef Common::Array<iTexture *> tTextureVec;
typedef tTextureVec::iterator tTextureVecIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TEXTURE_H
diff --git a/engines/hpl1/engine/graphics/VertexBuffer.h b/engines/hpl1/engine/graphics/VertexBuffer.h
index 33a8b07e913..dff210f10dd 100644
--- a/engines/hpl1/engine/graphics/VertexBuffer.h
+++ b/engines/hpl1/engine/graphics/VertexBuffer.h
@@ -169,6 +169,6 @@ protected:
bool mbTangents;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RENDERER3D_H
diff --git a/engines/hpl1/engine/graphics/VideoStream.h b/engines/hpl1/engine/graphics/VideoStream.h
index 5de68d026f3..247d47a83a1 100644
--- a/engines/hpl1/engine/graphics/VideoStream.h
+++ b/engines/hpl1/engine/graphics/VideoStream.h
@@ -89,6 +89,6 @@ protected:
cVector2l mvSize;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_VIDEO_STREAM_H
diff --git a/engines/hpl1/engine/graphics/bitmap2D.cpp b/engines/hpl1/engine/graphics/bitmap2D.cpp
index 9cf19bb590c..da8c2ce8a0e 100644
--- a/engines/hpl1/engine/graphics/bitmap2D.cpp
+++ b/engines/hpl1/engine/graphics/bitmap2D.cpp
@@ -20,14 +20,14 @@
*/
#include "hpl1/engine/graphics/bitmap2D.h"
-#include "hpl1/debug.h"
+#include "common/file.h"
#include "common/rect.h"
-#include "image/png.h"
-#include "image/jpeg.h"
-#include "image/tga.h"
+#include "hpl1/debug.h"
#include "image/bmp.h"
#include "image/gif.h"
-#include "common/file.h"
+#include "image/jpeg.h"
+#include "image/png.h"
+#include "image/tga.h"
namespace hpl {
@@ -70,17 +70,16 @@ Bitmap2D::Bitmap2D(const tString &filepath, const tString &type, const Graphics:
}
Bitmap2D::Bitmap2D(const cVector2l &size, const Graphics::PixelFormat &format)
-: LowLevelPicture("none"), _isSurfaceActive(true) {
+ : LowLevelPicture("none"), _isSurfaceActive(true) {
create(size, format);
}
-
void Bitmap2D::drawToBitmap(Bitmap2D &dest, const cVector2l &at, Common::Rect srcSubrect) {
if (!dest._isSurfaceActive)
dest.copyDecoder();
if (dest._surface.w == 0 || dest._surface.h == 0 || activeSurface().w == 0 || activeSurface().h == 0)
return; // font loading can use bitmaps with 0 width
- if(srcSubrect.right == 0 && srcSubrect.bottom == 0)
+ if (srcSubrect.right == 0 && srcSubrect.bottom == 0)
srcSubrect = Common::Rect(activeSurface().w, activeSurface().h);
if (activeSurface().format != dest._surface.format)
@@ -109,7 +108,7 @@ static uint32 quantizeColor(const cColor &col, const Graphics::PixelFormat &form
}
void Bitmap2D::fillRect(const cRect2l &rect, const cColor &color) {
- if(!_isSurfaceActive)
+ if (!_isSurfaceActive)
copyDecoder();
const uint32 qcol = quantizeColor(color, _surface.format);
@@ -117,8 +116,7 @@ void Bitmap2D::fillRect(const cRect2l &rect, const cColor &color) {
rect.x,
rect.y,
rect.w <= 0 ? rect.x + _surface.w : rect.x + rect.w,
- rect.h <= 0 ? rect.y + _surface.w : rect.y + rect.h
- );
+ rect.h <= 0 ? rect.y + _surface.w : rect.y + rect.h);
_surface.fillRect(surfaceRect, qcol);
}
@@ -162,7 +160,7 @@ void Bitmap2D::copyRedToAlpha() {
}
void Bitmap2D::copyDecoder(const Graphics::PixelFormat &format) {
- _surface.copyFrom(*( _decoder->getSurface()));
+ _surface.copyFrom(*(_decoder->getSurface()));
if (format.bytesPerPixel != 0)
_surface.convertToInPlace(format);
_isSurfaceActive = true;
@@ -170,15 +168,14 @@ void Bitmap2D::copyDecoder(const Graphics::PixelFormat &format) {
}
const Graphics::Surface &Bitmap2D::activeSurface() const {
- if(_isSurfaceActive)
+ if (_isSurfaceActive)
return _surface;
return *(_decoder->getSurface());
}
Bitmap2D::~Bitmap2D() {
- if(_isSurfaceActive)
+ if (_isSurfaceActive)
_surface.free();
}
-
} // namespace hpl
diff --git a/engines/hpl1/engine/graphics/bitmap2D.h b/engines/hpl1/engine/graphics/bitmap2D.h
index 004c074d6cb..9b8db809f35 100644
--- a/engines/hpl1/engine/graphics/bitmap2D.h
+++ b/engines/hpl1/engine/graphics/bitmap2D.h
@@ -28,13 +28,13 @@
#ifndef HPL_BITMAP2D_H
#define HPL_BITMAP2D_H
-#include "hpl1/engine/graphics/GraphicsTypes.h"
-#include "hpl1/engine/graphics/LowLevelPicture.h"
-#include "hpl1/engine/math/MathTypes.h"
-#include "graphics/pixelformat.h"
#include "common/ptr.h"
#include "common/rect.h"
+#include "graphics/pixelformat.h"
#include "graphics/surface.h"
+#include "hpl1/engine/graphics/GraphicsTypes.h"
+#include "hpl1/engine/graphics/LowLevelPicture.h"
+#include "hpl1/engine/math/MathTypes.h"
#include "image/image_decoder.h"
namespace hpl {
@@ -76,6 +76,6 @@ private:
typedef Common::Array<Bitmap2D *> tBitmap2DVec;
typedef Common::Array<Bitmap2D *>::iterator tBitmap2DVecIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BITMAP2D_H
diff --git a/engines/hpl1/engine/graphics/font_data.cpp b/engines/hpl1/engine/graphics/font_data.cpp
index 6a0ecc18967..6bc5e0bae1e 100644
--- a/engines/hpl1/engine/graphics/font_data.cpp
+++ b/engines/hpl1/engine/graphics/font_data.cpp
@@ -32,17 +32,17 @@
#include "hpl1/engine/graphics/GfxObject.h"
#include "hpl1/engine/graphics/GraphicsDrawer.h"
-#include "hpl1/engine/resources/ResourceImage.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
+#include "hpl1/engine/resources/ResourceImage.h"
-#include "hpl1/engine/gui/Gui.h"
-#include "hpl1/engine/gui/GuiGfxElement.h"
-#include "hpl1/debug.h"
-#include "hpl1/string.h"
-#include "common/ptr.h"
#include "common/array.h"
+#include "common/ptr.h"
#include "common/rect.h"
#include "hpl1/algorithms.h"
+#include "hpl1/debug.h"
+#include "hpl1/engine/gui/Gui.h"
+#include "hpl1/engine/gui/GuiGfxElement.h"
+#include "hpl1/string.h"
namespace hpl {
@@ -142,7 +142,7 @@ void FontData::loadNextGlyph(const TiXmlElement *charIt, BitmapArray &bitmaps, c
void FontData::loadGlyphs(const TiXmlElement *charsRoot, BitmapArray &bitmaps, const cVector2l &fontSize) {
const TiXmlElement *charIt = charsRoot->FirstChildElement("char");
Hpl1::resizeAndFill(_glyphs, 3000, nullptr);
- for(; charIt != nullptr; charIt = charIt->NextSiblingElement("char"))
+ for (; charIt != nullptr; charIt = charIt->NextSiblingElement("char"))
loadNextGlyph(charIt, bitmaps, fontSize);
}
diff --git a/engines/hpl1/engine/graphics/font_data.h b/engines/hpl1/engine/graphics/font_data.h
index 270f736ce37..03a457dc66f 100644
--- a/engines/hpl1/engine/graphics/font_data.h
+++ b/engines/hpl1/engine/graphics/font_data.h
@@ -28,13 +28,13 @@
#ifndef HPL_FONTDATA_H
#define HPL_FONTDATA_H
+#include "common/array.h"
+#include "common/ptr.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/ResourceBase.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
-#include "common/ptr.h"
class TiXmlElement;
@@ -51,7 +51,7 @@ class cGui;
class Glyph {
public:
Glyph(cGfxObject *apObject, cGuiGfxElement *apGuiGfx, const cVector2f &avOffset,
- const cVector2f &avSize, float afAdvance);
+ const cVector2f &avSize, float afAdvance);
~Glyph();
cGfxObject *_gfxObject;
@@ -70,7 +70,7 @@ public:
~FontData();
bool createFromFontFile(const tString &asFileName, int alSize, unsigned short alFirstChar,
- unsigned short alLastChar);
+ unsigned short alLastChar);
bool createFromBitmapFile(const tString &asFileName);
@@ -157,12 +157,12 @@ private:
cVector2f _sizeRatio;
Glyph *createGlyph(Bitmap2D *apBmp, const cVector2l &avOffset, const cVector2l &avSize,
- const cVector2l &avFontSize, int alAdvance);
+ const cVector2l &avFontSize, int alAdvance);
void addGlyph(Glyph *apGlyph);
- void loadGlyphs(const TiXmlElement *charsRoot, Common::Array<Common::SharedPtr<Bitmap2D>> &bitmaps, const cVector2l &fontSize);
- void loadNextGlyph(const TiXmlElement *charIt, Common::Array<Common::SharedPtr<Bitmap2D>> &bitmaps, const cVector2l &fontSize);
+ void loadGlyphs(const TiXmlElement *charsRoot, Common::Array<Common::SharedPtr<Bitmap2D> > &bitmaps, const cVector2l &fontSize);
+ void loadNextGlyph(const TiXmlElement *charIt, Common::Array<Common::SharedPtr<Bitmap2D> > &bitmaps, const cVector2l &fontSize);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FONTDATA_H
diff --git a/engines/hpl1/engine/gui/Gui.h b/engines/hpl1/engine/gui/Gui.h
index 3e312900f49..75b4109df9a 100644
--- a/engines/hpl1/engine/gui/Gui.h
+++ b/engines/hpl1/engine/gui/Gui.h
@@ -160,6 +160,6 @@ private:
unsigned long mlLastRenderTime;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_H
diff --git a/engines/hpl1/engine/gui/GuiGfxElement.h b/engines/hpl1/engine/gui/GuiGfxElement.h
index 4737596c02d..92c17df00e8 100644
--- a/engines/hpl1/engine/gui/GuiGfxElement.h
+++ b/engines/hpl1/engine/gui/GuiGfxElement.h
@@ -134,6 +134,6 @@ private:
bool mbFlushed;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_GFX_ELEMENT_H
diff --git a/engines/hpl1/engine/gui/GuiMaterial.h b/engines/hpl1/engine/gui/GuiMaterial.h
index 0f1090837db..213777f11e2 100644
--- a/engines/hpl1/engine/gui/GuiMaterial.h
+++ b/engines/hpl1/engine/gui/GuiMaterial.h
@@ -48,6 +48,6 @@ protected:
iLowLevelGraphics *mpLowLevelGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_MATERIAL_H
diff --git a/engines/hpl1/engine/gui/GuiMaterialBasicTypes.h b/engines/hpl1/engine/gui/GuiMaterialBasicTypes.h
index c9ef9eb547a..1591494fef8 100644
--- a/engines/hpl1/engine/gui/GuiMaterialBasicTypes.h
+++ b/engines/hpl1/engine/gui/GuiMaterialBasicTypes.h
@@ -89,6 +89,6 @@ public:
//-----------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_MATERIAL_BASIC_TYPES_H
diff --git a/engines/hpl1/engine/gui/GuiPopUp.h b/engines/hpl1/engine/gui/GuiPopUp.h
index ddebf8de5ca..470de88f87d 100644
--- a/engines/hpl1/engine/gui/GuiPopUp.h
+++ b/engines/hpl1/engine/gui/GuiPopUp.h
@@ -47,6 +47,6 @@ protected:
cGuiSkin *mpSkin;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_FRAME_H
diff --git a/engines/hpl1/engine/gui/GuiPopUpMessageBox.h b/engines/hpl1/engine/gui/GuiPopUpMessageBox.h
index 70fba6c01fa..8cd2d5bdc40 100644
--- a/engines/hpl1/engine/gui/GuiPopUpMessageBox.h
+++ b/engines/hpl1/engine/gui/GuiPopUpMessageBox.h
@@ -58,6 +58,6 @@ protected:
tGuiCallbackFunc mpCallback;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_POP_UP_MESSAGE_BOX_H
diff --git a/engines/hpl1/engine/gui/GuiSet.cpp b/engines/hpl1/engine/gui/GuiSet.cpp
index 5989af5d6ac..6b3b0ce4285 100644
--- a/engines/hpl1/engine/gui/GuiSet.cpp
+++ b/engines/hpl1/engine/gui/GuiSet.cpp
@@ -30,9 +30,9 @@
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
+#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/FrameBitmap.h"
@@ -377,7 +377,7 @@ void cGuiSet::DrawFont(const tWString &asText,
const cVector2f &avSize, const cColor &aColor,
eFontAlign aAlign, eGuiMaterial aMaterial) {
int lCount = 0;
- //float lXAdd = 0;
+ // float lXAdd = 0;
cVector3f vPos = avPos;
if (aAlign == eFontAlign_Center) {
@@ -586,9 +586,9 @@ void cGuiSet::DestroyWidget(iWidget *apWidget) {
void cGuiSet::CreatePopUpMessageBox(const tWString &asLabel, const tWString &asText,
const tWString &asButton1, const tWString &asButton2,
void *apCallbackObject, tGuiCallbackFunc apCallback) {
- /* cGuiPopUpMessageBox *pMessageBox = */(void)hplNew(cGuiPopUpMessageBox, (this, asLabel, asText,
- asButton1, asButton2,
- apCallbackObject, apCallback));
+ /* cGuiPopUpMessageBox *pMessageBox = */ (void)hplNew(cGuiPopUpMessageBox, (this, asLabel, asText,
+ asButton1, asButton2,
+ apCallbackObject, apCallback));
}
//-----------------------------------------------------------------------
diff --git a/engines/hpl1/engine/gui/GuiSet.h b/engines/hpl1/engine/gui/GuiSet.h
index 92659a53eaf..cb7947e9cac 100644
--- a/engines/hpl1/engine/gui/GuiSet.h
+++ b/engines/hpl1/engine/gui/GuiSet.h
@@ -28,11 +28,11 @@
#ifndef HPL_GUI_SET_H
#define HPL_GUI_SET_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/gui/GuiTypes.h"
-#include "common/list.h"
-#include "hpl1/std/set.h"
#include "hpl1/std/multiset.h"
+#include "hpl1/std/set.h"
namespace hpl {
@@ -333,6 +333,6 @@ private:
bool mbDestroyingSet;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_SET_H
diff --git a/engines/hpl1/engine/gui/GuiSkin.cpp b/engines/hpl1/engine/gui/GuiSkin.cpp
index e684a304838..d35cab47358 100644
--- a/engines/hpl1/engine/gui/GuiSkin.cpp
+++ b/engines/hpl1/engine/gui/GuiSkin.cpp
@@ -27,8 +27,8 @@
#include "hpl1/engine/gui/GuiSkin.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
diff --git a/engines/hpl1/engine/gui/GuiSkin.h b/engines/hpl1/engine/gui/GuiSkin.h
index 8736ab2e4d9..f5c658c8e77 100644
--- a/engines/hpl1/engine/gui/GuiSkin.h
+++ b/engines/hpl1/engine/gui/GuiSkin.h
@@ -78,6 +78,6 @@ private:
Common::Array<cVector3f> mvAttributes;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GUI_SKIN_H
diff --git a/engines/hpl1/engine/gui/GuiTypes.h b/engines/hpl1/engine/gui/GuiTypes.h
index b8d03bf2c78..6b875d813c2 100644
--- a/engines/hpl1/engine/gui/GuiTypes.h
+++ b/engines/hpl1/engine/gui/GuiTypes.h
@@ -28,10 +28,10 @@
#ifndef HPL_GUI_TYPES_H
#define HPL_GUI_TYPES_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/input/InputTypes.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "common/list.h"
namespace hpl {
diff --git a/engines/hpl1/engine/gui/Widget.h b/engines/hpl1/engine/gui/Widget.h
index 880f5fc08bf..a3a969cad02 100644
--- a/engines/hpl1/engine/gui/Widget.h
+++ b/engines/hpl1/engine/gui/Widget.h
@@ -28,10 +28,10 @@
#ifndef HPL_WIDGET_H
#define HPL_WIDGET_H
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/gui/GuiTypes.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "common/list.h"
-#include "common/array.h"
namespace hpl {
@@ -238,6 +238,6 @@ private:
bool mbPositionIsUpdated;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_H
diff --git a/engines/hpl1/engine/gui/WidgetBaseClasses.h b/engines/hpl1/engine/gui/WidgetBaseClasses.h
index a7cac7e23e4..c1e67d89a72 100644
--- a/engines/hpl1/engine/gui/WidgetBaseClasses.h
+++ b/engines/hpl1/engine/gui/WidgetBaseClasses.h
@@ -54,6 +54,6 @@ protected:
//--------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_BASE_CLASSES_H
diff --git a/engines/hpl1/engine/gui/WidgetButton.h b/engines/hpl1/engine/gui/WidgetButton.h
index 64d66593947..4ea4da48e13 100644
--- a/engines/hpl1/engine/gui/WidgetButton.h
+++ b/engines/hpl1/engine/gui/WidgetButton.h
@@ -71,6 +71,6 @@ protected:
cGuiGfxElement *mvGfxCornersDown[4];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_BUTTON_H
diff --git a/engines/hpl1/engine/gui/WidgetCheckBox.h b/engines/hpl1/engine/gui/WidgetCheckBox.h
index db8a9194eb8..9e2fa566097 100644
--- a/engines/hpl1/engine/gui/WidgetCheckBox.h
+++ b/engines/hpl1/engine/gui/WidgetCheckBox.h
@@ -64,6 +64,6 @@ protected:
cGuiGfxElement *mvGfxBox[2][2];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_CHECK_BOX_H
diff --git a/engines/hpl1/engine/gui/WidgetComboBox.cpp b/engines/hpl1/engine/gui/WidgetComboBox.cpp
index e67b51f6f50..585c9be9af0 100644
--- a/engines/hpl1/engine/gui/WidgetComboBox.cpp
+++ b/engines/hpl1/engine/gui/WidgetComboBox.cpp
@@ -418,7 +418,7 @@ bool cWidgetComboBox::OnMouseLeave(cGuiMessageData &aData) {
//-----------------------------------------------------------------------
bool cWidgetComboBox::OnLostFocus(cGuiMessageData &aData) {
- /*cVector3f vLocal = */WorldToLocalPosition(aData.mvPos);
+ /*cVector3f vLocal = */ WorldToLocalPosition(aData.mvPos);
if (mbMenuOpen && mpSlider->IsEnabled() == false) {
CloseMenu();
diff --git a/engines/hpl1/engine/gui/WidgetComboBox.h b/engines/hpl1/engine/gui/WidgetComboBox.h
index ed778572457..2c2e5709978 100644
--- a/engines/hpl1/engine/gui/WidgetComboBox.h
+++ b/engines/hpl1/engine/gui/WidgetComboBox.h
@@ -116,6 +116,6 @@ protected:
cGuiGfxElement *mvGfxCorners[4];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_COMBO_BOX_H
diff --git a/engines/hpl1/engine/gui/WidgetFrame.h b/engines/hpl1/engine/gui/WidgetFrame.h
index 905477baaab..2a2723b64b8 100644
--- a/engines/hpl1/engine/gui/WidgetFrame.h
+++ b/engines/hpl1/engine/gui/WidgetFrame.h
@@ -78,6 +78,6 @@ protected:
cGuiGfxElement *mvGfxCorners[4];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_FRAME_H
diff --git a/engines/hpl1/engine/gui/WidgetImage.h b/engines/hpl1/engine/gui/WidgetImage.h
index 0aede07b53c..4ae58339670 100644
--- a/engines/hpl1/engine/gui/WidgetImage.h
+++ b/engines/hpl1/engine/gui/WidgetImage.h
@@ -62,6 +62,6 @@ protected:
cColor mColor;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_IMAGE_H
diff --git a/engines/hpl1/engine/gui/WidgetLabel.cpp b/engines/hpl1/engine/gui/WidgetLabel.cpp
index 11d121d72e9..83057ac1fc8 100644
--- a/engines/hpl1/engine/gui/WidgetLabel.cpp
+++ b/engines/hpl1/engine/gui/WidgetLabel.cpp
@@ -27,8 +27,8 @@
#include "hpl1/engine/gui/WidgetLabel.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/font_data.h"
diff --git a/engines/hpl1/engine/gui/WidgetLabel.h b/engines/hpl1/engine/gui/WidgetLabel.h
index fcbd551b291..7f2c31d1dd6 100644
--- a/engines/hpl1/engine/gui/WidgetLabel.h
+++ b/engines/hpl1/engine/gui/WidgetLabel.h
@@ -69,6 +69,6 @@ protected:
int mlMaxCharacters;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_LABEL_H
diff --git a/engines/hpl1/engine/gui/WidgetListBox.h b/engines/hpl1/engine/gui/WidgetListBox.h
index e3e8220ee8d..4dfccdd1df4 100644
--- a/engines/hpl1/engine/gui/WidgetListBox.h
+++ b/engines/hpl1/engine/gui/WidgetListBox.h
@@ -95,6 +95,6 @@ protected:
cWidgetSlider *mpSlider;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_LIST_BOX_H
diff --git a/engines/hpl1/engine/gui/WidgetSlider.h b/engines/hpl1/engine/gui/WidgetSlider.h
index db5e5a6c05c..1ef597334dc 100644
--- a/engines/hpl1/engine/gui/WidgetSlider.h
+++ b/engines/hpl1/engine/gui/WidgetSlider.h
@@ -115,6 +115,6 @@ protected:
cGuiGfxElement *mpGfxBackground;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_SLIDER_H
diff --git a/engines/hpl1/engine/gui/WidgetTextBox.cpp b/engines/hpl1/engine/gui/WidgetTextBox.cpp
index 20de28e6281..d5728328dac 100644
--- a/engines/hpl1/engine/gui/WidgetTextBox.cpp
+++ b/engines/hpl1/engine/gui/WidgetTextBox.cpp
@@ -395,7 +395,7 @@ bool cWidgetTextBox::OnMouseDoubleClick(cGuiMessageData &aData) {
/////////////////////////////
// Get space to the left
for (size_t i = mlMarkerCharPos + 1; i < (size_t)msText.size(); ++i) {
- if (msText[i] == ' '|| i == (size_t)msText.size() - 1) {
+ if (msText[i] == ' ' || i == (size_t)msText.size() - 1) {
if (i == (size_t)msText.size() - 1)
SetMarkerPos((int)msText.size() - 1);
else
diff --git a/engines/hpl1/engine/gui/WidgetTextBox.h b/engines/hpl1/engine/gui/WidgetTextBox.h
index 330d13afc47..5cd7787d133 100644
--- a/engines/hpl1/engine/gui/WidgetTextBox.h
+++ b/engines/hpl1/engine/gui/WidgetTextBox.h
@@ -101,6 +101,6 @@ protected:
cGuiGfxElement *mvGfxCorners[4];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_TEXT_BOX_H
diff --git a/engines/hpl1/engine/gui/WidgetWindow.h b/engines/hpl1/engine/gui/WidgetWindow.h
index e2859bba57c..3fb8ed97166 100644
--- a/engines/hpl1/engine/gui/WidgetWindow.h
+++ b/engines/hpl1/engine/gui/WidgetWindow.h
@@ -28,10 +28,9 @@
#ifndef HPL_WIDGET_WINDOW_H
#define HPL_WIDGET_WINDOW_H
-#include "hpl1/engine/gui/Widget.h"
-#include "common/list.h"
#include "common/array.h"
-
+#include "common/list.h"
+#include "hpl1/engine/gui/Widget.h"
namespace hpl {
@@ -76,6 +75,6 @@ protected:
bool mbMoving;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WIDGET_H
diff --git a/engines/hpl1/engine/impl/CGProgram.cpp b/engines/hpl1/engine/impl/CGProgram.cpp
index 33d8e7db799..d66fb03d109 100644
--- a/engines/hpl1/engine/impl/CGProgram.cpp
+++ b/engines/hpl1/engine/impl/CGProgram.cpp
@@ -32,13 +32,13 @@
#include "hpl1/engine/impl/SDLTexture.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/system/String.h"
#include "hpl1/engine/math/Math.h"
+#include "hpl1/engine/system/String.h"
-#include "hpl1/opengl.h"
-#include "hpl1/debug.h"
#include "common/array.h"
#include "common/str.h"
+#include "hpl1/debug.h"
+#include "hpl1/opengl.h"
#include "math/matrix4.h"
namespace hpl {
@@ -141,7 +141,7 @@ bool cCGProgram::SetMatrixf(const tString &asName, const cMatrixf &mMtx) {
bool cCGProgram::SetMatrixf(const tString &asName, eGpuProgramMatrix mType,
eGpuProgramMatrixOp mOp) {
- if (mType != eGpuProgramMatrix_ViewProjection)
+ if (mType != eGpuProgramMatrix_ViewProjection)
error("unsupported shader matrix %d", mOp);
Math::Matrix4 modelView, projection;
glGetFloatv(GL_PROJECTION_MATRIX, projection.getData());
diff --git a/engines/hpl1/engine/impl/CGProgram.h b/engines/hpl1/engine/impl/CGProgram.h
index e3336589389..17d3b7f3feb 100644
--- a/engines/hpl1/engine/impl/CGProgram.h
+++ b/engines/hpl1/engine/impl/CGProgram.h
@@ -28,10 +28,10 @@
#ifndef HPL_CGPROGRAM_H
#define HPL_CGPROGRAM_H
+#include "common/scummsys.h"
#include "hpl1/engine/graphics/GPUProgram.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/scummsys.h"
#ifdef USE_OPENGL
@@ -61,6 +61,7 @@ public:
bool SetMatrixf(const tString &asName, const cMatrixf &mMtx);
bool SetMatrixf(const tString &asName, eGpuProgramMatrix mType,
eGpuProgramMatrixOp mOp);
+
private:
OpenGL::Shader *_shader;
@@ -69,7 +70,7 @@ private:
tString msEntry;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_CGPROGRAM_H
diff --git a/engines/hpl1/engine/impl/CharacterBodyNewton.h b/engines/hpl1/engine/impl/CharacterBodyNewton.h
index 11751f1f359..cf9615a7894 100644
--- a/engines/hpl1/engine/impl/CharacterBodyNewton.h
+++ b/engines/hpl1/engine/impl/CharacterBodyNewton.h
@@ -43,6 +43,6 @@ public:
private:
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CHARACTER_BODY_NEWTON_H
diff --git a/engines/hpl1/engine/impl/CollideShapeNewton.cpp b/engines/hpl1/engine/impl/CollideShapeNewton.cpp
index d639bbc7b5a..fa01fef8b96 100644
--- a/engines/hpl1/engine/impl/CollideShapeNewton.cpp
+++ b/engines/hpl1/engine/impl/CollideShapeNewton.cpp
@@ -63,24 +63,34 @@ cCollideShapeNewton::cCollideShapeNewton(eCollideShapeType aType, const cVector3
////////////////////////////////////////////
// Create Newton collision
- switch(aType) {
- case eCollideShapeType_Null: mpNewtonCollision = NewtonCreateNull(apNewtonWorld); break;
+ switch (aType) {
+ case eCollideShapeType_Null:
+ mpNewtonCollision = NewtonCreateNull(apNewtonWorld);
+ break;
- case eCollideShapeType_Box: mpNewtonCollision = NewtonCreateBox(apNewtonWorld,
+ case eCollideShapeType_Box:
+ mpNewtonCollision = NewtonCreateBox(apNewtonWorld,
mvSize.x, mvSize.y, mvSize.z,
- 0, pMtx); break;
+ 0, pMtx);
+ break;
- case eCollideShapeType_Sphere: mpNewtonCollision = NewtonCreateSphere(apNewtonWorld,
- mvSize.x, mvSize.y, mvSize.z,
- 0, pMtx); break;
+ case eCollideShapeType_Sphere:
+ mpNewtonCollision = NewtonCreateSphere(apNewtonWorld,
+ mvSize.x, mvSize.y, mvSize.z,
+ 0, pMtx);
+ break;
- case eCollideShapeType_Cylinder: mpNewtonCollision = NewtonCreateCylinder(apNewtonWorld,
- mvSize.x, mvSize.y,
- 0, pMtx); break;
+ case eCollideShapeType_Cylinder:
+ mpNewtonCollision = NewtonCreateCylinder(apNewtonWorld,
+ mvSize.x, mvSize.y,
+ 0, pMtx);
+ break;
- case eCollideShapeType_Capsule: mpNewtonCollision = NewtonCreateCapsule(apNewtonWorld,
- mvSize.x, mvSize.y,
- 0, pMtx); break;
+ case eCollideShapeType_Capsule:
+ mpNewtonCollision = NewtonCreateCapsule(apNewtonWorld,
+ mvSize.x, mvSize.y,
+ 0, pMtx);
+ break;
default:
break;
}
@@ -123,8 +133,8 @@ cCollideShapeNewton::cCollideShapeNewton(eCollideShapeType aType, const cVector3
cCollideShapeNewton::~cCollideShapeNewton() {
// Release Newton Collision
- if(mpNewtonCollision)
- NewtonReleaseCollision(mpNewtonWorld,mpNewtonCollision);
+ if (mpNewtonCollision)
+ NewtonReleaseCollision(mpNewtonWorld, mpNewtonCollision);
// Release all subshapes (for compound objects)
for (int i = 0; i < (int)mvSubShapes.size(); i++) {
mpWorld->DestroyShape(mvSubShapes[i]);
@@ -223,7 +233,7 @@ void cCollideShapeNewton::CreateFromShapeVec(tCollideShapeVec &avShapes) {
}
mpNewtonCollision = NewtonCreateCompoundCollision(mpNewtonWorld, (int)vNewtonColliders.size(),
- &vNewtonColliders[0], 0);
+ &vNewtonColliders[0], 0);
// Create bounding volume
cVector3f vFinalMax = avShapes[0]->GetBoundingVolume().GetMax();
diff --git a/engines/hpl1/engine/impl/CollideShapeNewton.h b/engines/hpl1/engine/impl/CollideShapeNewton.h
index 51813290775..aaddce68038 100644
--- a/engines/hpl1/engine/impl/CollideShapeNewton.h
+++ b/engines/hpl1/engine/impl/CollideShapeNewton.h
@@ -66,6 +66,6 @@ private:
tCollideShapeVec mvSubShapes;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDE_SHAPE_NEWTON_H
diff --git a/engines/hpl1/engine/impl/KeyboardSDL.cpp b/engines/hpl1/engine/impl/KeyboardSDL.cpp
index b8cdb066be5..eb39e19fede 100644
--- a/engines/hpl1/engine/impl/KeyboardSDL.cpp
+++ b/engines/hpl1/engine/impl/KeyboardSDL.cpp
@@ -35,7 +35,7 @@ namespace hpl {
//-----------------------------------------------------------------------
cKeyboardSDL::cKeyboardSDL(cLowLevelInputSDL *apLowLevelInputSDL) : iKeyboard("SDL Portable Keyboard") {
- _lowLevelSystem = apLowLevelInputSDL;
+ _lowLevelSystem = apLowLevelInputSDL;
_downKeys.set_size(eKey_LastEnum);
_downKeys.clear();
@@ -337,8 +337,7 @@ void cKeyboardSDL::processEvent(const Common::Event &ev) {
_downKeys.set(key);
_modifiers = convertModifiers(ev.kbd.flags);
_pressedKeys.push(cKeyPress(key, ev.kbd.ascii, _modifiers));
- }
- else
+ } else
_downKeys.unset(key);
}
diff --git a/engines/hpl1/engine/impl/KeyboardSDL.h b/engines/hpl1/engine/impl/KeyboardSDL.h
index 6af5a2d6815..69e458f7ec0 100644
--- a/engines/hpl1/engine/impl/KeyboardSDL.h
+++ b/engines/hpl1/engine/impl/KeyboardSDL.h
@@ -28,10 +28,10 @@
#ifndef HPL_KEYBOARD_SDL_H
#define HPL_KEYBOARD_SDL_H
-#include "hpl1/engine/input/Keyboard.h"
-#include "hpl1/engine/system/SystemTypes.h"
#include "common/bitarray.h"
#include "common/queue.h"
+#include "hpl1/engine/input/Keyboard.h"
+#include "hpl1/engine/system/SystemTypes.h"
namespace Common {
diff --git a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp
index 7ac3b7c6ce9..dd9f6a957bf 100644
--- a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp
+++ b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.cpp
@@ -25,8 +25,8 @@
* This file is part of HPL1 Engine.
*/
-#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/impl/LowLevelGraphicsSDL.h"
+#include "hpl1/engine/graphics/font_data.h"
#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/graphics/font_data.h"
@@ -41,9 +41,8 @@
#include "engines/util.h"
#include "hpl1/debug.h"
#include "hpl1/engine/impl/OcclusionQueryOGL.h"
-#include "hpl1/opengl.h"
#include "hpl1/graphics.h"
-
+#include "hpl1/opengl.h"
#ifdef USE_OPENGL
@@ -1770,4 +1769,4 @@ void cLowLevelGraphicsSDL::SetMatrixMode(eMatrix type) {
} // namespace hpl
-#endif //USE_OPENGL
+#endif // USE_OPENGL
diff --git a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h
index 6210dcd6e5c..6106420e3c7 100644
--- a/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h
+++ b/engines/hpl1/engine/impl/LowLevelGraphicsSDL.h
@@ -28,11 +28,11 @@
#ifndef HPL_LOWLEVELGRAPHICS_SDL_H
#define HPL_LOWLEVELGRAPHICS_SDL_H
-#include "hpl1/engine/graphics/LowLevelGraphics.h"
+#include "common/ptr.h"
#include "graphics/pixelformat.h"
-#include "hpl1/engine/math/MathTypes.h"
#include "graphics/surface.h"
-#include "common/ptr.h"
+#include "hpl1/engine/graphics/LowLevelGraphics.h"
+#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/opengl.h"
#ifdef USE_OPENGL
@@ -235,14 +235,14 @@ private:
int mlBpp;
// Gamma
- //uint16 mvStartGammaArray[3][256];
+ // uint16 mvStartGammaArray[3][256];
float mfGammaCorrection;
// Clipping
cPlanef mvClipPlanes[kMaxClipPlanes];
// SDL Variables
- //SDL_Surface *mpScreen;
+ // SDL_Surface *mpScreen;
Graphics::PixelFormat mpPixelFormat;
// Vertex Array variables
@@ -272,7 +272,7 @@ private:
iTexture *mpCurrentTexture[MAX_TEXTUREUNITS];
// CG Compiler Variables
- //CGcontext mCG_Context;
+ // CGcontext mCG_Context;
// Multisample
void CheckMultisampleCaps();
@@ -306,7 +306,7 @@ private:
void SetVtxBatchStates(tVtxBatchFlag flags);
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_LOWLEVELGRAPHICS_SDL_H
diff --git a/engines/hpl1/engine/impl/LowLevelInputSDL.cpp b/engines/hpl1/engine/impl/LowLevelInputSDL.cpp
index dc4cdecbdf7..952a98d9ca4 100644
--- a/engines/hpl1/engine/impl/LowLevelInputSDL.cpp
+++ b/engines/hpl1/engine/impl/LowLevelInputSDL.cpp
@@ -25,12 +25,12 @@
* This file is part of HPL1 Engine.
*/
-#include "hpl1/engine/impl/KeyboardSDL.h"
#include "hpl1/engine/impl/LowLevelInputSDL.h"
-#include "hpl1/engine/impl/MouseSDL.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "common/events.h"
#include "common/system.h"
+#include "hpl1/engine/impl/KeyboardSDL.h"
+#include "hpl1/engine/impl/MouseSDL.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/impl/LowLevelInputSDL.h b/engines/hpl1/engine/impl/LowLevelInputSDL.h
index c04aaa2635b..1e8a8eef1e4 100644
--- a/engines/hpl1/engine/impl/LowLevelInputSDL.h
+++ b/engines/hpl1/engine/impl/LowLevelInputSDL.h
@@ -28,9 +28,9 @@
#ifndef HPL_LOWLEVELINPUT_SDL_H
#define HPL_LOWLEVELINPUT_SDL_H
-#include "hpl1/engine/input/LowLevelInput.h"
-#include "common/events.h"
#include "common/array.h"
+#include "common/events.h"
+#include "hpl1/engine/input/LowLevelInput.h"
namespace hpl {
@@ -41,6 +41,7 @@ class iKeyboard;
class cLowLevelInputSDL : public iLowLevelInput {
friend class cKeyboardSDL;
friend class cMouseSDL;
+
public:
cLowLevelInputSDL(iLowLevelGraphics *apLowLevelGraphics);
~cLowLevelInputSDL();
@@ -58,6 +59,6 @@ private:
iLowLevelGraphics *_lowLevelGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELINPUT_SDL_H
diff --git a/engines/hpl1/engine/impl/LowLevelPhysicsNewton.h b/engines/hpl1/engine/impl/LowLevelPhysicsNewton.h
index ee1fa843fa0..d1e2be28456 100644
--- a/engines/hpl1/engine/impl/LowLevelPhysicsNewton.h
+++ b/engines/hpl1/engine/impl/LowLevelPhysicsNewton.h
@@ -28,8 +28,8 @@
#ifndef HPL_LOWLEVELPHYSICS_NEWTON_H
#define HPL_LOWLEVELPHYSICS_NEWTON_H
-#include "hpl1/engine/physics/LowLevelPhysics.h"
#include "hpl1/engine/libraries/newton/Newton.h"
+#include "hpl1/engine/physics/LowLevelPhysics.h"
namespace hpl {
@@ -41,6 +41,6 @@ public:
iPhysicsWorld *CreateWorld();
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELPHYSICS_NEWTON_H
diff --git a/engines/hpl1/engine/impl/LowLevelSoundOpenAL.cpp b/engines/hpl1/engine/impl/LowLevelSoundOpenAL.cpp
index fcd09d4f57b..e35fb033821 100644
--- a/engines/hpl1/engine/impl/LowLevelSoundOpenAL.cpp
+++ b/engines/hpl1/engine/impl/LowLevelSoundOpenAL.cpp
@@ -29,9 +29,9 @@
#include "hpl1/engine/impl/OpenALSoundChannel.h"
#include "hpl1/engine/impl/OpenALSoundData.h"
#include "hpl1/engine/impl/OpenALSoundEnvironment.h"
+#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/math/Math.h"
#include "audio/mixer.h"
#include "common/system.h"
@@ -45,8 +45,7 @@ namespace hpl {
//-----------------------------------------------------------------------
-cLowLevelSoundOpenAL::cLowLevelSoundOpenAL() :
- _activeChannels(MAX_ACTIVE_CHANNELS, nullptr) {
+cLowLevelSoundOpenAL::cLowLevelSoundOpenAL() : _activeChannels(MAX_ACTIVE_CHANNELS, nullptr) {
mvFormats[0] = "OGG";
mvFormats[1] = "WAV";
mvFormats[2] = "";
@@ -188,7 +187,7 @@ void cLowLevelSoundOpenAL::FadeSoundEnvironment(iSoundEnvironment *apSourceSound
static cOpenALSoundChannel **findBestSlot(Common::Array<cOpenALSoundChannel *> &slots, int priority) {
cOpenALSoundChannel **best = slots.end();
- for(auto it = slots.begin(); it != slots.end(); ++it) {
+ for (auto it = slots.begin(); it != slots.end(); ++it) {
if (*it == nullptr || !(*it)->IsPlaying())
return it;
if ((*it)->GetPriority() < priority)
@@ -203,7 +202,7 @@ bool cLowLevelSoundOpenAL::playChannel(cOpenALSoundChannel *channel) {
if (*slot != nullptr) {
if ((*slot)->IsPlaying()) {
Hpl1::logInfo(Hpl1::kDebugAudio, "evicting sound from data %s from mixer slot\n",
- (*slot)->mpData->GetName().c_str());
+ (*slot)->mpData->GetName().c_str());
}
(*slot)->Stop();
}
diff --git a/engines/hpl1/engine/impl/LowLevelSoundOpenAL.h b/engines/hpl1/engine/impl/LowLevelSoundOpenAL.h
index 87a77ab2256..0bd0b978333 100644
--- a/engines/hpl1/engine/impl/LowLevelSoundOpenAL.h
+++ b/engines/hpl1/engine/impl/LowLevelSoundOpenAL.h
@@ -28,8 +28,8 @@
#ifndef HPL_LOWLEVELSOUND_OPENAL_H
#define HPL_LOWLEVELSOUND_OPENAL_H
-#include "hpl1/engine/sound/LowLevelSound.h"
#include "common/array.h"
+#include "hpl1/engine/sound/LowLevelSound.h"
namespace Audio {
@@ -86,6 +86,6 @@ private:
bool mbNullEffectAttached;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELSOUND_OPENAL_H
diff --git a/engines/hpl1/engine/impl/MeshLoaderCollada.cpp b/engines/hpl1/engine/impl/MeshLoaderCollada.cpp
index 3574ac7a682..ca4faacebe6 100644
--- a/engines/hpl1/engine/impl/MeshLoaderCollada.cpp
+++ b/engines/hpl1/engine/impl/MeshLoaderCollada.cpp
@@ -29,9 +29,9 @@
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/scene/ColliderEntity.h"
#include "hpl1/engine/scene/Light3DPoint.h"
@@ -929,7 +929,7 @@ cMesh *cMeshLoaderCollada::LoadMesh(const tString &asFile, tMeshLoadFlag aFlags)
if (pTrack == NULL)
continue;
if (pSkeleton) {
- //cBone *pBone = pSkeleton->GetBoneByName(pTrack->GetName());
+ // cBone *pBone = pSkeleton->GetBoneByName(pTrack->GetName());
int lBoneIdx = pSkeleton->GetBoneIndexByName(pTrack->GetName());
pTrack->SetNodeIndex(lBoneIdx);
} else {
@@ -1089,7 +1089,7 @@ cAnimation *cMeshLoaderCollada::LoadAnimation(const tString &asFile) {
if (pTrack == NULL)
continue;
if (pSkeleton) {
- //cBone *pBone = pSkeleton->GetBoneByName(pTrack->GetName());
+ // cBone *pBone = pSkeleton->GetBoneByName(pTrack->GetName());
int lBoneIdx = pSkeleton->GetBoneIndexByName(pTrack->GetName());
pTrack->SetNodeIndex(lBoneIdx);
} else {
@@ -1753,7 +1753,7 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld
Error("Too few params in billboard entity entity '%s'\n", apNode->msName.c_str());
} else {
cVector2f vSize(apNode->mvScale.x, apNode->mvScale.y);
- //float fOffset = apNode->mvScale.z;
+ // float fOffset = apNode->mvScale.z;
tString sName = vParams[vParams.size() - 1];
tString sFile = "";
@@ -1804,7 +1804,7 @@ void cMeshLoaderCollada::AddSceneObjects(cColladaNode *apNode, cWorld3D *apWorld
sName = vParams[1];
sType = cString::Sub(apNode->msName, 4 + (int)sName.size() + 1);
pPS = apWorld->CreateParticleSystem(sName, sType, apNode->mvScale,
- apNode->m_mtxWorldTransform);
+ apNode->m_mtxWorldTransform);
if (pPS == NULL) {
Error("Couldn't load particle system '%s' with type '%s'\n",
diff --git a/engines/hpl1/engine/impl/MeshLoaderCollada.h b/engines/hpl1/engine/impl/MeshLoaderCollada.h
index 07652ffc62d..c862716ae9a 100644
--- a/engines/hpl1/engine/impl/MeshLoaderCollada.h
+++ b/engines/hpl1/engine/impl/MeshLoaderCollada.h
@@ -28,12 +28,12 @@
#ifndef HPL_MESH_LOADER_COLLADA_H
#define HPL_MESH_LOADER_COLLADA_H
+#include "common/list.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/physics/PhysicsJoint.h"
#include "hpl1/engine/resources/MeshLoader.h"
#include "hpl1/engine/system/MemoryManager.h"
-#include "common/list.h"
class TiXmlElement;
@@ -553,6 +553,6 @@ private:
cVector3f GetVectorScaleFromPtr(float *apVec);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_LOADER_COLLADA_H
diff --git a/engines/hpl1/engine/impl/MeshLoaderColladaHelpers.cpp b/engines/hpl1/engine/impl/MeshLoaderColladaHelpers.cpp
index e3d368f25ab..a0a9a9ac3c4 100644
--- a/engines/hpl1/engine/impl/MeshLoaderColladaHelpers.cpp
+++ b/engines/hpl1/engine/impl/MeshLoaderColladaHelpers.cpp
@@ -29,8 +29,8 @@
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/graphics/Mesh.h"
@@ -48,7 +48,7 @@
namespace hpl {
-#define GetAdress(sStr) \
+#define GetAdress(sStr) \
if (sStr.size() > 0 && sStr[0] == '#') \
sStr = cString::Sub(sStr, 1);
//////////////////////////////////////////////////////////////////////////
@@ -748,7 +748,7 @@ void cMeshLoaderCollada::LoadColladaScene(TiXmlElement *apRootElem, cColladaNode
// Log("Node. %s, type: %s\n",pNode->msId.c_str(),pNode->msType.c_str());
- //cVector3f vTranslation = cVector3f(0, 0, 0);
+ // cVector3f vTranslation = cVector3f(0, 0, 0);
///////////////////////////////////////////////////////////
// Iterate through all of the transforms.
@@ -1290,7 +1290,7 @@ void cMeshLoaderCollada::LoadGeometry(TiXmlElement *apRootElem, tColladaGeometry
}
int lTriElements = 0;
- /*int lTriCount = */cString::ToInt(pTriElem->Attribute("count"), 0);
+ /*int lTriCount = */ cString::ToInt(pTriElem->Attribute("count"), 0);
Geometry.msMaterial = cString::ToString(pTriElem->Attribute("material"), "");
GetAdress(Geometry.msMaterial);
diff --git a/engines/hpl1/engine/impl/MeshLoaderColladaLoader.cpp b/engines/hpl1/engine/impl/MeshLoaderColladaLoader.cpp
index d91de989785..61506b02493 100644
--- a/engines/hpl1/engine/impl/MeshLoaderColladaLoader.cpp
+++ b/engines/hpl1/engine/impl/MeshLoaderColladaLoader.cpp
@@ -29,9 +29,9 @@
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/graphics/Mesh.h"
diff --git a/engines/hpl1/engine/impl/MeshLoaderMSH.cpp b/engines/hpl1/engine/impl/MeshLoaderMSH.cpp
index 3d2cb1d4319..c073937e1d1 100644
--- a/engines/hpl1/engine/impl/MeshLoaderMSH.cpp
+++ b/engines/hpl1/engine/impl/MeshLoaderMSH.cpp
@@ -29,8 +29,8 @@
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/VertexBuffer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/graphics/Mesh.h"
diff --git a/engines/hpl1/engine/impl/MeshLoaderMSH.h b/engines/hpl1/engine/impl/MeshLoaderMSH.h
index b4865c20398..d0e3b95603f 100644
--- a/engines/hpl1/engine/impl/MeshLoaderMSH.h
+++ b/engines/hpl1/engine/impl/MeshLoaderMSH.h
@@ -69,6 +69,6 @@ private:
const char *GetVertexName(tVertexFlag aFlag);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_LOADER_MSH_H
diff --git a/engines/hpl1/engine/impl/MouseSDL.cpp b/engines/hpl1/engine/impl/MouseSDL.cpp
index daa032fac25..76e61382940 100644
--- a/engines/hpl1/engine/impl/MouseSDL.cpp
+++ b/engines/hpl1/engine/impl/MouseSDL.cpp
@@ -26,11 +26,11 @@
*/
#include "hpl1/engine/impl/MouseSDL.h"
+#include "common/bitarray.h"
+#include "common/events.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/impl/LowLevelInputSDL.h"
#include "hpl1/engine/input/InputTypes.h"
-#include "common/bitarray.h"
-#include "common/events.h"
namespace hpl {
@@ -91,16 +91,16 @@ static void setMouseState(const int state, Common::BitArray &states) {
void cMouseSDL::processEvent(const Common::Event &ev) {
if (!Common::isMouseEvent(ev))
return;
- //const cVector2f screenSize = _lowLevelGraphics->GetScreenSize();
- //const cVector2f virtualSize = _lowLevelGraphics->GetVirtualSize();
+ // const cVector2f screenSize = _lowLevelGraphics->GetScreenSize();
+ // const cVector2f virtualSize = _lowLevelGraphics->GetVirtualSize();
if (ev.type == Common::EVENT_MOUSEMOVE) {
_absMousePos = cVector2f(ev.mouse.x, ev.mouse.y);
- //mvMouseAbsPos = (mvMouseAbsPos / screenSize) * virtualSize;
+ // mvMouseAbsPos = (mvMouseAbsPos / screenSize) * virtualSize;
} else {
setMouseState(ev.type, _buttonState);
}
_relMousePos = cVector2f(ev.relMouse.x, ev.relMouse.y);
- //mvMouseRelPos = (mvMouseRelPos / screenSize) * virtualSize;
+ // mvMouseRelPos = (mvMouseRelPos / screenSize) * virtualSize;
}
void cMouseSDL::Update() {
diff --git a/engines/hpl1/engine/impl/MouseSDL.h b/engines/hpl1/engine/impl/MouseSDL.h
index 6b8069107f1..6069e5b82eb 100644
--- a/engines/hpl1/engine/impl/MouseSDL.h
+++ b/engines/hpl1/engine/impl/MouseSDL.h
@@ -28,8 +28,8 @@
#ifndef HPL_MOUSE_SDL_H
#define HPL_MOUSE_SDL_H
-#include "hpl1/engine/input/Mouse.h"
#include "common/bitarray.h"
+#include "hpl1/engine/input/Mouse.h"
namespace Common {
struct Event;
diff --git a/engines/hpl1/engine/impl/OcclusionQueryOGL.cpp b/engines/hpl1/engine/impl/OcclusionQueryOGL.cpp
index 79457e5a86d..fb72f846e7e 100644
--- a/engines/hpl1/engine/impl/OcclusionQueryOGL.cpp
+++ b/engines/hpl1/engine/impl/OcclusionQueryOGL.cpp
@@ -30,7 +30,6 @@
#ifdef USE_OPENGL
-
namespace hpl {
//////////////////////////////////////////////////////////////////////////
diff --git a/engines/hpl1/engine/impl/OcclusionQueryOGL.h b/engines/hpl1/engine/impl/OcclusionQueryOGL.h
index be2b8480872..de67bccc051 100644
--- a/engines/hpl1/engine/impl/OcclusionQueryOGL.h
+++ b/engines/hpl1/engine/impl/OcclusionQueryOGL.h
@@ -28,8 +28,8 @@
#ifndef HPL_OCCLUSION_QUERY_OGL_H
#define HPL_OCCLUSION_QUERY_OGL_H
-#include "hpl1/engine/graphics/OcclusionQuery.h"
#include "common/scummsys.h"
+#include "hpl1/engine/graphics/OcclusionQuery.h"
#ifdef USE_OPENGL
@@ -50,7 +50,7 @@ public:
unsigned int mlQueryId;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_OCCLUSION_QUERY_H
diff --git a/engines/hpl1/engine/impl/OpenALSoundChannel.cpp b/engines/hpl1/engine/impl/OpenALSoundChannel.cpp
index 10fc7d9a045..9c5d6fd7251 100644
--- a/engines/hpl1/engine/impl/OpenALSoundChannel.cpp
+++ b/engines/hpl1/engine/impl/OpenALSoundChannel.cpp
@@ -26,9 +26,9 @@
*/
#include "hpl1/engine/impl/OpenALSoundChannel.h"
+#include "hpl1/engine/impl/LowLevelSoundOpenAL.h"
#include "hpl1/engine/impl/OpenALSoundData.h"
#include "hpl1/engine/resources/SoundManager.h"
-#include "hpl1/engine/impl/LowLevelSoundOpenAL.h"
#include "audio/mixer.h"
#include "common/system.h"
@@ -97,7 +97,7 @@ void cOpenALSoundChannel::Play() {
Hpl1::logInfo(Hpl1::kDebugAudio, "playing sound channel from data %s\n", mpData->GetName().c_str());
if (!_lowLevelSound->playChannel(this)) {
Hpl1::logWarning(Hpl1::kDebugAudio, "sound channel from data %s could not be played\n",
- mpData->GetName().c_str());
+ mpData->GetName().c_str());
}
SetVolume(mfVolume);
if (mbLooping)
@@ -189,7 +189,7 @@ void cOpenALSoundChannel::SetPosition(const cVector3f &avPos) {
//-----------------------------------------------------------------------
void cOpenALSoundChannel::SetVelocity(const cVector3f &avVel) {
- mvVelocity = avVel;
+ mvVelocity = avVel;
#if 0
OAL_Source_SetAttributes ( mlChannel, mvPosition.v, mvVelocity.v );
#endif
diff --git a/engines/hpl1/engine/impl/OpenALSoundChannel.h b/engines/hpl1/engine/impl/OpenALSoundChannel.h
index a38e8ea2194..0bebbe08c8e 100644
--- a/engines/hpl1/engine/impl/OpenALSoundChannel.h
+++ b/engines/hpl1/engine/impl/OpenALSoundChannel.h
@@ -28,13 +28,13 @@
#ifndef HPL_OPENAL_SOUND_CHANNEL_H
#define HPL_OPENAL_SOUND_CHANNEL_H
-#include "hpl1/engine/impl/OpenALSoundData.h"
-#include "hpl1/engine/sound/SoundChannel.h"
-#include "hpl1/engine/sound/SoundData.h"
+#include "audio/audiostream.h"
#include "audio/mixer.h"
#include "common/file.h"
#include "common/str.h"
-#include "audio/audiostream.h"
+#include "hpl1/engine/impl/OpenALSoundData.h"
+#include "hpl1/engine/sound/SoundChannel.h"
+#include "hpl1/engine/sound/SoundData.h"
//#include "OALWrapper/OAL_Funcs.h"
@@ -44,8 +44,9 @@ class cLowLevelSoundOpenAL;
class cOpenALSoundChannel : public iSoundChannel {
friend class cLowLevelSoundOpenAL;
+
public:
- cOpenALSoundChannel(cOpenALSoundData *soundData, Audio::SeekableAudioStream* audioStream, cSoundManager *apSoundManger, cLowLevelSoundOpenAL *lowLevelSound, int priority);
+ cOpenALSoundChannel(cOpenALSoundData *soundData, Audio::SeekableAudioStream *audioStream, cSoundManager *apSoundManger, cLowLevelSoundOpenAL *lowLevelSound, int priority);
~cOpenALSoundChannel();
void Play();
@@ -86,12 +87,12 @@ private:
Audio::SeekableAudioStream *_audioStream;
cLowLevelSoundOpenAL *_lowLevelSound;
int _priority;
- //int mlDefaultFreq;
+ // int mlDefaultFreq;
- //float mfPosition[3];
- //float mfVelocity[3];
+ // float mfPosition[3];
+ // float mfVelocity[3];
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_OPENAL_CHANNEL_H
diff --git a/engines/hpl1/engine/impl/OpenALSoundData.h b/engines/hpl1/engine/impl/OpenALSoundData.h
index 38054e1b973..59c0a037251 100644
--- a/engines/hpl1/engine/impl/OpenALSoundData.h
+++ b/engines/hpl1/engine/impl/OpenALSoundData.h
@@ -31,9 +31,9 @@
#include "hpl1/engine/sound/SoundData.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/str.h"
#include "audio/audiostream.h"
#include "common/ptr.h"
+#include "common/str.h"
namespace hpl {
@@ -41,7 +41,7 @@ class cLowLevelSoundOpenAL;
class cOpenALSoundData : public iSoundData {
public:
- cOpenALSoundData(tString asName, bool abStream, cLowLevelSoundOpenAL* lowLevelSound);
+ cOpenALSoundData(tString asName, bool abStream, cLowLevelSoundOpenAL *lowLevelSound);
~cOpenALSoundData();
bool CreateFromFile(const tString &asFile);
@@ -57,6 +57,6 @@ private:
cLowLevelSoundOpenAL *_lowLevelSound;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_OPENAL_SOUND_DATA_H
diff --git a/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp b/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
index f57f04e750c..03cee5f03eb 100644
--- a/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsBodyNewton.cpp
@@ -382,9 +382,9 @@ struct DrawParameters {
};
///////////////////////////////////////////
-static void RenderDebugPolygon(void* params, int alVertexCount, const dFloat *apFaceVertex, int alId) {
+static void RenderDebugPolygon(void *params, int alVertexCount, const dFloat *apFaceVertex, int alId) {
int i = alVertexCount - 1;
- const DrawParameters* drawParams = static_cast<DrawParameters*>(params);
+ const DrawParameters *drawParams = static_cast<DrawParameters *>(params);
cVector3f vP0(apFaceVertex[i * 3 + 0], apFaceVertex[i * 3 + 1], apFaceVertex[i * 3 + 2]);
for (i = 0; i < alVertexCount; ++i) {
cVector3f vP1(apFaceVertex[i * 3 + 0], apFaceVertex[i * 3 + 1], apFaceVertex[i * 3 + 2]);
@@ -397,7 +397,7 @@ static void RenderDebugPolygon(void* params, int alVertexCount, const dFloat *ap
void cPhysicsBodyNewton::RenderDebugGeometry(iLowLevelGraphics *apLowLevel, const cColor &aColor) {
DrawParameters params{apLowLevel, aColor};
- NewtonCollisionForEachPolygonDo(NewtonBodyGetCollision(mpNewtonBody), GetLocalMatrix().GetTranspose().v, RenderDebugPolygon, static_cast<void*>(¶ms));
+ NewtonCollisionForEachPolygonDo(NewtonBodyGetCollision(mpNewtonBody), GetLocalMatrix().GetTranspose().v, RenderDebugPolygon, static_cast<void *>(¶ms));
}
//-----------------------------------------------------------------------
@@ -431,8 +431,8 @@ void cPhysicsBodyNewton::OnTransformCallback(const NewtonBody *apBody, const dFl
//-----------------------------------------------------------------------
int cPhysicsBodyNewton::BuoyancyPlaneCallback(const int alCollisionID, void *apContext,
- const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane) {
- cPlanef surfacePlane = static_cast<cPhysicsBodyNewton*>(apContext)->mBuoyancy.mSurface;
+ const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane) {
+ cPlanef surfacePlane = static_cast<cPhysicsBodyNewton *>(apContext)->mBuoyancy.mSurface;
afGlobalSpacePlane[0] = surfacePlane.a;
afGlobalSpacePlane[1] = surfacePlane.b;
afGlobalSpacePlane[2] = surfacePlane.c;
diff --git a/engines/hpl1/engine/impl/PhysicsBodyNewton.h b/engines/hpl1/engine/impl/PhysicsBodyNewton.h
index 4100edc2b60..979df27c9aa 100644
--- a/engines/hpl1/engine/impl/PhysicsBodyNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsBodyNewton.h
@@ -102,7 +102,7 @@ public:
private:
static int BuoyancyPlaneCallback(const int alCollisionID, void *apContext,
- const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane);
+ const float *afGlobalSpaceMatrix, float *afGlobalSpacePlane);
static void OnTransformCallback(const NewtonBody *apBody, const dFloat *apMatrix, int);
static void OnUpdateCallback(NewtonBody *apBody, float, int);
@@ -129,6 +129,6 @@ private:
cVector3f mvTotalTorque;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_BODY_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsControllerNewton.h b/engines/hpl1/engine/impl/PhysicsControllerNewton.h
index 653dd4da413..f3dfe26cc62 100644
--- a/engines/hpl1/engine/impl/PhysicsControllerNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsControllerNewton.h
@@ -40,6 +40,6 @@ public:
~cPhysicsControllerNewton();
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_CONTROLLER_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsJointBallNewton.h b/engines/hpl1/engine/impl/PhysicsJointBallNewton.h
index f1decc69e13..1fa012557bf 100644
--- a/engines/hpl1/engine/impl/PhysicsJointBallNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsJointBallNewton.h
@@ -52,6 +52,6 @@ public:
private:
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_BALL_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsJointHingeNewton.h b/engines/hpl1/engine/impl/PhysicsJointHingeNewton.h
index 9593cfcfd0b..ecc2ea55dc9 100644
--- a/engines/hpl1/engine/impl/PhysicsJointHingeNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsJointHingeNewton.h
@@ -56,6 +56,6 @@ private:
static unsigned LimitCallback(const NewtonJoint *pHinge, NewtonHingeSliderUpdateDesc *pDesc);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_HINGE_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsJointNewton.h b/engines/hpl1/engine/impl/PhysicsJointNewton.h
index 50e3470daa3..863294df9d1 100644
--- a/engines/hpl1/engine/impl/PhysicsJointNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsJointNewton.h
@@ -92,6 +92,6 @@ protected:
NewtonBody *mpNewtonChildBody;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsJointScrewNewton.h b/engines/hpl1/engine/impl/PhysicsJointScrewNewton.h
index 4bfb4c73d52..8fa45bfbac4 100644
--- a/engines/hpl1/engine/impl/PhysicsJointScrewNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsJointScrewNewton.h
@@ -55,6 +55,6 @@ private:
static unsigned LimitCallback(const NewtonJoint *pSlider, NewtonHingeSliderUpdateDesc *pDesc);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_SCREW_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsJointSliderNewton.cpp b/engines/hpl1/engine/impl/PhysicsJointSliderNewton.cpp
index a1b7ba20b96..52ae33d204d 100644
--- a/engines/hpl1/engine/impl/PhysicsJointSliderNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsJointSliderNewton.cpp
@@ -30,8 +30,8 @@
#include "hpl1/engine/impl/PhysicsBodyNewton.h"
#include "hpl1/engine/impl/PhysicsWorldNewton.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "common/str.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/impl/PhysicsJointSliderNewton.h b/engines/hpl1/engine/impl/PhysicsJointSliderNewton.h
index 8a553c0f7a6..eb80f8abb45 100644
--- a/engines/hpl1/engine/impl/PhysicsJointSliderNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsJointSliderNewton.h
@@ -55,6 +55,6 @@ private:
static unsigned LimitCallback(const NewtonJoint *pSlider, NewtonHingeSliderUpdateDesc *pDesc);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_SLIDER_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp b/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
index 0a5b5ec17e2..ca6c9b416e0 100644
--- a/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsMaterialNewton.cpp
@@ -34,8 +34,8 @@
#include "hpl1/engine/physics/PhysicsMaterial.h"
#include "hpl1/engine/physics/SurfaceData.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "common/util.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -157,9 +157,9 @@ void cPhysicsMaterialNewton::UpdateMaterials() {
cPhysicsMaterialNewton *pMat = static_cast<cPhysicsMaterialNewton *>(MatIt.Next());
ePhysicsMaterialCombMode frictionMode = (ePhysicsMaterialCombMode)MAX(mFrictionMode,
- pMat->mFrictionMode);
+ pMat->mFrictionMode);
ePhysicsMaterialCombMode elasticityMode = (ePhysicsMaterialCombMode)MAX(mElasticityMode,
- pMat->mElasticityMode);
+ pMat->mElasticityMode);
// If the material is the same do not blend.
if (pMat == this) {
@@ -350,7 +350,8 @@ void ContactProcessor::endProcessing() {
void cPhysicsMaterialNewton::ProcessContactCallback(const NewtonJoint *joint, float, int) {
ContactProcessor processor(joint);
- while (processor.processNext()) {}
+ while (processor.processNext()) {
+ }
processor.endProcessing();
}
diff --git a/engines/hpl1/engine/impl/PhysicsMaterialNewton.h b/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
index 4eec8511960..10c7df82e77 100644
--- a/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsMaterialNewton.h
@@ -77,6 +77,6 @@ private:
float mfKineticFriction;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_MATERIAL_NEWTON_H
diff --git a/engines/hpl1/engine/impl/PhysicsWorldNewton.cpp b/engines/hpl1/engine/impl/PhysicsWorldNewton.cpp
index 8608079cfdf..af472cf9b43 100644
--- a/engines/hpl1/engine/impl/PhysicsWorldNewton.cpp
+++ b/engines/hpl1/engine/impl/PhysicsWorldNewton.cpp
@@ -448,10 +448,10 @@ void cPhysicsWorldNewton::CastRay(iPhysicsRayCallback *apCallback,
//-----------------------------------------------------------------------
// Fix found in HPL2 (https://github.com/FrictionalGames/AmnesiaTheDarkDescent)
-static void correctNormal(cVector3f& normal, const cVector3f& collidePoint, const cVector3f& shapeCenter) {
+static void correctNormal(cVector3f &normal, const cVector3f &collidePoint, const cVector3f &shapeCenter) {
cVector3f vCenterToCollidePoint = collidePoint - shapeCenter;
- //A check if the normal points in the wrong direction.
- if(cMath::Vector3Dot(vCenterToCollidePoint, normal)>0)
+ // A check if the normal points in the wrong direction.
+ if (cMath::Vector3Dot(vCenterToCollidePoint, normal) > 0)
normal = normal * -1;
}
@@ -512,7 +512,7 @@ bool cPhysicsWorldNewton::CheckShapeCollision(iCollideShape *apShapeA, const cMa
CollPoint.mvPoint.z = mpTempPoints[lVertex + 2];
if (correctNormalDirection && apShapeA->GetType() != eCollideShapeType_Mesh)
- correctNormal(CollPoint.mvNormal, CollPoint.mvPoint,a_mtxA.GetTranslation());
+ correctNormal(CollPoint.mvNormal, CollPoint.mvPoint, a_mtxA.GetTranslation());
}
lCollideDataStart += lNum;
@@ -555,7 +555,7 @@ bool cPhysicsWorldNewton::CheckShapeCollision(iCollideShape *apShapeA, const cMa
CollPoint.mvPoint.z = mpTempPoints[lVertex + 2];
if (correctNormalDirection && apShapeA->GetType() != eCollideShapeType_Mesh)
- correctNormal(CollPoint.mvNormal, CollPoint.mvPoint,a_mtxA.GetTranslation());
+ correctNormal(CollPoint.mvNormal, CollPoint.mvPoint, a_mtxA.GetTranslation());
}
aCollideData.mlNumOfPoints = lNum;
diff --git a/engines/hpl1/engine/impl/PhysicsWorldNewton.h b/engines/hpl1/engine/impl/PhysicsWorldNewton.h
index 9a003f10d12..4ae0c97f1aa 100644
--- a/engines/hpl1/engine/impl/PhysicsWorldNewton.h
+++ b/engines/hpl1/engine/impl/PhysicsWorldNewton.h
@@ -109,6 +109,6 @@ private:
ePhysicsAccuracy mAccuracy;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_WORLD_NEWTON_H
diff --git a/engines/hpl1/engine/impl/SDLTexture.cpp b/engines/hpl1/engine/impl/SDLTexture.cpp
index 261d067f502..3e711b57ec4 100644
--- a/engines/hpl1/engine/impl/SDLTexture.cpp
+++ b/engines/hpl1/engine/impl/SDLTexture.cpp
@@ -395,7 +395,7 @@ void cSDLTexture::SetFilter(eTextureFilter aFilter) {
//-----------------------------------------------------------------------
void cSDLTexture::SetAnisotropyDegree(float afX) {
-//gl 4.6
+// gl 4.6
#if 0
if(!mpLowLevelGraphics->GetCaps(eGraphicCaps_AnisotropicFiltering)) return;
if(afX < 1.0f) return;
@@ -529,7 +529,7 @@ bool cSDLTexture::CreateFromBitmapToHandle(Bitmap2D *pBmp, int alHandleIdx) {
// Log("OldSize: %d x %d ",mlWidth,mlHeight);
int lOldW = _width;
- //int lOldH = _height;
+ // int lOldH = _height;
int lSizeDiv = (int)pow((float)2, (int)mlSizeLevel);
@@ -582,7 +582,7 @@ bool cSDLTexture::CreateFromBitmapToHandle(Bitmap2D *pBmp, int alHandleIdx) {
GL_UNSIGNED_BYTE, pPixelSrc);
else
glTexImage2D(GLTarget, 0, internalFormat, _width, _height,
- 0, format, GL_UNSIGNED_BYTE, pPixelSrc);
+ 0, format, GL_UNSIGNED_BYTE, pPixelSrc);
if (glGetError() != GL_NO_ERROR)
return false;
@@ -654,4 +654,4 @@ GLenum cSDLTexture::GetGLWrap(eTextureWrap aMode) {
} // namespace hpl
-#endif //USE_OPENGL
\ No newline at end of file
+#endif // USE_OPENGL
\ No newline at end of file
diff --git a/engines/hpl1/engine/impl/SDLTexture.h b/engines/hpl1/engine/impl/SDLTexture.h
index 96ab85c4554..330aee9c347 100644
--- a/engines/hpl1/engine/impl/SDLTexture.h
+++ b/engines/hpl1/engine/impl/SDLTexture.h
@@ -28,10 +28,10 @@
#ifndef HPL_SDL_TEXTURE_H
#define HPL_SDL_TEXTURE_H
+#include "common/scummsys.h"
#include "hpl1/engine/graphics/Texture.h"
-#include "hpl1/engine/impl/LowLevelGraphicsSDL.h"
#include "hpl1/engine/graphics/bitmap2D.h"
-#include "common/scummsys.h"
+#include "hpl1/engine/impl/LowLevelGraphicsSDL.h"
#ifdef USE_OPENGL
@@ -80,7 +80,7 @@ public:
/// SDL / OGL Specific ///////////
unsigned int GetTextureHandle();
- //cPBuffer *GetPBuffer() { return mpPBuffer; }
+ // cPBuffer *GetPBuffer() { return mpPBuffer; }
private:
bool CreateFromBitmapToHandle(Bitmap2D *pBmp, int alHandleIdx);
@@ -99,7 +99,7 @@ private:
float mfTimeDir;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_SDL_TEXTURE_H
diff --git a/engines/hpl1/engine/impl/SqScript.cpp b/engines/hpl1/engine/impl/SqScript.cpp
index 488826202a4..c42333a40b1 100644
--- a/engines/hpl1/engine/impl/SqScript.cpp
+++ b/engines/hpl1/engine/impl/SqScript.cpp
@@ -25,10 +25,10 @@
* This file is part of HPL1 Engine.
*/
-#include "hpl1/engine/libraries/angelscript/add-ons/scripthelper.h"
#include "hpl1/engine/impl/SqScript.h"
#include "common/file.h"
#include "hpl1/debug.h"
+#include "hpl1/engine/libraries/angelscript/add-ons/scripthelper.h"
#include "hpl1/engine/libraries/angelscript/angelscript.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/system/String.h"
diff --git a/engines/hpl1/engine/impl/SqScript.h b/engines/hpl1/engine/impl/SqScript.h
index 5608a43dcea..0b9d1ccfb8f 100644
--- a/engines/hpl1/engine/impl/SqScript.h
+++ b/engines/hpl1/engine/impl/SqScript.h
@@ -58,6 +58,6 @@ private:
char *LoadCharBuffer(const tString &asFileName, int &alLength);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SCRIPT_H
diff --git a/engines/hpl1/engine/impl/VertexBufferOGL.h b/engines/hpl1/engine/impl/VertexBufferOGL.h
index 8f56735c048..6a03490f4d6 100644
--- a/engines/hpl1/engine/impl/VertexBufferOGL.h
+++ b/engines/hpl1/engine/impl/VertexBufferOGL.h
@@ -28,12 +28,11 @@
#ifndef HPL_VERTEXBUFFER_OGL_H
#define HPL_VERTEXBUFFER_OGL_H
-#include "hpl1/engine/graphics/VertexBuffer.h"
#include "common/scummsys.h"
+#include "hpl1/engine/graphics/VertexBuffer.h"
#ifdef USE_OPENGL
-
namespace hpl {
class cVertexBufferOGL : public iVertexBuffer {
@@ -91,7 +90,7 @@ private:
bool mbHasShadowDouble;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_RENDERER3D_OGL_H
diff --git a/engines/hpl1/engine/impl/VertexBufferVBO.cpp b/engines/hpl1/engine/impl/VertexBufferVBO.cpp
index 03a2abc7a92..660d63329b0 100644
--- a/engines/hpl1/engine/impl/VertexBufferVBO.cpp
+++ b/engines/hpl1/engine/impl/VertexBufferVBO.cpp
@@ -32,7 +32,6 @@
#ifdef USE_OPENGL
-
namespace hpl {
#define BUFFER_OFFSET(i) ((void *)(i * sizeof(float)))
diff --git a/engines/hpl1/engine/impl/VertexBufferVBO.h b/engines/hpl1/engine/impl/VertexBufferVBO.h
index 140164e2509..099f6fa473a 100644
--- a/engines/hpl1/engine/impl/VertexBufferVBO.h
+++ b/engines/hpl1/engine/impl/VertexBufferVBO.h
@@ -28,8 +28,8 @@
#ifndef HPL_VERTEXBUFFER_VBO_H
#define HPL_VERTEXBUFFER_VBO_H
-#include "hpl1/engine/graphics/VertexBuffer.h"
#include "common/scummsys.h"
+#include "hpl1/engine/graphics/VertexBuffer.h"
#ifdef USE_OPENGL
@@ -97,7 +97,7 @@ private:
bool mbCompiled;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_OPENGL
#endif // HPL_RENDERER3D_VBO_H
diff --git a/engines/hpl1/engine/impl/low_level_graphics_tgl.cpp b/engines/hpl1/engine/impl/low_level_graphics_tgl.cpp
index 1bf1e42c060..d40e44f1172 100644
--- a/engines/hpl1/engine/impl/low_level_graphics_tgl.cpp
+++ b/engines/hpl1/engine/impl/low_level_graphics_tgl.cpp
@@ -23,16 +23,16 @@
#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/graphics/font_data.h"
+#include "hpl1/engine/impl/occlusion_query_tgl.h"
+#include "hpl1/engine/impl/texture_tgl.h"
#include "hpl1/engine/impl/vertex_buffer_tgl.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/impl/texture_tgl.h"
-#include "hpl1/engine/impl/occlusion_query_tgl.h"
#include "common/algorithm.h"
#include "common/system.h"
#include "engines/util.h"
-#include "hpl1/debug.h"
#include "graphics/tinygl/tinygl.h"
+#include "hpl1/debug.h"
#include "hpl1/graphics.h"
namespace hpl {
@@ -347,7 +347,7 @@ LowLevelGraphicsTGL::~LowLevelGraphicsTGL() {
}
bool LowLevelGraphicsTGL::Init(int alWidth, int alHeight, int alBpp, int abFullscreen,
- int alMultisampling, const tString &asWindowCaption) {
+ int alMultisampling, const tString &asWindowCaption) {
mvScreenSize.x = alWidth;
mvScreenSize.y = alHeight;
mlBpp = alBpp;
@@ -420,8 +420,8 @@ void LowLevelGraphicsTGL::SetupGL() {
tglEnableClientState(TGL_TEXTURE_COORD_ARRAY); // Tex coords
tglDisableClientState(TGL_NORMAL_ARRAY);
// Disable the once not used.
- //tglDisableClientState(TGL_INDEX_ARRAY); // color index
- //tglDisableClientState(TGL_EDGE_FLAG_ARRAY);
+ // tglDisableClientState(TGL_INDEX_ARRAY); // color index
+ // tglDisableClientState(TGL_EDGE_FLAG_ARRAY);
///// END BATCH ARRAY STUFF ///////////////
@@ -564,7 +564,7 @@ iTexture *LowLevelGraphicsTGL::CreateTexture(const tString &asName, bool abUseMi
//-----------------------------------------------------------------------
iTexture *LowLevelGraphicsTGL::CreateTexture(Bitmap2D *apBmp, bool abUseMipMaps, eTextureType aType,
- eTextureTarget aTarget) {
+ eTextureTarget aTarget) {
if (aTarget != eTextureTarget_2D)
return nullptr;
TGLTexture *pTex = hplNew(TGLTexture, ("", &mpPixelFormat, this, aType, abUseMipMaps, aTarget));
@@ -575,7 +575,7 @@ iTexture *LowLevelGraphicsTGL::CreateTexture(Bitmap2D *apBmp, bool abUseMipMaps,
//-----------------------------------------------------------------------
iTexture *LowLevelGraphicsTGL::CreateTexture(const cVector2l &avSize, int alBpp, cColor aFillCol,
- bool abUseMipMaps, eTextureType aType, eTextureTarget aTarget) {
+ bool abUseMipMaps, eTextureType aType, eTextureTarget aTarget) {
if (aTarget != eTextureTarget_2D)
return nullptr;
@@ -706,7 +706,7 @@ void LowLevelGraphicsTGL::SetTexture(unsigned int alUnit, iTexture *apTex) {
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetActiveTextureUnit(unsigned int alUnit) {
- //tglActiveTexture(GL_TEXTURE0 + alUnit);
+ // tglActiveTexture(GL_TEXTURE0 + alUnit);
}
//-----------------------------------------------------------------------
@@ -717,9 +717,9 @@ void LowLevelGraphicsTGL::SetTextureEnv(eTextureParam aParam, int alVal) {
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetTextureConstantColor(const cColor &color) {
- //float vColor[] = {color.r, color.g, color.b, color.a};
+ // float vColor[] = {color.r, color.g, color.b, color.a};
- //tglTexEnvfv(TGL_TEXTURE_ENV, TGL_TEXTURE_ENV_COLOR, &vColor[0]);
+ // tglTexEnvfv(TGL_TEXTURE_ENV, TGL_TEXTURE_ENV_COLOR, &vColor[0]);
}
//-----------------------------------------------------------------------
@@ -731,7 +731,7 @@ void LowLevelGraphicsTGL::SetColor(const cColor &aColor) {
//-----------------------------------------------------------------------
iVertexBuffer *LowLevelGraphicsTGL::CreateVertexBuffer(tVertexFlag aFlags,
- eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType, int alReserveVtxSize, int alReserveIdxSize) {
+ eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType, int alReserveVtxSize, int alReserveIdxSize) {
return hplNew(VertexBufferTGL, (this, aFlags, aDrawType, aUsageType, alReserveVtxSize, alReserveIdxSize));
}
@@ -765,7 +765,7 @@ void LowLevelGraphicsTGL::SwapBuffers() {
Graphics::Surface glBuffer;
TinyGL::getSurfaceRef(glBuffer);
g_system->copyRectToScreen(glBuffer.getPixels(), glBuffer.pitch,
- 0, 0, glBuffer.w, glBuffer.h);
+ 0, 0, glBuffer.w, glBuffer.h);
g_system->updateScreen();
}
@@ -843,7 +843,7 @@ void LowLevelGraphicsTGL::ClearScreen() {
bitmask |= TGL_COLOR_BUFFER_BIT;
if (mbClearDepth)
bitmask |= TGL_DEPTH_BUFFER_BIT;
- //if (mbClearStencil)
+ // if (mbClearStencil)
// bitmask |= TGL_STENCIL_BUFFER_BIT;
tglClear(bitmask);
@@ -927,18 +927,18 @@ void LowLevelGraphicsTGL::SetStencilActive(bool abX) {
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetStencil(eStencilFunc aFunc, int alRef, unsigned int aMask,
- eStencilOp aFailOp, eStencilOp aZFailOp, eStencilOp aZPassOp) {
+ eStencilOp aFailOp, eStencilOp aZFailOp, eStencilOp aZPassOp) {
tglStencilFunc(GetGLStencilFuncEnum(aFunc), alRef, aMask);
tglStencilOp(GetGLStencilOpEnum(aFailOp), GetGLStencilOpEnum(aZFailOp),
- GetGLStencilOpEnum(aZPassOp));
+ GetGLStencilOpEnum(aZPassOp));
}
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetStencilTwoSide(eStencilFunc aFrontFunc, eStencilFunc aBackFunc,
- int alRef, unsigned int aMask, eStencilOp aFrontFailOp, eStencilOp aFrontZFailOp, eStencilOp aFrontZPassOp,
- eStencilOp aBackFailOp, eStencilOp aBackZFailOp, eStencilOp aBackZPassOp) {
+ int alRef, unsigned int aMask, eStencilOp aFrontFailOp, eStencilOp aFrontZFailOp, eStencilOp aFrontZPassOp,
+ eStencilOp aBackFailOp, eStencilOp aBackZFailOp, eStencilOp aBackZPassOp) {
error("Only single sided stencil supported");
}
@@ -976,7 +976,7 @@ void LowLevelGraphicsTGL::SetScissorActive(bool toggle) {
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetScissorRect(const cRect2l &aRect) {
- //tglScissor(aRect.x, (mvScreenSize.y - aRect.y - 1) - aRect.h, aRect.w, aRect.h);
+ // tglScissor(aRect.x, (mvScreenSize.y - aRect.y - 1) - aRect.h, aRect.w, aRect.h);
}
//-----------------------------------------------------------------------
@@ -997,7 +997,7 @@ void LowLevelGraphicsTGL::SetBlendFunc(eBlendFunc aSrcFactor, eBlendFunc aDestFa
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::SetBlendFuncSeparate(eBlendFunc aSrcFactorColor, eBlendFunc aDestFactorColor,
- eBlendFunc aSrcFactorAlpha, eBlendFunc aDestFactorAlpha) {
+ eBlendFunc aSrcFactorAlpha, eBlendFunc aDestFactorAlpha) {
HPL1_UNIMPLEMENTED(LowLevelGraphicsTGL::SetBlendFuncSeparate);
}
@@ -1125,7 +1125,7 @@ void LowLevelGraphicsTGL::AddVertexToBatch(const cVertex *apVtx, const cMatrixf
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::AddVertexToBatch_Size2D(const cVertex *apVtx, const cVector3f *avTransform,
- const cColor *apCol, const float &mfW, const float &mfH) {
+ const cColor *apCol, const float &mfW, const float &mfH) {
// Coord
mpVertexArray[mlVertexCount + 0] = avTransform->x + mfW;
mpVertexArray[mlVertexCount + 1] = avTransform->y + mfH;
@@ -1152,7 +1152,7 @@ void LowLevelGraphicsTGL::AddVertexToBatch_Size2D(const cVertex *apVtx, const cV
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::AddVertexToBatch_Raw(const cVector3f &avPos, const cColor &aColor,
- const cVector3f &avTex) {
+ const cVector3f &avTex) {
// Coord
mpVertexArray[mlVertexCount + 0] = avPos.x;
mpVertexArray[mlVertexCount + 1] = avPos.y;
@@ -1311,19 +1311,19 @@ void LowLevelGraphicsTGL::DrawSphere(const cVector3f &avPos, float afRadius, cCo
// X Circle:
for (float a = 0; a < k2Pif; a += afAngleStep) {
tglVertex3f(avPos.x, avPos.y + sin(a) * afRadius,
- avPos.z + cos(a) * afRadius);
+ avPos.z + cos(a) * afRadius);
tglVertex3f(avPos.x, avPos.y + sin(a + afAngleStep) * afRadius,
- avPos.z + cos(a + afAngleStep) * afRadius);
+ avPos.z + cos(a + afAngleStep) * afRadius);
}
// Y Circle:
for (float a = 0; a < k2Pif; a += afAngleStep) {
tglVertex3f(avPos.x + cos(a) * afRadius, avPos.y,
- avPos.z + sin(a) * afRadius);
+ avPos.z + sin(a) * afRadius);
tglVertex3f(avPos.x + cos(a + afAngleStep) * afRadius, avPos.y,
- avPos.z + sin(a + afAngleStep) * afRadius);
+ avPos.z + sin(a + afAngleStep) * afRadius);
}
// Z Circle:
@@ -1331,8 +1331,8 @@ void LowLevelGraphicsTGL::DrawSphere(const cVector3f &avPos, float afRadius, cCo
tglVertex3f(avPos.x + cos(a) * afRadius, avPos.y + sin(a) * afRadius, avPos.z);
tglVertex3f(avPos.x + cos(a + afAngleStep) * afRadius,
- avPos.y + sin(a + afAngleStep) * afRadius,
- avPos.z);
+ avPos.y + sin(a + afAngleStep) * afRadius,
+ avPos.z);
}
}
tglEnd();
@@ -1393,7 +1393,7 @@ void LowLevelGraphicsTGL::DrawLineCircle2D(const cVector2f &avCenter, float afRa
//-----------------------------------------------------------------------
void LowLevelGraphicsTGL::CopyContextToTexure(iTexture *apTex, const cVector2l &avPos,
- const cVector2l &avSize, const cVector2l &avTexOffset) {
+ const cVector2l &avSize, const cVector2l &avTexOffset) {
#if 0
if (apTex == nullptr)
return;
@@ -1491,10 +1491,10 @@ void LowLevelGraphicsTGL::SetVtxBatchStates(tVtxBatchFlag flags) {
}
if (flags & eVtxBatchFlag_Texture0) {
- //tglClientActiveTexture(TGL_TEXTURE);
+ // tglClientActiveTexture(TGL_TEXTURE);
tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
} else {
- //tglClientActiveTextureARB(TGL_TEXTURE0_ARB);
+ // tglClientActiveTextureARB(TGL_TEXTURE0_ARB);
tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
}
#if 0
diff --git a/engines/hpl1/engine/impl/low_level_graphics_tgl.h b/engines/hpl1/engine/impl/low_level_graphics_tgl.h
index 99923ab6789..0d952610250 100644
--- a/engines/hpl1/engine/impl/low_level_graphics_tgl.h
+++ b/engines/hpl1/engine/impl/low_level_graphics_tgl.h
@@ -22,12 +22,12 @@
#ifndef HPL_LOW_LEVEL_GRAPHICS_TGL_H
#define HPL_LOW_LEVEL_GRAPHICS_TGL_H
-#include "hpl1/engine/graphics/LowLevelGraphics.h"
+#include "common/ptr.h"
#include "graphics/pixelformat.h"
-#include "hpl1/engine/math/MathTypes.h"
#include "graphics/surface.h"
-#include "common/ptr.h"
#include "graphics/tinygl/tinygl.h"
+#include "hpl1/engine/graphics/LowLevelGraphics.h"
+#include "hpl1/engine/math/MathTypes.h"
#ifdef USE_TINYGL
@@ -223,14 +223,14 @@ private:
int mlBpp;
// Gamma
- //uint16 mvStartGammaArray[3][256];
+ // uint16 mvStartGammaArray[3][256];
float mfGammaCorrection;
// Clipping
cPlanef mvClipPlanes[kMaxClipPlanes];
// SDL Variables
- //SDL_Surface *mpScreen;
+ // SDL_Surface *mpScreen;
Graphics::PixelFormat mpPixelFormat;
// Vertex Array variables
@@ -260,7 +260,7 @@ private:
iTexture *mpCurrentTexture[MAX_TEXTUREUNITS];
// CG Compiler Variables
- //CGcontext mCG_Context;
+ // CGcontext mCG_Context;
// Multisample
void CheckMultisampleCaps();
@@ -275,7 +275,7 @@ private:
void SetVtxBatchStates(tVtxBatchFlag flags);
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_TINYGL
diff --git a/engines/hpl1/engine/impl/occlusion_query_tgl.h b/engines/hpl1/engine/impl/occlusion_query_tgl.h
index 77e36355959..e4b1ed8ec49 100644
--- a/engines/hpl1/engine/impl/occlusion_query_tgl.h
+++ b/engines/hpl1/engine/impl/occlusion_query_tgl.h
@@ -22,8 +22,8 @@
#ifndef HPL_OCCLUSION_QUERY_TGL_H
#define HPL_OCCLUSION_QUERY_TGL_H
-#include "hpl1/engine/graphics/OcclusionQuery.h"
#include "common/scummsys.h"
+#include "hpl1/engine/graphics/OcclusionQuery.h"
#ifdef USE_TINYGL
@@ -36,11 +36,11 @@ public:
void Begin() override {}
void End() override {}
- bool FetchResults() override {return true;}
- unsigned int GetSampleCount() override {return 0;}
+ bool FetchResults() override { return true; }
+ unsigned int GetSampleCount() override { return 0; }
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_TINYGL
diff --git a/engines/hpl1/engine/impl/texture_tgl.cpp b/engines/hpl1/engine/impl/texture_tgl.cpp
index 03df9cb3641..656e1fbfe83 100644
--- a/engines/hpl1/engine/impl/texture_tgl.cpp
+++ b/engines/hpl1/engine/impl/texture_tgl.cpp
@@ -429,9 +429,9 @@ bool TGLTexture::CreateFromBitmapToHandle(Bitmap2D *pBmp, int alHandleIdx) {
// Log("Loading %s %d x %d\n",msName.c_str(), pSrc->GetWidth(), pSrc->GetHeight());
// Log("Channels: %d Format: %x\n",lChannels, format);
tglTexImage2D(GLTarget, 0, internalFormat, _width, _height,
- 0, format, TGL_UNSIGNED_BYTE, pPixelSrc);
+ 0, format, TGL_UNSIGNED_BYTE, pPixelSrc);
- //if (tglGetError() != TGL_NO_ERROR)
+ // if (tglGetError() != TGL_NO_ERROR)
// return false;
if (mbUseMipMaps && mTarget != eTextureTarget_Rect)
diff --git a/engines/hpl1/engine/impl/texture_tgl.h b/engines/hpl1/engine/impl/texture_tgl.h
index b966ebae62e..87cd29ca739 100644
--- a/engines/hpl1/engine/impl/texture_tgl.h
+++ b/engines/hpl1/engine/impl/texture_tgl.h
@@ -23,8 +23,8 @@
#define HPL_TEXTURE_TGL_H
#include "hpl1/engine/graphics/Texture.h"
-#include "hpl1/engine/impl/low_level_graphics_tgl.h"
#include "hpl1/engine/graphics/bitmap2D.h"
+#include "hpl1/engine/impl/low_level_graphics_tgl.h"
#ifdef USE_TINYGL
@@ -33,8 +33,8 @@ namespace hpl {
class TGLTexture : public iTexture {
public:
TGLTexture(const tString &asName, Graphics::PixelFormat *apPxlFmt, iLowLevelGraphics *apLowLevelGraphics,
- eTextureType aType, bool abUseMipMaps, eTextureTarget aTarget,
- bool abCompress = false);
+ eTextureType aType, bool abUseMipMaps, eTextureTarget aTarget,
+ bool abCompress = false);
~TGLTexture();
bool CreateFromBitmap(Bitmap2D *pBmp);
@@ -73,7 +73,7 @@ public:
/// SDL / OGL Specific ///////////
unsigned int GetTextureHandle();
- //cPBuffer *GetPBuffer() { return mpPBuffer; }
+ // cPBuffer *GetPBuffer() { return mpPBuffer; }
private:
bool CreateFromBitmapToHandle(Bitmap2D *pBmp, int alHandleIdx);
@@ -92,7 +92,7 @@ private:
float mfTimeDir;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_TINYGL
diff --git a/engines/hpl1/engine/impl/tinyXML/tinyxml.cpp b/engines/hpl1/engine/impl/tinyXML/tinyxml.cpp
index c631e0e37ec..1b773e19b48 100644
--- a/engines/hpl1/engine/impl/tinyXML/tinyxml.cpp
+++ b/engines/hpl1/engine/impl/tinyXML/tinyxml.cpp
@@ -519,7 +519,7 @@ int TiXmlElement::QueryDoubleAttribute(const std::string &name, double *dval) co
#endif
void TiXmlElement::SetAttribute(const char *name, int val) {
- Common::String sval = Common::String::format("%d", val);
+ Common::String sval = Common::String::format("%d", val);
SetAttribute(name, sval.c_str());
}
@@ -532,7 +532,7 @@ void TiXmlElement::SetAttribute(const std::string &name, int val) {
#endif
void TiXmlElement::SetDoubleAttribute(const char *name, double val) {
- Common::String sval = Common::String::format("%f", val);
+ Common::String sval = Common::String::format("%f", val);
SetAttribute(name, sval.c_str());
}
@@ -590,7 +590,7 @@ void TiXmlElement::Print(Common::WriteStream &file, int depth) const {
const TiXmlAttribute *attrib;
for (attrib = attributeSet.First(); attrib; attrib = attrib->Next()) {
- file.writeString(" ");
+ file.writeString(" ");
attrib->Print(file, depth);
}
@@ -810,8 +810,8 @@ bool TiXmlDocument::LoadFile(Common::SeekableReadStream &file, TiXmlEncoding enc
// Newline character. No special rules for this. Append all the characters
// since the last string, and include the newline.
data += Common::String(lastPos, (p - lastPos + 1)); // append, include the newline
- ++p; // move past the newline
- lastPos = p; // and point to the new buffer (may be 0)
+ ++p; // move past the newline
+ lastPos = p; // and point to the new buffer (may be 0)
assert(p <= (buf + length));
} else if (*p == 0xd) {
// Carriage return. Append what we have so far, then
@@ -854,7 +854,7 @@ bool TiXmlDocument::LoadFile(Common::SeekableReadStream &file, TiXmlEncoding enc
bool TiXmlDocument::SaveFile(const char *filename) const {
// The old c stuff lives on...
Common::DumpFile df;
- df.open(filename);
+ df.open(filename);
if (df.isOpen()) {
bool result = SaveFile(df);
return result;
@@ -868,9 +868,9 @@ bool TiXmlDocument::SaveFile(Common::WriteStream &fp) const {
const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
- fp.writeByte(TIXML_UTF_LEAD_0);
- fp.writeByte(TIXML_UTF_LEAD_1);
- fp.writeByte(TIXML_UTF_LEAD_2);
+ fp.writeByte(TIXML_UTF_LEAD_0);
+ fp.writeByte(TIXML_UTF_LEAD_1);
+ fp.writeByte(TIXML_UTF_LEAD_2);
}
Print(fp, 0);
return !fp.err();
@@ -900,7 +900,7 @@ TiXmlNode *TiXmlDocument::Clone() const {
void TiXmlDocument::Print(Common::WriteStream &cfile, int depth) const {
for (const TiXmlNode *node = FirstChild(); node; node = node->NextSibling()) {
node->Print(cfile, depth);
- cfile.writeString("\n");
+ cfile.writeString("\n");
}
}
@@ -994,12 +994,12 @@ int TiXmlAttribute::QueryDoubleValue(double *dval) const {
}
void TiXmlAttribute::SetIntValue(int _value) {
- Common::String sval = Common::String::format("%d", _value);
+ Common::String sval = Common::String::format("%d", _value);
SetValue(sval.c_str());
}
void TiXmlAttribute::SetDoubleValue(double _value) {
- Common::String sval = Common::String::format("%f", _value);
+ Common::String sval = Common::String::format("%f", _value);
SetValue(sval.c_str());
}
diff --git a/engines/hpl1/engine/impl/tinyXML/tinyxml.h b/engines/hpl1/engine/impl/tinyXML/tinyxml.h
index 7d7f75cbff1..92f57ee84a7 100644
--- a/engines/hpl1/engine/impl/tinyXML/tinyxml.h
+++ b/engines/hpl1/engine/impl/tinyXML/tinyxml.h
@@ -1398,7 +1398,7 @@ public:
}
/** Write the document to standard out using formatted printing ("pretty print"). */
- //void Print() const { Print(stdout, 0); }
+ // void Print() const { Print(stdout, 0); }
/* Write the document to a string using formatted printing ("pretty print"). This
will allocate a character array (new char[]) and return it as a pointer. The
diff --git a/engines/hpl1/engine/impl/tinyXML/tinyxmlparser.cpp b/engines/hpl1/engine/impl/tinyXML/tinyxmlparser.cpp
index 8496a83930e..ee2ce2af832 100644
--- a/engines/hpl1/engine/impl/tinyXML/tinyxmlparser.cpp
+++ b/engines/hpl1/engine/impl/tinyXML/tinyxmlparser.cpp
@@ -22,8 +22,8 @@ must not be misrepresented as being the original software.
distribution.
*/
-#include "hpl1/engine/impl/tinyXML/tinyxml.h"
#include "common/util.h"
+#include "hpl1/engine/impl/tinyXML/tinyxml.h"
//#define DEBUG_PARSER
#if defined(DEBUG_PARSER)
@@ -137,11 +137,11 @@ void TiXmlBase::ConvertUTF32ToUTF8(unsigned long input, char *output, int *lengt
return Common::isAlpha(anyByte);
else
return 1; // What else to do? The unicode set is huge...get the english ones right.
- // }
- // else
- // {
- // return isalpha( anyByte );
- // }
+ // }
+ // else
+ // {
+ // return isalpha( anyByte );
+ // }
}
/*static*/ int TiXmlBase::IsAlphaNum(unsigned char anyByte, TiXmlEncoding /*encoding*/) {
@@ -156,11 +156,11 @@ void TiXmlBase::ConvertUTF32ToUTF8(unsigned long input, char *output, int *lengt
return Common::isAlnum(anyByte);
else
return 1; // What else to do? The unicode set is huge...get the english ones right.
- // }
- // else
- // {
- // return isalnum( anyByte );
- // }
+ // }
+ // else
+ // {
+ // return isalnum( anyByte );
+ // }
}
class TiXmlParsingData {
diff --git a/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp b/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
index e7fbbf8c952..e2e87b881bf 100644
--- a/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
+++ b/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
@@ -23,8 +23,8 @@
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/debug.h"
#include "graphics/tinygl/tinygl.h"
+#include "hpl1/debug.h"
namespace hpl {
@@ -35,8 +35,8 @@ namespace hpl {
//-----------------------------------------------------------------------
VertexBufferTGL::VertexBufferTGL(iLowLevelGraphics *apLowLevelGraphics, tVertexFlag aFlags,
- eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType,
- int alReserveVtxSize, int alReserveIdxSize) : iVertexBuffer(apLowLevelGraphics, aFlags, aDrawType, aUsageType, alReserveVtxSize, alReserveIdxSize) {
+ eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType,
+ int alReserveVtxSize, int alReserveIdxSize) : iVertexBuffer(apLowLevelGraphics, aFlags, aDrawType, aUsageType, alReserveVtxSize, alReserveIdxSize) {
if (alReserveVtxSize > 0) {
for (int i = 0; i < klNumOfVertexFlags; i++) {
if (aFlags & kvVertexFlags[i]) {
@@ -213,34 +213,38 @@ void VertexBufferTGL::Transform(const cMatrixf &a_mtxTransform) {
//-----------------------------------------------------------------------
void VertexBufferTGL::Draw(eVertexBufferDrawType aDrawType) {
- eVertexBufferDrawType drawType = aDrawType == eVertexBufferDrawType_LastEnum ? mDrawType : aDrawType;
-
- ///////////////////////////////
- //Get the draw type
- TGLenum mode = TGL_TRIANGLES;
- if(drawType==eVertexBufferDrawType_Quad) mode = TGL_QUADS;
- else if(drawType==eVertexBufferDrawType_Lines) mode = TGL_LINE_STRIP;
+ eVertexBufferDrawType drawType = aDrawType == eVertexBufferDrawType_LastEnum ? mDrawType : aDrawType;
+ ///////////////////////////////
+ // Get the draw type
+ TGLenum mode = TGL_TRIANGLES;
+ if (drawType == eVertexBufferDrawType_Quad)
+ mode = TGL_QUADS;
+ else if (drawType == eVertexBufferDrawType_Lines)
+ mode = TGL_LINE_STRIP;
- int lSize = mlElementNum;
- if(mlElementNum<0) lSize = GetIndexNum();
+ int lSize = mlElementNum;
+ if (mlElementNum < 0)
+ lSize = GetIndexNum();
- tglDrawElements(mode,lSize,TGL_UNSIGNED_INT, &mvIndexArray[0]);
+ tglDrawElements(mode, lSize, TGL_UNSIGNED_INT, &mvIndexArray[0]);
}
void VertexBufferTGL::DrawIndices(unsigned int *apIndices, int alCount,
- eVertexBufferDrawType aDrawType) {
- eVertexBufferDrawType drawType = aDrawType == eVertexBufferDrawType_LastEnum ? mDrawType : aDrawType;
-
- ///////////////////////////////
- //Get the draw type
- TGLenum mode = TGL_TRIANGLES;
- if(drawType==eVertexBufferDrawType_Quad) mode = TGL_QUADS;
- else if(drawType==eVertexBufferDrawType_Lines) mode = TGL_LINE_STRIP;
-
- //////////////////////////////////
- //Bind and draw the buffer
- tglDrawElements(mode, alCount, TGL_UNSIGNED_INT, apIndices);
+ eVertexBufferDrawType aDrawType) {
+ eVertexBufferDrawType drawType = aDrawType == eVertexBufferDrawType_LastEnum ? mDrawType : aDrawType;
+
+ ///////////////////////////////
+ // Get the draw type
+ TGLenum mode = TGL_TRIANGLES;
+ if (drawType == eVertexBufferDrawType_Quad)
+ mode = TGL_QUADS;
+ else if (drawType == eVertexBufferDrawType_Lines)
+ mode = TGL_LINE_STRIP;
+
+ //////////////////////////////////
+ // Bind and draw the buffer
+ tglDrawElements(mode, alCount, TGL_UNSIGNED_INT, apIndices);
}
//-----------------------------------------------------------------------
@@ -258,8 +262,8 @@ void VertexBufferTGL::UnBind() {
iVertexBuffer *VertexBufferTGL::CreateCopy(eVertexBufferUsageType aUsageType) {
VertexBufferTGL *pVtxBuff = hplNew(VertexBufferTGL, (mpLowLevelGraphics,
- mVertexFlags, mDrawType, aUsageType,
- GetVertexNum(), GetIndexNum()));
+ mVertexFlags, mDrawType, aUsageType,
+ GetVertexNum(), GetIndexNum()));
// Copy the vertices to the new buffer.
for (int i = 0; i < klNumOfVertexFlags; i++) {
@@ -388,50 +392,40 @@ unsigned int VertexBufferTGL::GetIndex(tVertexFlag aType, unsigned alIdx) {
//-----------------------------------------------------------------------
void VertexBufferTGL::SetVertexStates(tVertexFlag aFlags) {
- /// POSITION /////////////////////////
- if(aFlags & eVertexFlag_Position){
- tglEnableClientState(TGL_VERTEX_ARRAY);
- int idx = cMath::Log2ToInt(eVertexFlag_Position);
- tglVertexPointer(kvVertexElements[idx],TGL_FLOAT, sizeof(float)*kvVertexElements[idx], &mvVertexArray[idx][0]);
- }
- else
- {
- tglDisableClientState(TGL_VERTEX_ARRAY);
- }
+ /// POSITION /////////////////////////
+ if (aFlags & eVertexFlag_Position) {
+ tglEnableClientState(TGL_VERTEX_ARRAY);
+ int idx = cMath::Log2ToInt(eVertexFlag_Position);
+ tglVertexPointer(kvVertexElements[idx], TGL_FLOAT, sizeof(float) * kvVertexElements[idx], &mvVertexArray[idx][0]);
+ } else {
+ tglDisableClientState(TGL_VERTEX_ARRAY);
+ }
- /// COLOR 0 /////////////////////////
- if(aFlags & eVertexFlag_Color0)
- {
- tglEnableClientState(TGL_COLOR_ARRAY);
- int idx = cMath::Log2ToInt(eVertexFlag_Color0);
- tglColorPointer(kvVertexElements[idx],TGL_FLOAT, sizeof(float)*kvVertexElements[idx], &mvVertexArray[idx][0]);
- }
- else
- {
- tglDisableClientState(TGL_COLOR_ARRAY);
- }
+ /// COLOR 0 /////////////////////////
+ if (aFlags & eVertexFlag_Color0) {
+ tglEnableClientState(TGL_COLOR_ARRAY);
+ int idx = cMath::Log2ToInt(eVertexFlag_Color0);
+ tglColorPointer(kvVertexElements[idx], TGL_FLOAT, sizeof(float) * kvVertexElements[idx], &mvVertexArray[idx][0]);
+ } else {
+ tglDisableClientState(TGL_COLOR_ARRAY);
+ }
- /// NORMAL /////////////////////////
- if(aFlags & eVertexFlag_Normal)
- {
- tglEnableClientState(TGL_NORMAL_ARRAY);
- tglNormalPointer(TGL_FLOAT, sizeof(float)*3, &mvVertexArray[cMath::Log2ToInt(eVertexFlag_Normal)][0]);
- }
- else
- {
- tglDisableClientState(TGL_NORMAL_ARRAY);
- }
+ /// NORMAL /////////////////////////
+ if (aFlags & eVertexFlag_Normal) {
+ tglEnableClientState(TGL_NORMAL_ARRAY);
+ tglNormalPointer(TGL_FLOAT, sizeof(float) * 3, &mvVertexArray[cMath::Log2ToInt(eVertexFlag_Normal)][0]);
+ } else {
+ tglDisableClientState(TGL_NORMAL_ARRAY);
+ }
- /// TEXTURE 0 /////////////////////////
- if(aFlags & eVertexFlag_Texture0)
- {
- tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
- int idx = cMath::Log2ToInt(eVertexFlag_Texture0);
- tglTexCoordPointer(kvVertexElements[idx],TGL_FLOAT,sizeof(float)*kvVertexElements[idx],&mvVertexArray[idx][0]);
- }
- else {
- tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
- }
+ /// TEXTURE 0 /////////////////////////
+ if (aFlags & eVertexFlag_Texture0) {
+ tglEnableClientState(TGL_TEXTURE_COORD_ARRAY);
+ int idx = cMath::Log2ToInt(eVertexFlag_Texture0);
+ tglTexCoordPointer(kvVertexElements[idx], TGL_FLOAT, sizeof(float) * kvVertexElements[idx], &mvVertexArray[idx][0]);
+ } else {
+ tglDisableClientState(TGL_TEXTURE_COORD_ARRAY);
+ }
#if 0
/// TEXTURE 1 /////////////////////////
if(aFlags & eVertexFlag_Texture1){
diff --git a/engines/hpl1/engine/impl/vertex_buffer_tgl.h b/engines/hpl1/engine/impl/vertex_buffer_tgl.h
index 61c3c3adf21..99cb408f3ae 100644
--- a/engines/hpl1/engine/impl/vertex_buffer_tgl.h
+++ b/engines/hpl1/engine/impl/vertex_buffer_tgl.h
@@ -31,8 +31,8 @@ namespace hpl {
class VertexBufferTGL : public iVertexBuffer {
public:
VertexBufferTGL(iLowLevelGraphics *apLowLevelGraphics, tVertexFlag aFlags,
- eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType,
- int alReserveVtxSize, int alReserveIdxSize);
+ eVertexBufferDrawType aDrawType, eVertexBufferUsageType aUsageType,
+ int alReserveVtxSize, int alReserveIdxSize);
~VertexBufferTGL();
void AddVertex(tVertexFlag aType, const cVector3f &avVtx);
@@ -83,7 +83,7 @@ private:
bool mbHasShadowDouble;
};
-} // namespace hpl
+} // namespace hpl
#endif // USE_TINYGL
diff --git a/engines/hpl1/engine/input/Action.h b/engines/hpl1/engine/input/Action.h
index 8945ea82c31..d0494f6e60e 100644
--- a/engines/hpl1/engine/input/Action.h
+++ b/engines/hpl1/engine/input/Action.h
@@ -104,6 +104,6 @@ private:
double mfTimeCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ACTION_H
diff --git a/engines/hpl1/engine/input/ActionKeyboard.cpp b/engines/hpl1/engine/input/ActionKeyboard.cpp
index 09f9e67c8cf..ed9d50f014c 100644
--- a/engines/hpl1/engine/input/ActionKeyboard.cpp
+++ b/engines/hpl1/engine/input/ActionKeyboard.cpp
@@ -53,7 +53,7 @@ cActionKeyboard::cActionKeyboard(tString asName, cInput *apInput, int aKey) : iA
//-----------------------------------------------------------------------
bool cActionKeyboard::IsTriggerd() {
- return mpInput->GetKeyboard()->KeyIsDown(mKey) &&
+ return mpInput->GetKeyboard()->KeyIsDown(mKey) &&
((mpInput->GetKeyboard()->GetModifier() & mMod) > 0 || mMod == eKeyModifier_NONE);
}
//-----------------------------------------------------------------------
diff --git a/engines/hpl1/engine/input/ActionKeyboard.h b/engines/hpl1/engine/input/ActionKeyboard.h
index 0b3f0e74feb..b4bfe918abd 100644
--- a/engines/hpl1/engine/input/ActionKeyboard.h
+++ b/engines/hpl1/engine/input/ActionKeyboard.h
@@ -55,6 +55,6 @@ private:
cInput *mpInput;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ACTIONKEYBOARD_H
diff --git a/engines/hpl1/engine/input/ActionMouseButton.cpp b/engines/hpl1/engine/input/ActionMouseButton.cpp
index e70d3f0d189..5db24cd7ce6 100644
--- a/engines/hpl1/engine/input/ActionMouseButton.cpp
+++ b/engines/hpl1/engine/input/ActionMouseButton.cpp
@@ -50,7 +50,7 @@ cActionMouseButton::cActionMouseButton(tString asName, cInput *apInput, eMButton
//-----------------------------------------------------------------------
bool cActionMouseButton::IsTriggerd() {
- return mpInput->GetMouse()->ButtonIsDown(mButton);
+ return mpInput->GetMouse()->ButtonIsDown(mButton);
}
//-----------------------------------------------------------------------
diff --git a/engines/hpl1/engine/input/ActionMouseButton.h b/engines/hpl1/engine/input/ActionMouseButton.h
index e9685dd732b..11b4b4e9198 100644
--- a/engines/hpl1/engine/input/ActionMouseButton.h
+++ b/engines/hpl1/engine/input/ActionMouseButton.h
@@ -53,6 +53,6 @@ private:
cInput *mpInput;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ACTIONMOUSEBUTTON_H
diff --git a/engines/hpl1/engine/input/Input.h b/engines/hpl1/engine/input/Input.h
index de4f43ec605..5711c164062 100644
--- a/engines/hpl1/engine/input/Input.h
+++ b/engines/hpl1/engine/input/Input.h
@@ -28,10 +28,10 @@
#ifndef HPL_INPUT_H
#define HPL_INPUT_H
+#include "common/list.h"
#include "hpl1/engine/game/Updateable.h"
#include "hpl1/engine/input/InputTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
#include "hpl1/std/map.h"
#include "hpl1/std/multimap.h"
diff --git a/engines/hpl1/engine/input/InputDevice.h b/engines/hpl1/engine/input/InputDevice.h
index 801a7db5d5d..25165a16b46 100644
--- a/engines/hpl1/engine/input/InputDevice.h
+++ b/engines/hpl1/engine/input/InputDevice.h
@@ -60,6 +60,6 @@ private:
eInputDeviceType mType;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_INPUTDEVICE_H
diff --git a/engines/hpl1/engine/input/LowLevelInput.h b/engines/hpl1/engine/input/LowLevelInput.h
index cef4f78d57c..956c6aa83e3 100644
--- a/engines/hpl1/engine/input/LowLevelInput.h
+++ b/engines/hpl1/engine/input/LowLevelInput.h
@@ -56,6 +56,6 @@ public:
virtual iKeyboard *CreateKeyboard() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELINPUT_H
diff --git a/engines/hpl1/engine/math/BoundingVolume.cpp b/engines/hpl1/engine/math/BoundingVolume.cpp
index 1dbb3d921e1..ee98d19299f 100644
--- a/engines/hpl1/engine/math/BoundingVolume.cpp
+++ b/engines/hpl1/engine/math/BoundingVolume.cpp
@@ -114,13 +114,13 @@ bool cShadowVolumeBV::CollideBVAABB(cBoundingVolume *aBV) {
// Go through all the planes
for (int i = 0; i < mlPlaneCount; i++) {
int lInCount = 9;
- //bool bIsIn = true;
+ // bool bIsIn = true;
for (int j = 0; j < 9; j++) {
float fDist = cMath::PlaneToPointDist(mvPlanes[i], vCorners[j]);
if (fDist < 0) {
lInCount--;
- //bIsIn = false;
+ // bIsIn = false;
}
}
@@ -288,11 +288,11 @@ cShadowVolumeBV *cBoundingVolume::GetShadowVolume(const cVector3f &avLightPos,
/////////////////////////////////////////////////////////////////////
// Iterate the faces and check which ones are facing the light.
- //int lNearPoint = -1;
+ // int lNearPoint = -1;
mShadowVolume.mlPlaneCount = 0;
for (int face = 0; face < 6; face++) {
globalfacingLight[face] = cMath::Vector3Dot(globalNormals[face],
- vCorners[kvFacePoints[face]] - avLightPos) < 0;
+ vCorners[kvFacePoints[face]] - avLightPos) < 0;
// Get a point for the near plane. (any edge point will do)
if (globalfacingLight[face]) {
diff --git a/engines/hpl1/engine/math/BoundingVolume.h b/engines/hpl1/engine/math/BoundingVolume.h
index 19e6ee2bd2b..da4e5564199 100644
--- a/engines/hpl1/engine/math/BoundingVolume.h
+++ b/engines/hpl1/engine/math/BoundingVolume.h
@@ -130,6 +130,6 @@ private:
bool mbShadowPlanesNeedUpdate;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BOUNDING_VOLUME_H
diff --git a/engines/hpl1/engine/math/Frustum.cpp b/engines/hpl1/engine/math/Frustum.cpp
index 87e7a33ee10..0e2e1590100 100644
--- a/engines/hpl1/engine/math/Frustum.cpp
+++ b/engines/hpl1/engine/math/Frustum.cpp
@@ -305,7 +305,7 @@ void cFrustum::UpdateEndPoints() {
float fYAngle = mfFOV * 0.5f * mfAspect;
cVector3f vForward = m_mtxModelView.GetForward();
- //cVector3f vUp = m_mtxModelView.GetUp();
+ // cVector3f vUp = m_mtxModelView.GetUp();
cVector3f vRight = m_mtxModelView.GetRight();
// Point the forward vec in different dirs.
diff --git a/engines/hpl1/engine/math/Frustum.h b/engines/hpl1/engine/math/Frustum.h
index f0770fadcd4..d46165d1953 100644
--- a/engines/hpl1/engine/math/Frustum.h
+++ b/engines/hpl1/engine/math/Frustum.h
@@ -120,6 +120,6 @@ private:
tVector3fVec mvPoints;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FRUSTUM_H
diff --git a/engines/hpl1/engine/math/Math.cpp b/engines/hpl1/engine/math/Math.cpp
index a32796d722b..96598d7c4b6 100644
--- a/engines/hpl1/engine/math/Math.cpp
+++ b/engines/hpl1/engine/math/Math.cpp
@@ -46,8 +46,7 @@ int cMath::RandRectl(int alMin, int alMax) {
//-----------------------------------------------------------------------
float cMath::RandRectf(float afMin, float afMax) {
- float fRand = static_cast<float>(Hpl1::g_engine->getRandomNumber(UINT_MAX))
- / static_cast<float>(UINT_MAX);
+ float fRand = static_cast<float>(Hpl1::g_engine->getRandomNumber(UINT_MAX)) / static_cast<float>(UINT_MAX);
return afMin + fRand * (afMax - afMin);
}
@@ -1147,10 +1146,10 @@ cVector3f cMath::MatrixToEulerAngles(const cMatrixf &a_mtxA, eEulerRotationOrder
const char *cMath::MatrixToChar(const cMatrixf &a_mtxA) {
snprintf(mpTempChar, 1024, "[%.3f, %.3f, %.3f, %.3f] [%.3f, %.3f, %.3f, %.3f] [%.3f, %.3f, %.3f, %.3f] [%.3f, %.3f, %.3f, %.3f]",
- a_mtxA.m[0][0], a_mtxA.m[0][1], a_mtxA.m[0][2], a_mtxA.m[0][3],
- a_mtxA.m[1][0], a_mtxA.m[1][1], a_mtxA.m[1][2], a_mtxA.m[1][3],
- a_mtxA.m[2][0], a_mtxA.m[2][1], a_mtxA.m[2][2], a_mtxA.m[2][3],
- a_mtxA.m[3][0], a_mtxA.m[3][1], a_mtxA.m[3][2], a_mtxA.m[3][3]);
+ a_mtxA.m[0][0], a_mtxA.m[0][1], a_mtxA.m[0][2], a_mtxA.m[0][3],
+ a_mtxA.m[1][0], a_mtxA.m[1][1], a_mtxA.m[1][2], a_mtxA.m[1][3],
+ a_mtxA.m[2][0], a_mtxA.m[2][1], a_mtxA.m[2][2], a_mtxA.m[2][3],
+ a_mtxA.m[3][0], a_mtxA.m[3][1], a_mtxA.m[3][2], a_mtxA.m[3][3]);
return mpTempChar;
}
@@ -1202,8 +1201,8 @@ bool cMath::CreateTriTangentVectors(float *apDestArray,
// Log("Num of indices: %d\n",alIndexNum);
// Log("Num of vertrices: %d\n",alVertexNum);
- Hpl1::resizeAndFill(vTempTangents1, alVertexNum, cVector3f(0,0,0));
- Hpl1::resizeAndFill(vTempTangents2, alVertexNum, cVector3f(0,0,0));
+ Hpl1::resizeAndFill(vTempTangents1, alVertexNum, cVector3f(0, 0, 0));
+ Hpl1::resizeAndFill(vTempTangents2, alVertexNum, cVector3f(0, 0, 0));
// Iterate through the triangles
for (int triIdx = 0; triIdx < alIndexNum; triIdx += 3) {
diff --git a/engines/hpl1/engine/math/Math.h b/engines/hpl1/engine/math/Math.h
index 6f3331bd8ba..60e770654d9 100644
--- a/engines/hpl1/engine/math/Math.h
+++ b/engines/hpl1/engine/math/Math.h
@@ -496,6 +496,6 @@ public:
bool *apIsDoubleSided);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATH_H
diff --git a/engines/hpl1/engine/math/MathTypes.h b/engines/hpl1/engine/math/MathTypes.h
index 306635b3403..d1f2ec5034f 100644
--- a/engines/hpl1/engine/math/MathTypes.h
+++ b/engines/hpl1/engine/math/MathTypes.h
@@ -28,12 +28,12 @@
#ifndef HPL_MATHTYPES_H
#define HPL_MATHTYPES_H
-#include "hpl1/engine/math/hplMatrix.h"
+#include "common/array.h"
+#include "common/list.h"
#include "hpl1/engine/math/Vector2.h"
#include "hpl1/engine/math/Vector3.h"
+#include "hpl1/engine/math/hplMatrix.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
-#include "common/list.h"
namespace hpl {
diff --git a/engines/hpl1/engine/math/MeshTypes.h b/engines/hpl1/engine/math/MeshTypes.h
index c2db71c81dc..d71c4adb3c4 100644
--- a/engines/hpl1/engine/math/MeshTypes.h
+++ b/engines/hpl1/engine/math/MeshTypes.h
@@ -58,8 +58,7 @@ public:
bool invert_tri2;
cTriEdge() = default;
- constexpr cTriEdge(int alPoint1, int alPoint2, int alTri1, int alTri2) :
- point1(alPoint1), point2(alPoint2), tri1(alTri1), tri2(alTri2), invert_tri2(false) {
+ constexpr cTriEdge(int alPoint1, int alPoint2, int alTri1, int alTri2) : point1(alPoint1), point2(alPoint2), tri1(alTri1), tri2(alTri2), invert_tri2(false) {
}
};
diff --git a/engines/hpl1/engine/math/PidController.h b/engines/hpl1/engine/math/PidController.h
index 6d5b9fb26cf..8d3c03a8c3d 100644
--- a/engines/hpl1/engine/math/PidController.h
+++ b/engines/hpl1/engine/math/PidController.h
@@ -28,8 +28,8 @@
#ifndef HPL_PID_CONTROLLER_H
#define HPL_PID_CONTROLLER_H
-#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/algorithms.h"
+#include "hpl1/engine/math/MathTypes.h"
namespace hpl {
@@ -130,6 +130,6 @@ private:
typedef cPidController<float> cPidControllerf;
typedef cPidController<cVector3f> cPidControllerVec3;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PID_CONTROLLER_H
diff --git a/engines/hpl1/engine/math/Quaternion.h b/engines/hpl1/engine/math/Quaternion.h
index 443216b776f..a2355bf601c 100644
--- a/engines/hpl1/engine/math/Quaternion.h
+++ b/engines/hpl1/engine/math/Quaternion.h
@@ -28,8 +28,8 @@
#ifndef HPL_QUATERNION_H
#define HPL_QUATERNION_H
-#include "hpl1/engine/math/hplMatrix.h"
#include "hpl1/engine/math/Vector3.h"
+#include "hpl1/engine/math/hplMatrix.h"
namespace hpl {
@@ -64,6 +64,6 @@ public:
private:
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_QUATERNION_H
diff --git a/engines/hpl1/engine/math/Spring.h b/engines/hpl1/engine/math/Spring.h
index 98bdf654039..35f2638d46c 100644
--- a/engines/hpl1/engine/math/Spring.h
+++ b/engines/hpl1/engine/math/Spring.h
@@ -62,6 +62,6 @@ public:
typedef cSpring<float> cSpringf;
typedef cSpring<cVector3f> cSpringVec3;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SPRING_H
diff --git a/engines/hpl1/engine/math/Vector2.h b/engines/hpl1/engine/math/Vector2.h
index 50f71b28a1c..9be8b713f80 100644
--- a/engines/hpl1/engine/math/Vector2.h
+++ b/engines/hpl1/engine/math/Vector2.h
@@ -226,6 +226,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_VECTOR2_H
diff --git a/engines/hpl1/engine/math/Vector3.h b/engines/hpl1/engine/math/Vector3.h
index 991a35acdfd..cbb42bc8d83 100644
--- a/engines/hpl1/engine/math/Vector3.h
+++ b/engines/hpl1/engine/math/Vector3.h
@@ -329,6 +329,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_VECTOR3_H
diff --git a/engines/hpl1/engine/math/hplMatrix.h b/engines/hpl1/engine/math/hplMatrix.h
index 76b2ef595db..9e0c5672705 100644
--- a/engines/hpl1/engine/math/hplMatrix.h
+++ b/engines/hpl1/engine/math/hplMatrix.h
@@ -83,10 +83,10 @@ public:
T a10, T a11, T a12, T a13,
T a20, T a21, T a22, T a23,
T a30, T a31, T a32, T a33) : m{
- {a00, a01, a02, a03},
- {a10, a11, a12, a13},
- {a20, a21, a22, a23},
- {a30, a31, a32, a33}} {
+ {a00, a01, a02, a03},
+ {a10, a11, a12, a13},
+ {a20, a21, a22, a23},
+ {a30, a31, a32, a33}} {
}
static const cMatrix<T> Identity;
@@ -243,20 +243,20 @@ public:
tString ToString() {
char buf[512];
snprintf(buf, 512, "[%f : %f : %f : %f] [%f : %f : %f : %f] [%f : %f : %f : %f] [%f : %f : %f : %f]",
- m[0][0], m[0][1], m[0][2], m[0][3],
- m[1][0], m[1][1], m[1][2], m[1][3],
- m[2][0], m[2][1], m[2][2], m[2][3],
- m[3][0], m[3][1], m[3][2], m[3][3]);
+ m[0][0], m[0][1], m[0][2], m[0][3],
+ m[1][0], m[1][1], m[1][2], m[1][3],
+ m[2][0], m[2][1], m[2][2], m[2][3],
+ m[3][0], m[3][1], m[3][2], m[3][3]);
return buf;
}
tString ToFileString() {
char buf[512];
snprintf(buf, 512, "%g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g",
- m[0][0], m[0][1], m[0][2], m[0][3],
- m[1][0], m[1][1], m[1][2], m[1][3],
- m[2][0], m[2][1], m[2][2], m[2][3],
- m[3][0], m[3][1], m[3][2], m[3][3]);
+ m[0][0], m[0][1], m[0][2], m[0][3],
+ m[1][0], m[1][1], m[1][2], m[1][3],
+ m[2][0], m[2][1], m[2][2], m[2][3],
+ m[3][0], m[3][1], m[3][2], m[3][3]);
return buf;
}
};
diff --git a/engines/hpl1/engine/physics/Body2D.h b/engines/hpl1/engine/physics/Body2D.h
index 217da204049..4b4aab2afc8 100644
--- a/engines/hpl1/engine/physics/Body2D.h
+++ b/engines/hpl1/engine/physics/Body2D.h
@@ -30,9 +30,9 @@
#include "hpl1/engine/math/MathTypes.h"
+#include "common/list.h"
#include "hpl1/engine/scene/Entity2D.h"
#include "hpl1/std/map.h"
-#include "common/list.h"
namespace hpl {
@@ -181,6 +181,6 @@ private:
void AddPosXY(cVector2f avPosAdd);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BODY_H
diff --git a/engines/hpl1/engine/physics/CharacterBody.cpp b/engines/hpl1/engine/physics/CharacterBody.cpp
index 3fb35ecfe98..7abbb66c2f2 100644
--- a/engines/hpl1/engine/physics/CharacterBody.cpp
+++ b/engines/hpl1/engine/physics/CharacterBody.cpp
@@ -825,8 +825,8 @@ void iCharacterBody::Update(float afTimeStep) {
mvPosition += cVector3f(mvVelolcity.x, 0, mvVelolcity.z) * afTimeStep;
vNewPos = mvPosition;
- /*bool bCollide = */mpWorld->CheckShapeWorldCollision(&vNewPos, mpBody->GetShape(), cMath::MatrixTranslate(mvPosition),
- mpBody, false, true, NULL, mbCollideCharacter);
+ /*bool bCollide = */ mpWorld->CheckShapeWorldCollision(&vNewPos, mpBody->GetShape(), cMath::MatrixTranslate(mvPosition),
+ mpBody, false, true, NULL, mbCollideCharacter);
// Set new velocity depending on collisions.
vLastVelocity.x = mvVelolcity.x;
diff --git a/engines/hpl1/engine/physics/CharacterBody.h b/engines/hpl1/engine/physics/CharacterBody.h
index aa73e3615de..1c689120302 100644
--- a/engines/hpl1/engine/physics/CharacterBody.h
+++ b/engines/hpl1/engine/physics/CharacterBody.h
@@ -410,6 +410,6 @@ protected:
Common::Array<iPhysicsBody *> mvExtraBodies;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CHARACTER_BODY_H
diff --git a/engines/hpl1/engine/physics/CollideData.h b/engines/hpl1/engine/physics/CollideData.h
index eb74195402c..7da83c07900 100644
--- a/engines/hpl1/engine/physics/CollideData.h
+++ b/engines/hpl1/engine/physics/CollideData.h
@@ -53,6 +53,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDE_DATA_H
diff --git a/engines/hpl1/engine/physics/CollideData2D.h b/engines/hpl1/engine/physics/CollideData2D.h
index 5d8632339cb..1e43b2a40f8 100644
--- a/engines/hpl1/engine/physics/CollideData2D.h
+++ b/engines/hpl1/engine/physics/CollideData2D.h
@@ -28,11 +28,11 @@
#ifndef HPL_COLLIDE_DATA_2D_H
#define HPL_COLLIDE_DATA_2D_H
+#include "common/list.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/physics/Body2D.h"
#include "hpl1/engine/scene/Tile.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
namespace hpl {
@@ -60,6 +60,6 @@ public:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDE_DATA_2D_H
diff --git a/engines/hpl1/engine/physics/CollideShape.h b/engines/hpl1/engine/physics/CollideShape.h
index 5d8e6ee6da6..f301d22fd23 100644
--- a/engines/hpl1/engine/physics/CollideShape.h
+++ b/engines/hpl1/engine/physics/CollideShape.h
@@ -89,6 +89,6 @@ protected:
cBoundingVolume mBoundingVolume;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDE_SHAPE_H
diff --git a/engines/hpl1/engine/physics/Collider2D.cpp b/engines/hpl1/engine/physics/Collider2D.cpp
index 1a54c904428..68c04059e75 100644
--- a/engines/hpl1/engine/physics/Collider2D.cpp
+++ b/engines/hpl1/engine/physics/Collider2D.cpp
@@ -72,8 +72,8 @@ tFlag cCollider2D::CollideBody(cBody2D *apBody, cCollideData2D *apData) {
cVector2f vLastPushVector;
/////// TEST COLLISION WITH TILES
- //float fTileSize = mpWorld->GetTileMap()->GetTileSize();
- //cRect2f TileRect = cRect2f(0, 0, fTileSize, fTileSize);
+ // float fTileSize = mpWorld->GetTileMap()->GetTileSize();
+ // cRect2f TileRect = cRect2f(0, 0, fTileSize, fTileSize);
for (int i = 0; i < mpWorld->GetTileMap()->GetTileLayerNum(); i++) {
if (mpWorld->GetTileMap()->GetTileLayer(i)->HasCollision() == false)
@@ -83,8 +83,8 @@ tFlag cCollider2D::CollideBody(cBody2D *apBody, cCollideData2D *apData) {
while (pTileIt->HasNext()) {
cTile *pTile = pTileIt->Next();
- //TileRect.x = pTile->GetPosition().x - fTileSize / 2;
- //TileRect.y = pTile->GetPosition().y - fTileSize / 2;
+ // TileRect.x = pTile->GetPosition().x - fTileSize / 2;
+ // TileRect.y = pTile->GetPosition().y - fTileSize / 2;
// This can be used for material properties.
// cTileDataNormal *pTData = static_cast<cTileDataNormal*>(pTile->GetTileData());
@@ -218,8 +218,8 @@ tFlag cCollider2D::CollideRect(cRect2f &aRect, tFlag alCollideFlags, cCollideDat
//// Check for all tiles if the flag is set
if (alCollideFlags & eFlagBit_0) {
- //float fTileSize = mpWorld->GetTileMap()->GetTileSize();
- //cRect2f TileRect = cRect2f(0, 0, fTileSize, fTileSize);
+ // float fTileSize = mpWorld->GetTileMap()->GetTileSize();
+ // cRect2f TileRect = cRect2f(0, 0, fTileSize, fTileSize);
for (int i = 0; i < mpWorld->GetTileMap()->GetTileLayerNum(); i++) {
if (mpWorld->GetTileMap()->GetTileLayer(i)->HasCollision() == false)
@@ -229,8 +229,8 @@ tFlag cCollider2D::CollideRect(cRect2f &aRect, tFlag alCollideFlags, cCollideDat
while (pTileIt->HasNext()) {
cTile *pTile = pTileIt->Next();
- //TileRect.x = pTile->GetPosition().x - fTileSize / 2;
- //TileRect.y = pTile->GetPosition().y - fTileSize / 2;
+ // TileRect.x = pTile->GetPosition().x - fTileSize / 2;
+ // TileRect.y = pTile->GetPosition().y - fTileSize / 2;
if (pTile->GetCollisionMesh() == NULL)
continue;
@@ -309,7 +309,7 @@ tFlag cCollider2D::CollideLine(const cVector2f &avStart, const cVector2f &avEnd,
//// Check for all tiles if the flag is set
if (alCollideFlags & eFlagBit_0) {
- /*float fTileSize = */mpWorld->GetTileMap()->GetTileSize();
+ /*float fTileSize = */ mpWorld->GetTileMap()->GetTileSize();
for (int i = 0; i < mpWorld->GetTileMap()->GetTileLayerNum(); i++) {
if (mpWorld->GetTileMap()->GetTileLayer(i)->HasCollision() == false)
diff --git a/engines/hpl1/engine/physics/Collider2D.h b/engines/hpl1/engine/physics/Collider2D.h
index 40e8a60f1a1..52b3ddec4ae 100644
--- a/engines/hpl1/engine/physics/Collider2D.h
+++ b/engines/hpl1/engine/physics/Collider2D.h
@@ -84,6 +84,6 @@ private:
float &afMin, float &afMax);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDER2D_H
diff --git a/engines/hpl1/engine/physics/LowLevelPhysics.h b/engines/hpl1/engine/physics/LowLevelPhysics.h
index 0e640ea3a4e..826a7466548 100644
--- a/engines/hpl1/engine/physics/LowLevelPhysics.h
+++ b/engines/hpl1/engine/physics/LowLevelPhysics.h
@@ -42,6 +42,6 @@ public:
virtual iPhysicsWorld *CreateWorld() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELPHYSICS_H
diff --git a/engines/hpl1/engine/physics/Physics.cpp b/engines/hpl1/engine/physics/Physics.cpp
index 3ad2755096b..cdb94db3f4d 100644
--- a/engines/hpl1/engine/physics/Physics.cpp
+++ b/engines/hpl1/engine/physics/Physics.cpp
@@ -30,8 +30,8 @@
#include "hpl1/engine/physics/PhysicsWorld.h"
#include "hpl1/engine/physics/SurfaceData.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
diff --git a/engines/hpl1/engine/physics/Physics.h b/engines/hpl1/engine/physics/Physics.h
index a4852264416..67ad7656537 100644
--- a/engines/hpl1/engine/physics/Physics.h
+++ b/engines/hpl1/engine/physics/Physics.h
@@ -28,10 +28,10 @@
#ifndef HPL_Physics_H
#define HPL_Physics_H
+#include "common/list.h"
#include "hpl1/engine/game/Updateable.h"
#include "hpl1/engine/physics/PhysicsMaterial.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
#include "hpl1/std/map.h"
namespace hpl {
@@ -117,6 +117,6 @@ private:
bool mbLog;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_Physics_H
diff --git a/engines/hpl1/engine/physics/PhysicsBody.cpp b/engines/hpl1/engine/physics/PhysicsBody.cpp
index e7f47aa6067..05759ddab5c 100644
--- a/engines/hpl1/engine/physics/PhysicsBody.cpp
+++ b/engines/hpl1/engine/physics/PhysicsBody.cpp
@@ -44,8 +44,8 @@
#include "hpl1/engine/scene/Node3D.h"
-#include "hpl1/engine/math/Math.h"
#include "common/algorithm.h"
+#include "hpl1/engine/math/Math.h"
namespace hpl {
diff --git a/engines/hpl1/engine/physics/PhysicsBody.h b/engines/hpl1/engine/physics/PhysicsBody.h
index 81d98a64f99..ac9049fa924 100644
--- a/engines/hpl1/engine/physics/PhysicsBody.h
+++ b/engines/hpl1/engine/physics/PhysicsBody.h
@@ -327,6 +327,6 @@ protected:
bool mbCollide;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_BODY_H
diff --git a/engines/hpl1/engine/physics/PhysicsController.h b/engines/hpl1/engine/physics/PhysicsController.h
index 5351e561f4c..3f82fe2fd7e 100644
--- a/engines/hpl1/engine/physics/PhysicsController.h
+++ b/engines/hpl1/engine/physics/PhysicsController.h
@@ -229,6 +229,6 @@ protected:
bool mbLogInfo;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_CONTROLLER_H
diff --git a/engines/hpl1/engine/physics/PhysicsJoint.h b/engines/hpl1/engine/physics/PhysicsJoint.h
index 53073aeb9e8..9e509a001a9 100644
--- a/engines/hpl1/engine/physics/PhysicsJoint.h
+++ b/engines/hpl1/engine/physics/PhysicsJoint.h
@@ -306,6 +306,6 @@ protected:
void LimitEffect(cJointLimitEffect *pEffect);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_H
diff --git a/engines/hpl1/engine/physics/PhysicsJointBall.h b/engines/hpl1/engine/physics/PhysicsJointBall.h
index cb2bcfa8659..b8e42b0e26c 100644
--- a/engines/hpl1/engine/physics/PhysicsJointBall.h
+++ b/engines/hpl1/engine/physics/PhysicsJointBall.h
@@ -75,6 +75,6 @@ protected:
cVector3f mvConePin;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_BALL_H
diff --git a/engines/hpl1/engine/physics/PhysicsJointHinge.h b/engines/hpl1/engine/physics/PhysicsJointHinge.h
index 13dd004f954..a0a4b4c8899 100644
--- a/engines/hpl1/engine/physics/PhysicsJointHinge.h
+++ b/engines/hpl1/engine/physics/PhysicsJointHinge.h
@@ -71,6 +71,6 @@ protected:
float mfMinAngle;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_HINGE_H
diff --git a/engines/hpl1/engine/physics/PhysicsJointScrew.h b/engines/hpl1/engine/physics/PhysicsJointScrew.h
index c017602d18e..52fd6dda102 100644
--- a/engines/hpl1/engine/physics/PhysicsJointScrew.h
+++ b/engines/hpl1/engine/physics/PhysicsJointScrew.h
@@ -80,6 +80,6 @@ protected:
cVector3f mvPin;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_SCREW_H
diff --git a/engines/hpl1/engine/physics/PhysicsJointSlider.h b/engines/hpl1/engine/physics/PhysicsJointSlider.h
index 17b9d167c6f..e21cb2a5432 100644
--- a/engines/hpl1/engine/physics/PhysicsJointSlider.h
+++ b/engines/hpl1/engine/physics/PhysicsJointSlider.h
@@ -82,6 +82,6 @@ protected:
cVector3f mvPin;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_JOINT_SLIDER_H
diff --git a/engines/hpl1/engine/physics/PhysicsMaterial.h b/engines/hpl1/engine/physics/PhysicsMaterial.h
index 24f7ab72b73..17e6da38afe 100644
--- a/engines/hpl1/engine/physics/PhysicsMaterial.h
+++ b/engines/hpl1/engine/physics/PhysicsMaterial.h
@@ -110,6 +110,6 @@ protected:
cSurfaceData *mpSurfaceData;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_MATERIAL_H
diff --git a/engines/hpl1/engine/physics/PhysicsWorld.cpp b/engines/hpl1/engine/physics/PhysicsWorld.cpp
index 3378788f68e..f90441a147d 100644
--- a/engines/hpl1/engine/physics/PhysicsWorld.cpp
+++ b/engines/hpl1/engine/physics/PhysicsWorld.cpp
@@ -38,8 +38,8 @@
#include "hpl1/engine/physics/SurfaceData.h"
#include "hpl1/engine/scene/PortalContainer.h"
#include "hpl1/engine/scene/World3D.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -82,7 +82,7 @@ void iPhysicsWorld::Update(float afTimeStep) {
////////////////////////////////////
// Update character bodies
- //unsigned int lTime = GetApplicationTime();
+ // unsigned int lTime = GetApplicationTime();
tCharacterBodyListIt CharIt = mlstCharBodies.begin();
for (; CharIt != mlstCharBodies.end(); ++CharIt) {
iCharacterBody *pBody = *CharIt;
@@ -105,7 +105,7 @@ void iPhysicsWorld::Update(float afTimeStep) {
////////////////////////////////////
// Simulate the physics
- //lTime = GetApplicationTime();
+ // lTime = GetApplicationTime();
Simulate(afTimeStep);
// LogUpdate(" Updating lowlevel physics took %d ms\n",mpWorld3D->GetSystem()->GetLowLevel()->GetTime() - lTime);
diff --git a/engines/hpl1/engine/physics/PhysicsWorld.h b/engines/hpl1/engine/physics/PhysicsWorld.h
index 35436e227fd..5b702a1859f 100644
--- a/engines/hpl1/engine/physics/PhysicsWorld.h
+++ b/engines/hpl1/engine/physics/PhysicsWorld.h
@@ -93,8 +93,8 @@ struct cPhysicsRayParams {
constexpr cPhysicsRayParams() {}
float mfT = 0;
float mfDist = 0;
- cVector3f mvNormal = {0,0,0};
- cVector3f mvPoint = {0,0,0};
+ cVector3f mvNormal = {0, 0, 0};
+ cVector3f mvPoint = {0, 0, 0};
};
class iPhysicsRayCallback {
@@ -268,6 +268,6 @@ protected:
bool mbSaveContactPoints;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PHYSICS_WORLD_H
diff --git a/engines/hpl1/engine/physics/SurfaceData.h b/engines/hpl1/engine/physics/SurfaceData.h
index e68fdcd08ce..1fd41eb704e 100644
--- a/engines/hpl1/engine/physics/SurfaceData.h
+++ b/engines/hpl1/engine/physics/SurfaceData.h
@@ -197,6 +197,6 @@ protected:
tSurfaceImpactDataVec mvHitData;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SURFACE_DATA_H
diff --git a/engines/hpl1/engine/resources/AnimationManager.cpp b/engines/hpl1/engine/resources/AnimationManager.cpp
index 2acb0e5a915..ce886841ed3 100644
--- a/engines/hpl1/engine/resources/AnimationManager.cpp
+++ b/engines/hpl1/engine/resources/AnimationManager.cpp
@@ -31,9 +31,9 @@
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/MeshLoaderHandler.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/AnimationManager.h b/engines/hpl1/engine/resources/AnimationManager.h
index bb497fcb8dc..9408d5e4146 100644
--- a/engines/hpl1/engine/resources/AnimationManager.h
+++ b/engines/hpl1/engine/resources/AnimationManager.h
@@ -52,6 +52,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ANIMATION_MANAGER_H
diff --git a/engines/hpl1/engine/resources/ConfigFile.cpp b/engines/hpl1/engine/resources/ConfigFile.cpp
index c603c20cf9a..242c1c0d6fb 100644
--- a/engines/hpl1/engine/resources/ConfigFile.cpp
+++ b/engines/hpl1/engine/resources/ConfigFile.cpp
@@ -26,12 +26,12 @@
*/
#include "hpl1/engine/resources/ConfigFile.h"
+#include "common/file.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
#include "hpl1/engine/resources/FileSearcher.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
-#include "common/file.h"
-#include "hpl1/debug.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/ConfigFile.h b/engines/hpl1/engine/resources/ConfigFile.h
index 926271b9305..58f6590a49c 100644
--- a/engines/hpl1/engine/resources/ConfigFile.h
+++ b/engines/hpl1/engine/resources/ConfigFile.h
@@ -63,13 +63,13 @@ public:
private:
tWString msFile;
- //cFileSearcher *mpFileSearcher;
+ // cFileSearcher *mpFileSearcher;
TiXmlDocument *mpXmlDoc;
const char *GetCharArray(tString asLevel, tString asName);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CONFIGFILE_H
diff --git a/engines/hpl1/engine/resources/EntityLoader_Object.cpp b/engines/hpl1/engine/resources/EntityLoader_Object.cpp
index 3f5e2447e87..eca5b690aa4 100644
--- a/engines/hpl1/engine/resources/EntityLoader_Object.cpp
+++ b/engines/hpl1/engine/resources/EntityLoader_Object.cpp
@@ -544,8 +544,8 @@ iEntity3D *cEntityLoader_Object::Load(const tString &asName, TiXmlElement *apRoo
cMeshEntity *pEntityCopy = mpEntity;
cMesh *pMeshCopy = mpMesh;
for (int i = 0; i < pMeshCopy->GetReferenceNum(); i++) {
- /*iEntity3D *pRef = */mpMesh->CreateReferenceInWorld(asName, pMeshCopy->GetReference(i), pEntityCopy,
- apWorld, a_mtxTransform);
+ /*iEntity3D *pRef = */ mpMesh->CreateReferenceInWorld(asName, pMeshCopy->GetReference(i), pEntityCopy,
+ apWorld, a_mtxTransform);
// if(pPS) mvParticleSystems.push_back(pPS);
}
return pEntityCopy;
diff --git a/engines/hpl1/engine/resources/EntityLoader_Object.h b/engines/hpl1/engine/resources/EntityLoader_Object.h
index aa1f8af1f33..6cf4f762285 100644
--- a/engines/hpl1/engine/resources/EntityLoader_Object.h
+++ b/engines/hpl1/engine/resources/EntityLoader_Object.h
@@ -86,6 +86,6 @@ protected:
cMesh *mpMesh;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ENTITY_LOADER_OBJECT_H
diff --git a/engines/hpl1/engine/resources/FileSearcher.cpp b/engines/hpl1/engine/resources/FileSearcher.cpp
index 32538cb0375..1c94c8444ea 100644
--- a/engines/hpl1/engine/resources/FileSearcher.cpp
+++ b/engines/hpl1/engine/resources/FileSearcher.cpp
@@ -27,8 +27,8 @@
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/low_level_resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/hpl1.h"
namespace hpl {
@@ -70,7 +70,7 @@ void cFileSearcher::AddDirectory(tString asPath, tString asMask) {
for (const auto &f : lstFileNames) {
m_mapFiles.insert(tFilePathMap::value_type(
cString::ToLowerCase(f),
- cString::SetFilePath(f, asPath)));
+ cString::SetFilePath(f, asPath)));
}
}
}
diff --git a/engines/hpl1/engine/resources/FileSearcher.h b/engines/hpl1/engine/resources/FileSearcher.h
index 701aa2cac2b..e52cae584be 100644
--- a/engines/hpl1/engine/resources/FileSearcher.h
+++ b/engines/hpl1/engine/resources/FileSearcher.h
@@ -71,6 +71,6 @@ private:
LowLevelResources *mpLowLevelResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FILESEARCHER_H
diff --git a/engines/hpl1/engine/resources/FontManager.cpp b/engines/hpl1/engine/resources/FontManager.cpp
index b2c17aa607e..f7bb05c16ba 100644
--- a/engines/hpl1/engine/resources/FontManager.cpp
+++ b/engines/hpl1/engine/resources/FontManager.cpp
@@ -26,139 +26,127 @@
*/
#include "hpl1/engine/resources/FontManager.h"
-#include "hpl1/engine/system/String.h"
-#include "hpl1/engine/system/low_level_system.h"
-#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/resources/ImageManager.h"
+#include "hpl1/engine/resources/Resources.h"
+#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/font_data.h"
-
namespace hpl {
- //////////////////////////////////////////////////////////////////////////
- // CONSTRUCTORS
- //////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+// CONSTRUCTORS
+//////////////////////////////////////////////////////////////////////////
- //-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
- cFontManager::cFontManager(cGraphics* apGraphics,cGui *apGui,cResources *apResources)
- : iResourceManager(apResources->GetFileSearcher(), apResources->GetLowLevel(),
- apResources->GetLowLevelSystem())
- {
- mpGraphics = apGraphics;
- mpResources = apResources;
- mpGui = apGui;
- }
+cFontManager::cFontManager(cGraphics *apGraphics, cGui *apGui, cResources *apResources)
+ : iResourceManager(apResources->GetFileSearcher(), apResources->GetLowLevel(),
+ apResources->GetLowLevelSystem()) {
+ mpGraphics = apGraphics;
+ mpResources = apResources;
+ mpGui = apGui;
+}
- cFontManager::~cFontManager()
- {
- DestroyAll();
- Log(" Done with fonts\n");
- }
+cFontManager::~cFontManager() {
+ DestroyAll();
+ Log(" Done with fonts\n");
+}
- //-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
- //////////////////////////////////////////////////////////////////////////
- // PUBLIC METHODS
- //////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+//////////////////////////////////////////////////////////////////////////
- //-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
- FontData* cFontManager::CreateFontData(const tString& asName, int alSize,unsigned short alFirstChar,
- unsigned short alLastChar)
- {
- tString sPath;
- FontData* pFont;
- tString asNewName = cString::ToLowerCase(asName);
+FontData *cFontManager::CreateFontData(const tString &asName, int alSize, unsigned short alFirstChar,
+ unsigned short alLastChar) {
+ tString sPath;
+ FontData *pFont;
+ tString asNewName = cString::ToLowerCase(asName);
- BeginLoad(asName);
+ BeginLoad(asName);
- //asNewName = cString::SetFileExt(asName,"ttf");
+ // asNewName = cString::SetFileExt(asName,"ttf");
- pFont = static_cast<FontData*>(this->FindLoadedResource(asNewName,sPath));
+ pFont = static_cast<FontData *>(this->FindLoadedResource(asNewName, sPath));
- if(pFont==NULL && sPath!="")
- {
- pFont = mpGraphics->GetLowLevel()->CreateFontData(asNewName);
- pFont->setUp(mpGraphics->GetDrawer(),mpLowLevelResources,mpGui);
+ if (pFont == NULL && sPath != "") {
+ pFont = mpGraphics->GetLowLevel()->CreateFontData(asNewName);
+ pFont->setUp(mpGraphics->GetDrawer(), mpLowLevelResources, mpGui);
- tString sExt = cString::ToLowerCase(cString::GetFileExt(asName));
+ tString sExt = cString::ToLowerCase(cString::GetFileExt(asName));
- //True Type Font
- if(sExt == "ttf")
- {
- if(pFont->createFromFontFile(sPath,alSize,alFirstChar,alLastChar)==false){
- hplDelete(pFont);
- EndLoad();
- return NULL;
- }
- }
- //Angel code font type
- else if(sExt == "fnt")
- {
- if(pFont->createFromBitmapFile(sPath)==false){
- hplDelete(pFont);
- EndLoad();
- return NULL;
- }
+ // True Type Font
+ if (sExt == "ttf") {
+ if (pFont->createFromFontFile(sPath, alSize, alFirstChar, alLastChar) == false) {
+ hplDelete(pFont);
+ EndLoad();
+ return NULL;
}
- else
- {
- Error("Font '%s' has an unkown extension!\n",asName.c_str());
+ }
+ // Angel code font type
+ else if (sExt == "fnt") {
+ if (pFont->createFromBitmapFile(sPath) == false) {
hplDelete(pFont);
EndLoad();
return NULL;
}
-
- //mpResources->GetImageManager()->FlushAll();
- AddResource(pFont);
+ } else {
+ Error("Font '%s' has an unkown extension!\n", asName.c_str());
+ hplDelete(pFont);
+ EndLoad();
+ return NULL;
}
- if(pFont)pFont->IncUserCount();
- else Error("Couldn't create font '%s'\n",asNewName.c_str());
-
- EndLoad();
- return pFont;
+ // mpResources->GetImageManager()->FlushAll();
+ AddResource(pFont);
}
- //-----------------------------------------------------------------------
+ if (pFont)
+ pFont->IncUserCount();
+ else
+ Error("Couldn't create font '%s'\n", asNewName.c_str());
- iResourceBase* cFontManager::Create(const tString& asName)
- {
- return CreateFontData(asName, 16, 32, 255);
- }
+ EndLoad();
+ return pFont;
+}
+
+//-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
+iResourceBase *cFontManager::Create(const tString &asName) {
+ return CreateFontData(asName, 16, 32, 255);
+}
- void cFontManager::Unload(iResourceBase* apResource)
- {
+//-----------------------------------------------------------------------
- }
- //-----------------------------------------------------------------------
+void cFontManager::Unload(iResourceBase *apResource) {
+}
+//-----------------------------------------------------------------------
- void cFontManager::Destroy(iResourceBase* apResource)
- {
- apResource->DecUserCount();
+void cFontManager::Destroy(iResourceBase *apResource) {
+ apResource->DecUserCount();
- if(apResource->HasUsers()==false){
- RemoveResource(apResource);
- hplDelete(apResource);
- }
+ if (apResource->HasUsers() == false) {
+ RemoveResource(apResource);
+ hplDelete(apResource);
}
+}
- //-----------------------------------------------------------------------
-
- //-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
- //////////////////////////////////////////////////////////////////////////
- // PRIVATE METHODS
- //////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
+//////////////////////////////////////////////////////////////////////////
+// PRIVATE METHODS
+//////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
-}
+//-----------------------------------------------------------------------
+} // namespace hpl
diff --git a/engines/hpl1/engine/resources/FontManager.h b/engines/hpl1/engine/resources/FontManager.h
index bb3e0859f55..2fa33cb8a0e 100644
--- a/engines/hpl1/engine/resources/FontManager.h
+++ b/engines/hpl1/engine/resources/FontManager.h
@@ -52,7 +52,7 @@ public:
* \return
*/
FontData *CreateFontData(const tString &asName, int alSize = 16, unsigned short alFirstChar = 32,
- unsigned short alLastChar = 255);
+ unsigned short alLastChar = 255);
void Destroy(iResourceBase *apResource);
void Unload(iResourceBase *apResource);
@@ -63,6 +63,6 @@ private:
cGui *mpGui;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FONT_MANAGER_H
diff --git a/engines/hpl1/engine/resources/FrameBase.h b/engines/hpl1/engine/resources/FrameBase.h
index 05d277c2c32..779474fcb15 100644
--- a/engines/hpl1/engine/resources/FrameBase.h
+++ b/engines/hpl1/engine/resources/FrameBase.h
@@ -50,6 +50,6 @@ protected:
int mlPicCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FRAMEBASE_H
diff --git a/engines/hpl1/engine/resources/FrameBitmap.cpp b/engines/hpl1/engine/resources/FrameBitmap.cpp
index 1a5e6011161..c4651235c61 100644
--- a/engines/hpl1/engine/resources/FrameBitmap.cpp
+++ b/engines/hpl1/engine/resources/FrameBitmap.cpp
@@ -26,253 +26,241 @@
*/
#include "hpl1/engine/resources/FrameBitmap.h"
+#include "hpl1/engine/graphics/Texture.h"
+#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/math/Math.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/resources/FrameTexture.h"
#include "hpl1/engine/resources/ResourceImage.h"
-#include "hpl1/engine/graphics/bitmap2D.h"
-#include "hpl1/engine/graphics/Texture.h"
-
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
- //////////////////////////////////////////////////////////////////////////
- // CONSTRUCTORS
- //////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////
+// CONSTRUCTORS
+//////////////////////////////////////////////////////////////////////////
- //-----------------------------------------------------------------------
+//-----------------------------------------------------------------------
- cFrameBitmap::cFrameBitmap(Bitmap2D *apBitmap, cFrameTexture *apFrmTex, int alHandle) : iFrameBase()
- {
- mpBitmap = apBitmap;
- mpFrameTexture = apFrmTex;
- mpBitmap->fillRect(cRect2l(0,0,0,0), cColor(1,1));
- mlMinHole = 6;
- mlHandle = alHandle;
- mbIsFull = false;
- mbIsLocked = false;
+cFrameBitmap::cFrameBitmap(Bitmap2D *apBitmap, cFrameTexture *apFrmTex, int alHandle) : iFrameBase() {
+ mpBitmap = apBitmap;
+ mpFrameTexture = apFrmTex;
+ mpBitmap->fillRect(cRect2l(0, 0, 0, 0), cColor(1, 1));
+ mlMinHole = 6;
+ mlHandle = alHandle;
+ mbIsFull = false;
+ mbIsLocked = false;
- //Root node in rect tree
- mRects.Insert(cFBitmapRect(0,0,mpBitmap->getWidth(), mpBitmap->getHeight(),-1));
- }
+ // Root node in rect tree
+ mRects.Insert(cFBitmapRect(0, 0, mpBitmap->getWidth(), mpBitmap->getHeight(), -1));
+}
- cFrameBitmap::~cFrameBitmap()
- {
- hplDelete(mpBitmap);
- mpBitmap = NULL;
- }
+cFrameBitmap::~cFrameBitmap() {
+ hplDelete(mpBitmap);
+ mpBitmap = NULL;
+}
- //-----------------------------------------------------------------------
-
- //////////////////////////////////////////////////////////////////////////
- // PUBLIC METHODS
- //////////////////////////////////////////////////////////////////////////
-
- //-----------------------------------------------------------------------
-
- #define DEBUG_BTREE (false)
-
- cResourceImage *cFrameBitmap::AddBitmap(Bitmap2D *apSrc)
- {
- cResourceImage *pImage=NULL;
- //source size
- //+2 because we are gonna have a border to get rid if some antialiasing problems
- int lSW = apSrc->getWidth()+2;
- int lSH = apSrc->getHeight()+2;
-
- //destination size
- //int lDW = mpBitmap->getWidth();
- //int lDH = mpBitmap->getHeight();
-
- cVector2l vPos;
-
- bool bFoundEmptyNode = false;
- bool bFoundNode = false;
- //Debug
- int node=0;
-
- if(DEBUG_BTREE)Log("**** Image %d *****\n",mlPicCount);
-
- //Get the leaves of the tree and search it for a good pos.
- tRectTreeNodeList lstNodes = mRects.GetLeafList();
- tRectTreeNodeListIt it;
- for(it = lstNodes.begin();it!=lstNodes.end();++it)
- {
- if(DEBUG_BTREE)Log("Checking node %d:\n",node++);
- tRectTreeNode *TopNode = *it;
- cFBitmapRect* pData = TopNode->GetData();
-
- //Check if the space is free
- if(pData->mlHandle<0)
- {
- if(DEBUG_BTREE)Log("Found free node\n");
- bFoundEmptyNode = true; //An empty node was found.. bitmap not full yet.
-
- //Check if the Image fits in the rect
- cRect2l NewRect = cRect2l(pData->mRect.x,pData->mRect.y,lSW, lSH);
- if(DEBUG_BTREE)Log("Fit: [%d:%d:%d:%d] in [%d:%d:%d:%d]\n",
- NewRect.x,NewRect.y,NewRect.w,NewRect.h,
- pData->mRect.x,pData->mRect.y,pData->mRect.w,pData->mRect.h);
-
- if(cMath::BoxFit(NewRect, pData->mRect))
- {
- if(DEBUG_BTREE)Log("The node fits!\n");
- bFoundNode = true;
-
- //If the bitmap fits perfectly add the node without splitting
- if(MinimumFit(NewRect,pData->mRect))
- {
- if(DEBUG_BTREE)Log("Minimum fit!\n");
- pData->mRect = NewRect;
- pData->mlHandle = 1;
- }
- //If there is still space left, make new nodes.
- else
- {
- if(DEBUG_BTREE)Log("Normal fit!\n");
- //Insert 2 children for the top node (lower and upper part.
- tRectTreeNode* UpperNode;
- //Upper
- UpperNode = mRects.InsertAt(cFBitmapRect(NewRect.x,NewRect.y,
- pData->mRect.w,NewRect.h,-2),TopNode,
- eBinTreeNode_Left);
-
- //Lower
- mRects.InsertAt(cFBitmapRect(NewRect.x,NewRect.y+NewRect.h,
- pData->mRect.w,pData->mRect.h-NewRect.h,-3),TopNode,
- eBinTreeNode_Right);
-
- //Split the Upper Node into 2 nodes.
- pData = UpperNode->GetData();//Get the data for the upper node.
- //Upper split, this is the new bitmap
- mRects.InsertAt(cFBitmapRect(NewRect.x,NewRect.y,
- NewRect.w,NewRect.h,2),UpperNode,
- eBinTreeNode_Left);
-
- //Lower split, this is empty
- mRects.InsertAt(cFBitmapRect(NewRect.x+NewRect.w,NewRect.y,
- pData->mRect.w-NewRect.w,NewRect.h,-4),UpperNode,
- eBinTreeNode_Right);
- }
+//-----------------------------------------------------------------------
+
+//////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+//////////////////////////////////////////////////////////////////////////
+
+//-----------------------------------------------------------------------
+
+#define DEBUG_BTREE (false)
+
+cResourceImage *cFrameBitmap::AddBitmap(Bitmap2D *apSrc) {
+ cResourceImage *pImage = NULL;
+ // source size
+ //+2 because we are gonna have a border to get rid if some antialiasing problems
+ int lSW = apSrc->getWidth() + 2;
+ int lSH = apSrc->getHeight() + 2;
+
+ // destination size
+ // int lDW = mpBitmap->getWidth();
+ // int lDH = mpBitmap->getHeight();
+
+ cVector2l vPos;
+
+ bool bFoundEmptyNode = false;
+ bool bFoundNode = false;
+ // Debug
+ int node = 0;
+
+ if (DEBUG_BTREE)
+ Log("**** Image %d *****\n", mlPicCount);
+
+ // Get the leaves of the tree and search it for a good pos.
+ tRectTreeNodeList lstNodes = mRects.GetLeafList();
+ tRectTreeNodeListIt it;
+ for (it = lstNodes.begin(); it != lstNodes.end(); ++it) {
+ if (DEBUG_BTREE)
+ Log("Checking node %d:\n", node++);
+ tRectTreeNode *TopNode = *it;
+ cFBitmapRect *pData = TopNode->GetData();
+
+ // Check if the space is free
+ if (pData->mlHandle < 0) {
+ if (DEBUG_BTREE)
+ Log("Found free node\n");
+ bFoundEmptyNode = true; // An empty node was found.. bitmap not full yet.
+
+ // Check if the Image fits in the rect
+ cRect2l NewRect = cRect2l(pData->mRect.x, pData->mRect.y, lSW, lSH);
+ if (DEBUG_BTREE)
+ Log("Fit: [%d:%d:%d:%d] in [%d:%d:%d:%d]\n",
+ NewRect.x, NewRect.y, NewRect.w, NewRect.h,
+ pData->mRect.x, pData->mRect.y, pData->mRect.w, pData->mRect.h);
+
+ if (cMath::BoxFit(NewRect, pData->mRect)) {
+ if (DEBUG_BTREE)
+ Log("The node fits!\n");
+ bFoundNode = true;
+
+ // If the bitmap fits perfectly add the node without splitting
+ if (MinimumFit(NewRect, pData->mRect)) {
+ if (DEBUG_BTREE)
+ Log("Minimum fit!\n");
+ pData->mRect = NewRect;
+ pData->mlHandle = 1;
+ }
+ // If there is still space left, make new nodes.
+ else {
+ if (DEBUG_BTREE)
+ Log("Normal fit!\n");
+ // Insert 2 children for the top node (lower and upper part.
+ tRectTreeNode *UpperNode;
+ // Upper
+ UpperNode = mRects.InsertAt(cFBitmapRect(NewRect.x, NewRect.y,
+ pData->mRect.w, NewRect.h, -2),
+ TopNode,
+ eBinTreeNode_Left);
+
+ // Lower
+ mRects.InsertAt(cFBitmapRect(NewRect.x, NewRect.y + NewRect.h,
+ pData->mRect.w, pData->mRect.h - NewRect.h, -3),
+ TopNode,
+ eBinTreeNode_Right);
+
+ // Split the Upper Node into 2 nodes.
+ pData = UpperNode->GetData(); // Get the data for the upper node.
+ // Upper split, this is the new bitmap
+ mRects.InsertAt(cFBitmapRect(NewRect.x, NewRect.y,
+ NewRect.w, NewRect.h, 2),
+ UpperNode,
+ eBinTreeNode_Left);
+
+ // Lower split, this is empty
+ mRects.InsertAt(cFBitmapRect(NewRect.x + NewRect.w, NewRect.y,
+ pData->mRect.w - NewRect.w, NewRect.h, -4),
+ UpperNode,
+ eBinTreeNode_Right);
+ }
- vPos = cVector2l(NewRect.x+1,NewRect.y+1);//+1 for the right pos
+ vPos = cVector2l(NewRect.x + 1, NewRect.y + 1); //+1 for the right pos
- //Draw 4 times so we get a nice extra border
- for(int i=0;i<2;i++)for(int j=0;j<2;j++){
- apSrc->drawToBitmap(*mpBitmap,cVector2l(NewRect.x+i*2,NewRect.y+j*2));
- }
- //Fix the border a little more:
- for(int i=-1;i<2;i++)for(int j=-1;j<2;j++)
- if((i==0 || j==0) && (i!=j)){
- apSrc->drawToBitmap(*mpBitmap,cVector2l(NewRect.x+1+i,NewRect.y+1+j));
+ // Draw 4 times so we get a nice extra border
+ for (int i = 0; i < 2; i++)
+ for (int j = 0; j < 2; j++) {
+ apSrc->drawToBitmap(*mpBitmap, cVector2l(NewRect.x + i * 2, NewRect.y + j * 2));
}
- //Draw the final
- apSrc->drawToBitmap(*mpBitmap,cVector2l(NewRect.x+1,NewRect.y+1));
-
-
- mlPicCount++;
- mpFrameTexture->SetPicCount(mlPicCount);
- break;
- }
+ // Fix the border a little more:
+ for (int i = -1; i < 2; i++)
+ for (int j = -1; j < 2; j++)
+ if ((i == 0 || j == 0) && (i != j)) {
+ apSrc->drawToBitmap(*mpBitmap, cVector2l(NewRect.x + 1 + i, NewRect.y + 1 + j));
+ }
+ // Draw the final
+ apSrc->drawToBitmap(*mpBitmap, cVector2l(NewRect.x + 1, NewRect.y + 1));
+
+ mlPicCount++;
+ mpFrameTexture->SetPicCount(mlPicCount);
+ break;
}
-
}
+ }
- if(bFoundNode)
- {
- //Create the image resource
- pImage = hplNew( cResourceImage, (apSrc->getFileName(),mpFrameTexture, this,
- cRect2l(vPos,cVector2l(lSW-2,lSH-2)),//-2 to get the correct size.
- cVector2l(mpBitmap->getWidth(),mpBitmap->getHeight()),
- mlHandle) );
-
- if(!bFoundEmptyNode)
- {
- mbIsFull = true;
- }
+ if (bFoundNode) {
+ // Create the image resource
+ pImage = hplNew(cResourceImage, (apSrc->getFileName(), mpFrameTexture, this,
+ cRect2l(vPos, cVector2l(lSW - 2, lSH - 2)), //-2 to get the correct size.
+ cVector2l(mpBitmap->getWidth(), mpBitmap->getHeight()),
+ mlHandle));
- mbIsUpdated = true;
+ if (!bFoundEmptyNode) {
+ mbIsFull = true;
}
+ mbIsUpdated = true;
+ }
-
- /// LAST DEBUG ///
- if(DEBUG_BTREE)
- {
- Log("Current Tree begin:\n");
- tRectTreeNodeList lstNodes2 = mRects.GetNodeList();
- tRectTreeNodeListIt it2;
- int node2=0;
- for(it2 = lstNodes2.begin();it2!=lstNodes2.end();++it)
- {
- cRect2l Rect = (*it2)->GetData()->mRect;
- int h = (*it)->GetData()->mlHandle;
- Log(" %d: [%d:%d:%d:%d]:%d\n",node2,Rect.x,Rect.y,Rect.w,Rect.h,h);
- node2++;
- }
- Log("Current Tree end:\n");
- Log("-----------------\n");
-
- Log("Current Leaves begin:\n");
- lstNodes2 = mRects.GetLeafList();
- node2=0;
- for(it2 = lstNodes2.begin();it2!=lstNodes2.end();++it)
- {
- cRect2l Rect = (*it2)->GetData()->mRect;
- int h = (*it2)->GetData()->mlHandle;
- Log(" %d: [%d:%d:%d:%d]: %d\n",node2,Rect.x,Rect.y,Rect.w,Rect.h,h);
- node2++;
- }
- Log("Current Tree end:\n");
- Log("-----------------\n");
+ /// LAST DEBUG ///
+ if (DEBUG_BTREE) {
+ Log("Current Tree begin:\n");
+ tRectTreeNodeList lstNodes2 = mRects.GetNodeList();
+ tRectTreeNodeListIt it2;
+ int node2 = 0;
+ for (it2 = lstNodes2.begin(); it2 != lstNodes2.end(); ++it) {
+ cRect2l Rect = (*it2)->GetData()->mRect;
+ int h = (*it)->GetData()->mlHandle;
+ Log(" %d: [%d:%d:%d:%d]:%d\n", node2, Rect.x, Rect.y, Rect.w, Rect.h, h);
+ node2++;
}
-
-
- return pImage;
+ Log("Current Tree end:\n");
+ Log("-----------------\n");
+
+ Log("Current Leaves begin:\n");
+ lstNodes2 = mRects.GetLeafList();
+ node2 = 0;
+ for (it2 = lstNodes2.begin(); it2 != lstNodes2.end(); ++it) {
+ cRect2l Rect = (*it2)->GetData()->mRect;
+ int h = (*it2)->GetData()->mlHandle;
+ Log(" %d: [%d:%d:%d:%d]: %d\n", node2, Rect.x, Rect.y, Rect.w, Rect.h, h);
+ node2++;
+ }
+ Log("Current Tree end:\n");
+ Log("-----------------\n");
}
- //-----------------------------------------------------------------------
+ return pImage;
+}
- bool cFrameBitmap::MinimumFit(cRect2l aSrc,cRect2l aDest)
- {
- if(aDest.w-aSrc.w<mlMinHole && aDest.h-aSrc.h<mlMinHole) return true;
+//-----------------------------------------------------------------------
- return false;
- }
+bool cFrameBitmap::MinimumFit(cRect2l aSrc, cRect2l aDest) {
+ if (aDest.w - aSrc.w < mlMinHole && aDest.h - aSrc.h < mlMinHole)
+ return true;
- //-----------------------------------------------------------------------
+ return false;
+}
- bool cFrameBitmap::IsUpdated()
- {
- return mbIsUpdated;
- }
+//-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
+bool cFrameBitmap::IsUpdated() {
+ return mbIsUpdated;
+}
- bool cFrameBitmap::IsFull()
- {
- return mbIsFull;
- }
+//-----------------------------------------------------------------------
- //-----------------------------------------------------------------------
+bool cFrameBitmap::IsFull() {
+ return mbIsFull;
+}
- bool cFrameBitmap::FlushToTexture()
- {
- if(mbIsUpdated)
- {
- mpFrameTexture->GetTexture()->CreateFromBitmap(mpBitmap);
- mpFrameTexture->GetTexture()->SetWrapS(eTextureWrap_ClampToEdge);
- mpFrameTexture->GetTexture()->SetWrapT(eTextureWrap_ClampToEdge);
+//-----------------------------------------------------------------------
- //mpFrameTexture->SetPicCount(mlPicCount);
- mbIsUpdated = false;
- return true;
- }
- else
- {
- return false;
- }
- }
+bool cFrameBitmap::FlushToTexture() {
+ if (mbIsUpdated) {
+ mpFrameTexture->GetTexture()->CreateFromBitmap(mpBitmap);
+ mpFrameTexture->GetTexture()->SetWrapS(eTextureWrap_ClampToEdge);
+ mpFrameTexture->GetTexture()->SetWrapT(eTextureWrap_ClampToEdge);
- //-----------------------------------------------------------------------
+ // mpFrameTexture->SetPicCount(mlPicCount);
+ mbIsUpdated = false;
+ return true;
+ } else {
+ return false;
+ }
}
+
+//-----------------------------------------------------------------------
+} // namespace hpl
diff --git a/engines/hpl1/engine/resources/FrameBitmap.h b/engines/hpl1/engine/resources/FrameBitmap.h
index 3ad7bf1e52f..d976f78678a 100644
--- a/engines/hpl1/engine/resources/FrameBitmap.h
+++ b/engines/hpl1/engine/resources/FrameBitmap.h
@@ -86,6 +86,6 @@ private:
bool mbIsLocked;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FRAMEBITMAP_H
diff --git a/engines/hpl1/engine/resources/FrameTexture.h b/engines/hpl1/engine/resources/FrameTexture.h
index a255fc422b2..99700e363a4 100644
--- a/engines/hpl1/engine/resources/FrameTexture.h
+++ b/engines/hpl1/engine/resources/FrameTexture.h
@@ -47,6 +47,6 @@ private:
int mlHandle;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_FRAMETEXTURE_H
diff --git a/engines/hpl1/engine/resources/GpuProgramManager.h b/engines/hpl1/engine/resources/GpuProgramManager.h
index 2a6d30088a4..a141527d4fc 100644
--- a/engines/hpl1/engine/resources/GpuProgramManager.h
+++ b/engines/hpl1/engine/resources/GpuProgramManager.h
@@ -59,6 +59,6 @@ private:
iLowLevelGraphics *mpLowLevelGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GPU_PROGRAM_MANAGER_H
diff --git a/engines/hpl1/engine/resources/ImageEntityManager.cpp b/engines/hpl1/engine/resources/ImageEntityManager.cpp
index 52115881604..0721287d9e9 100644
--- a/engines/hpl1/engine/resources/ImageEntityManager.cpp
+++ b/engines/hpl1/engine/resources/ImageEntityManager.cpp
@@ -26,13 +26,13 @@
*/
#include "hpl1/engine/resources/ImageEntityManager.h"
+#include "common/algorithm.h"
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/graphics/ImageEntityData.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
-#include "common/algorithm.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/ImageEntityManager.h b/engines/hpl1/engine/resources/ImageEntityManager.h
index 43ee6a4152e..7c7510cca07 100644
--- a/engines/hpl1/engine/resources/ImageEntityManager.h
+++ b/engines/hpl1/engine/resources/ImageEntityManager.h
@@ -55,6 +55,6 @@ private:
tIntVec mvImageHandle;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_IMAGE_ENTITY_MANAGER_H
diff --git a/engines/hpl1/engine/resources/ImageManager.cpp b/engines/hpl1/engine/resources/ImageManager.cpp
index 6743077e119..86f205d79a4 100644
--- a/engines/hpl1/engine/resources/ImageManager.cpp
+++ b/engines/hpl1/engine/resources/ImageManager.cpp
@@ -29,10 +29,10 @@
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/resources/FrameBitmap.h"
#include "hpl1/engine/resources/FrameTexture.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/ResourceImage.h"
-#include "hpl1/engine/system/low_level_system.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/ImageManager.h b/engines/hpl1/engine/resources/ImageManager.h
index af365355f1d..86aa3c2e5e3 100644
--- a/engines/hpl1/engine/resources/ImageManager.h
+++ b/engines/hpl1/engine/resources/ImageManager.h
@@ -88,6 +88,6 @@ private:
cFrameBitmap *CreateBitmapFrame(cVector2l avSize);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RESOURCEMANAGER_H
diff --git a/engines/hpl1/engine/resources/LanguageFile.cpp b/engines/hpl1/engine/resources/LanguageFile.cpp
index 3376bd723d6..2f689c79733 100644
--- a/engines/hpl1/engine/resources/LanguageFile.cpp
+++ b/engines/hpl1/engine/resources/LanguageFile.cpp
@@ -28,8 +28,8 @@
#include "hpl1/engine/resources/LanguageFile.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
#include "hpl1/engine/resources/FileSearcher.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/Resources.h"
diff --git a/engines/hpl1/engine/resources/LanguageFile.h b/engines/hpl1/engine/resources/LanguageFile.h
index a0e95f56533..6b166eb8d4f 100644
--- a/engines/hpl1/engine/resources/LanguageFile.h
+++ b/engines/hpl1/engine/resources/LanguageFile.h
@@ -77,6 +77,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LANGUAGE_FILE_H
diff --git a/engines/hpl1/engine/resources/MaterialManager.cpp b/engines/hpl1/engine/resources/MaterialManager.cpp
index 704c88ca12f..75f8807c885 100644
--- a/engines/hpl1/engine/resources/MaterialManager.cpp
+++ b/engines/hpl1/engine/resources/MaterialManager.cpp
@@ -32,9 +32,9 @@
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/resources/TextureManager.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/MaterialManager.h b/engines/hpl1/engine/resources/MaterialManager.h
index f11c48e3f66..770f0a3c573 100644
--- a/engines/hpl1/engine/resources/MaterialManager.h
+++ b/engines/hpl1/engine/resources/MaterialManager.h
@@ -84,6 +84,6 @@ private:
int mlIdCounter;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MATERIAL_MANAGER_H
diff --git a/engines/hpl1/engine/resources/MeshLoader.h b/engines/hpl1/engine/resources/MeshLoader.h
index e19215f0b4c..52970ed72f7 100644
--- a/engines/hpl1/engine/resources/MeshLoader.h
+++ b/engines/hpl1/engine/resources/MeshLoader.h
@@ -90,6 +90,6 @@ protected:
static bool mbUseFastMaterial;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_LOADER_H
diff --git a/engines/hpl1/engine/resources/MeshLoaderHandler.cpp b/engines/hpl1/engine/resources/MeshLoaderHandler.cpp
index 43a4765d092..de80a2ac86e 100644
--- a/engines/hpl1/engine/resources/MeshLoaderHandler.cpp
+++ b/engines/hpl1/engine/resources/MeshLoaderHandler.cpp
@@ -30,8 +30,8 @@
#include "hpl1/engine/resources/MeshLoader.h"
#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/scene/Scene.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/MeshLoaderHandler.h b/engines/hpl1/engine/resources/MeshLoaderHandler.h
index 1f5f7460f96..bcf847b11f5 100644
--- a/engines/hpl1/engine/resources/MeshLoaderHandler.h
+++ b/engines/hpl1/engine/resources/MeshLoaderHandler.h
@@ -32,8 +32,8 @@
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "hpl1/engine/resources/MeshLoader.h"
#include "common/list.h"
+#include "hpl1/engine/resources/MeshLoader.h"
namespace hpl {
@@ -72,6 +72,6 @@ private:
cScene *mpScene;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_LOADER_HANDLER_H
diff --git a/engines/hpl1/engine/resources/MeshManager.cpp b/engines/hpl1/engine/resources/MeshManager.cpp
index 84075c984c4..547b5deda0f 100644
--- a/engines/hpl1/engine/resources/MeshManager.cpp
+++ b/engines/hpl1/engine/resources/MeshManager.cpp
@@ -30,9 +30,9 @@
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/MeshLoaderHandler.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/MeshManager.h b/engines/hpl1/engine/resources/MeshManager.h
index 39f54ebb9b3..4e23ee9f59e 100644
--- a/engines/hpl1/engine/resources/MeshManager.h
+++ b/engines/hpl1/engine/resources/MeshManager.h
@@ -52,6 +52,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_MANAGER_H
diff --git a/engines/hpl1/engine/resources/ParticleManager.h b/engines/hpl1/engine/resources/ParticleManager.h
index a63145e885c..b4e5c0d9a0b 100644
--- a/engines/hpl1/engine/resources/ParticleManager.h
+++ b/engines/hpl1/engine/resources/ParticleManager.h
@@ -81,6 +81,6 @@ private:
// tParticleSystemData3DMap m_mapData3D;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PARTICLE_SYSTEM_MANAGER_H
diff --git a/engines/hpl1/engine/resources/ResourceBase.h b/engines/hpl1/engine/resources/ResourceBase.h
index dd88f08eaaf..2e9606d9e50 100644
--- a/engines/hpl1/engine/resources/ResourceBase.h
+++ b/engines/hpl1/engine/resources/ResourceBase.h
@@ -28,8 +28,8 @@
#ifndef HPL_RESOURCEBASE_H
#define HPL_RESOURCEBASE_H
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/SystemTypes.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -90,6 +90,6 @@ protected:
bool mbLogDestruction;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RESOURCEBASE_H
diff --git a/engines/hpl1/engine/resources/ResourceImage.h b/engines/hpl1/engine/resources/ResourceImage.h
index 215e8f7a9dc..9f5ef197ee7 100644
--- a/engines/hpl1/engine/resources/ResourceImage.h
+++ b/engines/hpl1/engine/resources/ResourceImage.h
@@ -30,9 +30,9 @@
#include "hpl1/engine/resources/ResourceBase.h"
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "common/array.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/ResourceManager.cpp b/engines/hpl1/engine/resources/ResourceManager.cpp
index d41f9c2d9d6..0a69c34f41b 100644
--- a/engines/hpl1/engine/resources/ResourceManager.cpp
+++ b/engines/hpl1/engine/resources/ResourceManager.cpp
@@ -29,8 +29,8 @@
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/resources/FileSearcher.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/ResourceBase.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/system/low_level_system.h"
diff --git a/engines/hpl1/engine/resources/ResourceManager.h b/engines/hpl1/engine/resources/ResourceManager.h
index 44efda89fc7..2d329de2f73 100644
--- a/engines/hpl1/engine/resources/ResourceManager.h
+++ b/engines/hpl1/engine/resources/ResourceManager.h
@@ -101,6 +101,6 @@ protected:
static int mlTabCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RESOURCEMANAGER_H
diff --git a/engines/hpl1/engine/resources/Resources.cpp b/engines/hpl1/engine/resources/Resources.cpp
index 51c2e650c25..645a7036de3 100644
--- a/engines/hpl1/engine/resources/Resources.cpp
+++ b/engines/hpl1/engine/resources/Resources.cpp
@@ -35,7 +35,6 @@
#include "hpl1/engine/resources/ImageEntityManager.h"
#include "hpl1/engine/resources/ImageManager.h"
#include "hpl1/engine/resources/LanguageFile.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/MaterialManager.h"
#include "hpl1/engine/resources/MeshLoaderHandler.h"
#include "hpl1/engine/resources/MeshManager.h"
@@ -46,6 +45,7 @@
#include "hpl1/engine/resources/TextureManager.h"
#include "hpl1/engine/resources/TileSetManager.h"
#include "hpl1/engine/resources/VideoManager.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/scene/Area2D.h"
#include "hpl1/engine/system/System.h"
diff --git a/engines/hpl1/engine/resources/Resources.h b/engines/hpl1/engine/resources/Resources.h
index c2677dbaa60..f32aa0105d6 100644
--- a/engines/hpl1/engine/resources/Resources.h
+++ b/engines/hpl1/engine/resources/Resources.h
@@ -245,6 +245,6 @@ private:
tWString mwsEmptyString;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RESOURCES_H
diff --git a/engines/hpl1/engine/resources/ResourcesTypes.h b/engines/hpl1/engine/resources/ResourcesTypes.h
index 383bb934276..1066d149ba3 100644
--- a/engines/hpl1/engine/resources/ResourcesTypes.h
+++ b/engines/hpl1/engine/resources/ResourcesTypes.h
@@ -31,8 +31,8 @@
namespace hpl {
// change to own file type?
-//typedef FILE tFile;
+// typedef FILE tFile;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_RESOURCES_TYPES_H
diff --git a/engines/hpl1/engine/resources/ScriptManager.cpp b/engines/hpl1/engine/resources/ScriptManager.cpp
index 0c8081e9376..70e374e74d6 100644
--- a/engines/hpl1/engine/resources/ScriptManager.cpp
+++ b/engines/hpl1/engine/resources/ScriptManager.cpp
@@ -27,10 +27,10 @@
#include "hpl1/engine/resources/ScriptManager.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/Script.h"
#include "hpl1/engine/system/String.h"
#include "hpl1/engine/system/System.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/ScriptManager.h b/engines/hpl1/engine/resources/ScriptManager.h
index a3508a4bca3..00f50e1a9bb 100644
--- a/engines/hpl1/engine/resources/ScriptManager.h
+++ b/engines/hpl1/engine/resources/ScriptManager.h
@@ -57,6 +57,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SCRIPT_MANAGER_H
diff --git a/engines/hpl1/engine/resources/SoundEntityManager.cpp b/engines/hpl1/engine/resources/SoundEntityManager.cpp
index 4ed5ee76100..7e7a1d0ea8d 100644
--- a/engines/hpl1/engine/resources/SoundEntityManager.cpp
+++ b/engines/hpl1/engine/resources/SoundEntityManager.cpp
@@ -32,8 +32,8 @@
#include "hpl1/engine/sound/SoundChannel.h"
#include "hpl1/engine/sound/SoundEntityData.h"
#include "hpl1/engine/sound/SoundHandler.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/SoundEntityManager.h b/engines/hpl1/engine/resources/SoundEntityManager.h
index 24e2a4525de..673526419f1 100644
--- a/engines/hpl1/engine/resources/SoundEntityManager.h
+++ b/engines/hpl1/engine/resources/SoundEntityManager.h
@@ -54,6 +54,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_ENTITY_MANAGER_H
diff --git a/engines/hpl1/engine/resources/SoundManager.cpp b/engines/hpl1/engine/resources/SoundManager.cpp
index 091eb56d853..ac843de03e3 100644
--- a/engines/hpl1/engine/resources/SoundManager.cpp
+++ b/engines/hpl1/engine/resources/SoundManager.cpp
@@ -30,8 +30,8 @@
#include "hpl1/engine/sound/LowLevelSound.h"
#include "hpl1/engine/sound/Sound.h"
#include "hpl1/engine/sound/SoundData.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/debug.h"
diff --git a/engines/hpl1/engine/resources/SoundManager.h b/engines/hpl1/engine/resources/SoundManager.h
index ba1b3015fd2..3dadc3e53e0 100644
--- a/engines/hpl1/engine/resources/SoundManager.h
+++ b/engines/hpl1/engine/resources/SoundManager.h
@@ -58,6 +58,6 @@ private:
iSoundData *FindData(const tString &asName, tString &asFilePath);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_MANAGER_H
diff --git a/engines/hpl1/engine/resources/TextureManager.cpp b/engines/hpl1/engine/resources/TextureManager.cpp
index 567796dee6d..8a9ba1f337c 100644
--- a/engines/hpl1/engine/resources/TextureManager.cpp
+++ b/engines/hpl1/engine/resources/TextureManager.cpp
@@ -26,16 +26,16 @@
*/
#include "hpl1/engine/resources/TextureManager.h"
-#include "hpl1/engine/graphics/bitmap2D.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
#include "hpl1/engine/graphics/Texture.h"
+#include "hpl1/engine/graphics/bitmap2D.h"
#include "hpl1/engine/resources/FileSearcher.h"
-#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
+#include "hpl1/engine/resources/low_level_resources.h"
#include "hpl1/engine/system/String.h"
-#include "hpl1/debug.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
@@ -398,7 +398,7 @@ iTexture *cTextureManager::CreateFlatTexture(const tString &asName, bool abUseMi
// Create the texture and load from bitmap
pTexture.reset(mpGraphics->GetLowLevel()->CreateTexture(asName, abUseMipMaps, aType,
- aTarget));
+ aTarget));
if (!pTexture) {
EndLoad();
return nullptr;
diff --git a/engines/hpl1/engine/resources/TextureManager.h b/engines/hpl1/engine/resources/TextureManager.h
index 93a6c23609a..a9e3fd73b09 100644
--- a/engines/hpl1/engine/resources/TextureManager.h
+++ b/engines/hpl1/engine/resources/TextureManager.h
@@ -95,6 +95,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TEXTURE_MANAGER_H
diff --git a/engines/hpl1/engine/resources/TileSetManager.cpp b/engines/hpl1/engine/resources/TileSetManager.cpp
index 5cbc359b907..afddff9db4d 100644
--- a/engines/hpl1/engine/resources/TileSetManager.cpp
+++ b/engines/hpl1/engine/resources/TileSetManager.cpp
@@ -29,8 +29,8 @@
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/scene/TileSet.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/TileSetManager.h b/engines/hpl1/engine/resources/TileSetManager.h
index 73075364d4d..93eb23ec8bc 100644
--- a/engines/hpl1/engine/resources/TileSetManager.h
+++ b/engines/hpl1/engine/resources/TileSetManager.h
@@ -52,6 +52,6 @@ private:
cResources *mpResources;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILESET_MANAGER_H
diff --git a/engines/hpl1/engine/resources/VideoManager.cpp b/engines/hpl1/engine/resources/VideoManager.cpp
index b41c55b0ba4..c483f5955ff 100644
--- a/engines/hpl1/engine/resources/VideoManager.cpp
+++ b/engines/hpl1/engine/resources/VideoManager.cpp
@@ -30,8 +30,8 @@
#include "hpl1/engine/graphics/VideoStream.h"
#include "hpl1/engine/resources/FileSearcher.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/resources/VideoManager.h b/engines/hpl1/engine/resources/VideoManager.h
index b6c18294fe3..a48342a8cbe 100644
--- a/engines/hpl1/engine/resources/VideoManager.h
+++ b/engines/hpl1/engine/resources/VideoManager.h
@@ -74,6 +74,6 @@ private:
tVideoStreamLoaderList mlstVideoLoaders;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_VIDEO_MANAGER_H
diff --git a/engines/hpl1/engine/resources/low_level_resources.cpp b/engines/hpl1/engine/resources/low_level_resources.cpp
index db7297fc853..d5a9ea5d925 100644
--- a/engines/hpl1/engine/resources/low_level_resources.cpp
+++ b/engines/hpl1/engine/resources/low_level_resources.cpp
@@ -20,14 +20,14 @@
*/
#include "hpl1/engine/resources/low_level_resources.h"
+#include "common/file.h"
+#include "common/fs.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/graphics/LowLevelGraphics.h"
-#include "hpl1/engine/resources/MeshLoaderHandler.h"
-#include "hpl1/engine/resources/VideoManager.h"
#include "hpl1/engine/impl/MeshLoaderCollada.h"
#include "hpl1/engine/impl/MeshLoaderMSH.h"
-#include "common/fs.h"
-#include "hpl1/debug.h"
-#include "common/file.h"
+#include "hpl1/engine/resources/MeshLoaderHandler.h"
+#include "hpl1/engine/resources/VideoManager.h"
namespace hpl {
@@ -64,7 +64,7 @@ void LowLevelResources::addVideoLoaders(cVideoManager *vm) {
}
void LowLevelResources::findFilesInDir(tStringList &alstStrings, tString asDir, tString asMask) {
- Common::String pattern = asDir + '/' + asMask;
+ Common::String pattern = asDir + '/' + asMask;
Common::ArchiveMemberList ls;
if (SearchMan.listMatchingMembers(ls, pattern) == 0)
Hpl1::logWarning(Hpl1::kDebugFilePath, "no files matching pattern %s were found", pattern.c_str());
@@ -74,4 +74,3 @@ void LowLevelResources::findFilesInDir(tStringList &alstStrings, tString asDir,
}
} // namespace hpl
-
diff --git a/engines/hpl1/engine/resources/low_level_resources.h b/engines/hpl1/engine/resources/low_level_resources.h
index 8fecdb2afff..5d77f9f690f 100644
--- a/engines/hpl1/engine/resources/low_level_resources.h
+++ b/engines/hpl1/engine/resources/low_level_resources.h
@@ -42,7 +42,7 @@ public:
LowLevelResources(iLowLevelGraphics *lowLevelGraphics) : _lowLevelGraphics(lowLevelGraphics) {
}
- //Returns a list of files in a directory matching a pattern
+ // Returns a list of files in a directory matching a pattern
void findFilesInDir(tStringList &fileList, tString dir, tString pattern);
void getSupportedImageFormats(tStringList &formats);
@@ -50,10 +50,11 @@ public:
void addMeshLoaders(cMeshLoaderHandler *ml);
void addVideoLoaders(cVideoManager *vm);
+
private:
iLowLevelGraphics *_lowLevelGraphics;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELRESOURCES_H
diff --git a/engines/hpl1/engine/scene/AnimationState.h b/engines/hpl1/engine/scene/AnimationState.h
index 4097afecaad..145970a1efa 100644
--- a/engines/hpl1/engine/scene/AnimationState.h
+++ b/engines/hpl1/engine/scene/AnimationState.h
@@ -185,6 +185,6 @@ private:
float mfFadeStep;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ANIMATION_STATE_H
diff --git a/engines/hpl1/engine/scene/Area2D.h b/engines/hpl1/engine/scene/Area2D.h
index bf573751b05..012add41dee 100644
--- a/engines/hpl1/engine/scene/Area2D.h
+++ b/engines/hpl1/engine/scene/Area2D.h
@@ -63,6 +63,6 @@ private:
cVector3f mvCustom;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_AREA2D_H
diff --git a/engines/hpl1/engine/scene/Camera.h b/engines/hpl1/engine/scene/Camera.h
index 0aaedc77fae..eee83603636 100644
--- a/engines/hpl1/engine/scene/Camera.h
+++ b/engines/hpl1/engine/scene/Camera.h
@@ -50,6 +50,6 @@ public:
virtual eCameraType GetType() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CAMERA_H
diff --git a/engines/hpl1/engine/scene/Camera2D.h b/engines/hpl1/engine/scene/Camera2D.h
index 2bd4b424d80..9cd87d5173f 100644
--- a/engines/hpl1/engine/scene/Camera2D.h
+++ b/engines/hpl1/engine/scene/Camera2D.h
@@ -72,6 +72,6 @@ private:
cVector2l mvClipArea;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CAMERA2D_H
diff --git a/engines/hpl1/engine/scene/Camera3D.h b/engines/hpl1/engine/scene/Camera3D.h
index a275e49e5c0..cb4fc82a19c 100644
--- a/engines/hpl1/engine/scene/Camera3D.h
+++ b/engines/hpl1/engine/scene/Camera3D.h
@@ -238,6 +238,6 @@ private:
bool mbMoveUpdated;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CAMERA3D_H
diff --git a/engines/hpl1/engine/scene/ColliderEntity.h b/engines/hpl1/engine/scene/ColliderEntity.h
index 2fb64394b7d..7b7fab512a0 100644
--- a/engines/hpl1/engine/scene/ColliderEntity.h
+++ b/engines/hpl1/engine/scene/ColliderEntity.h
@@ -68,6 +68,6 @@ private:
//-----------------------------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_COLLIDER_ENTITY_H
diff --git a/engines/hpl1/engine/scene/Entity.h b/engines/hpl1/engine/scene/Entity.h
index 41f937cfd9c..f175a00dc5d 100644
--- a/engines/hpl1/engine/scene/Entity.h
+++ b/engines/hpl1/engine/scene/Entity.h
@@ -91,6 +91,6 @@ typedef tEntityList::iterator tEntityListIt;
typedef cSTLIterator<iEntity *, tEntityList, tEntityListIt> cEntityIterator;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ENTITY2D_H
diff --git a/engines/hpl1/engine/scene/Entity2D.h b/engines/hpl1/engine/scene/Entity2D.h
index e02e17b9203..8dc9e5d006f 100644
--- a/engines/hpl1/engine/scene/Entity2D.h
+++ b/engines/hpl1/engine/scene/Entity2D.h
@@ -77,6 +77,6 @@ protected:
typedef Common::List<iEntity2D *> tEntity2DList;
typedef tEntity2DList::iterator tEntity2DListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ENTITY2D_H
diff --git a/engines/hpl1/engine/scene/Entity3D.h b/engines/hpl1/engine/scene/Entity3D.h
index 4d6188ce928..4146d32de05 100644
--- a/engines/hpl1/engine/scene/Entity3D.h
+++ b/engines/hpl1/engine/scene/Entity3D.h
@@ -33,8 +33,8 @@
#include "hpl1/engine/system/Container.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "hpl1/engine/math/BoundingVolume.h"
#include "common/list.h"
+#include "hpl1/engine/math/BoundingVolume.h"
namespace hpl {
@@ -168,6 +168,6 @@ private:
void UpdateWorldTransform();
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_ENTITY3D_H
diff --git a/engines/hpl1/engine/scene/GridMap2D.cpp b/engines/hpl1/engine/scene/GridMap2D.cpp
index 7d75dce28cf..a700a6af8fc 100644
--- a/engines/hpl1/engine/scene/GridMap2D.cpp
+++ b/engines/hpl1/engine/scene/GridMap2D.cpp
@@ -213,7 +213,7 @@ iEntity2D *cGridMap2DRectIt::Next() {
//-----------------------------------------------------------------------
void cGridMap2DRectIt::GetGridObject() {
- //bool bEnd = false;
+ // bool bEnd = false;
switch (mlType) {
//// GLOBAL OBJECTS //////////////////
diff --git a/engines/hpl1/engine/scene/GridMap2D.h b/engines/hpl1/engine/scene/GridMap2D.h
index 2c12015141a..326440816d9 100644
--- a/engines/hpl1/engine/scene/GridMap2D.h
+++ b/engines/hpl1/engine/scene/GridMap2D.h
@@ -28,9 +28,9 @@
#ifndef HPL_GRIDMAP2D_H
#define HPL_GRIDMAP2D_H
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
-#include "common/array.h"
#include "hpl1/std/map.h"
namespace hpl {
@@ -197,6 +197,6 @@ private:
cVector2l mvMaxGridSpan;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_GRIDMAP2D_H
diff --git a/engines/hpl1/engine/scene/ImageEntity.cpp b/engines/hpl1/engine/scene/ImageEntity.cpp
index c84120c6fb1..fba5cbe1098 100644
--- a/engines/hpl1/engine/scene/ImageEntity.cpp
+++ b/engines/hpl1/engine/scene/ImageEntity.cpp
@@ -35,8 +35,8 @@
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/resources/ImageEntityManager.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/scene/ImageEntity.h b/engines/hpl1/engine/scene/ImageEntity.h
index ec7d801868c..4d79a43214d 100644
--- a/engines/hpl1/engine/scene/ImageEntity.h
+++ b/engines/hpl1/engine/scene/ImageEntity.h
@@ -28,9 +28,9 @@
#ifndef HPL_IMAGE_ENTITY_H
#define HPL_IMAGE_ENTITY_H
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/scene/Entity2D.h"
-#include "common/array.h"
class TiXmlElement;
@@ -135,6 +135,6 @@ private:
typedef Common::Array<cImageEntity *> tImageEntityVec;
typedef tImageEntityVec::iterator tImageEntityVecIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_IMAGE_ENTITY_H
diff --git a/engines/hpl1/engine/scene/Light.h b/engines/hpl1/engine/scene/Light.h
index 7c928359a33..b43a7a783b1 100644
--- a/engines/hpl1/engine/scene/Light.h
+++ b/engines/hpl1/engine/scene/Light.h
@@ -154,6 +154,6 @@ protected:
float mfFlickerStateLength;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHT_H
diff --git a/engines/hpl1/engine/scene/Light2D.h b/engines/hpl1/engine/scene/Light2D.h
index b898b8a7d0d..dec613016d3 100644
--- a/engines/hpl1/engine/scene/Light2D.h
+++ b/engines/hpl1/engine/scene/Light2D.h
@@ -28,10 +28,10 @@
#ifndef HPL_LIGHT2D_H
#define HPL_LIGHT2D_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/scene/Entity2D.h"
#include "hpl1/engine/scene/Light.h"
-#include "common/list.h"
namespace hpl {
@@ -59,6 +59,6 @@ protected:
typedef Common::List<iLight2D *> tLightList;
typedef tLightList::iterator tLightListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHT2D_H
diff --git a/engines/hpl1/engine/scene/Light2DPoint.h b/engines/hpl1/engine/scene/Light2DPoint.h
index 8ed6f52ca11..9d0cdd980c7 100644
--- a/engines/hpl1/engine/scene/Light2DPoint.h
+++ b/engines/hpl1/engine/scene/Light2DPoint.h
@@ -43,6 +43,6 @@ public:
int Render(iLowLevelGraphics *apLowLevel, int alFirstIndex);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHTPOINT2D_H
diff --git a/engines/hpl1/engine/scene/Light3D.cpp b/engines/hpl1/engine/scene/Light3D.cpp
index 06bc3109597..e0c9d613071 100644
--- a/engines/hpl1/engine/scene/Light3D.cpp
+++ b/engines/hpl1/engine/scene/Light3D.cpp
@@ -756,8 +756,8 @@ void iLight3D::RenderShadow(iRenderable *apObject, cRenderSettings *apRenderSett
if (pModelMtx || apRenderSettings->mbMatrixWasNULL == false) {
apRenderSettings->extrudeProgram->SetVec3f("lightPosition", vLocalLight);
apRenderSettings->extrudeProgram->SetMatrixf("worldViewProj",
- eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrix_ViewProjection,
+ eGpuProgramMatrixOp_Identity);
// If a null matrix has been set, let other passes know.
if (pModelMtx)
@@ -822,8 +822,8 @@ void iLight3D::RenderShadow(iRenderable *apObject, cRenderSettings *apRenderSett
void iLight3D::OnFlickerOff() {
// Particle system
if (msFlickerOffPS != "") {
- /*cParticleSystem3D *pPS = */mpWorld3D->CreateParticleSystem(GetName() + "_PS",
- msFlickerOffPS, cVector3f(1, 1, 1), GetWorldMatrix());
+ /*cParticleSystem3D *pPS = */ mpWorld3D->CreateParticleSystem(GetName() + "_PS",
+ msFlickerOffPS, cVector3f(1, 1, 1), GetWorldMatrix());
}
}
@@ -832,8 +832,8 @@ void iLight3D::OnFlickerOff() {
void iLight3D::OnFlickerOn() {
// Particle system
if (msFlickerOnPS != "") {
- /*cParticleSystem3D *pPS = */mpWorld3D->CreateParticleSystem(GetName() + "_PS",
- msFlickerOnPS, cVector3f(1, 1, 1), GetWorldMatrix());
+ /*cParticleSystem3D *pPS = */ mpWorld3D->CreateParticleSystem(GetName() + "_PS",
+ msFlickerOnPS, cVector3f(1, 1, 1), GetWorldMatrix());
}
}
diff --git a/engines/hpl1/engine/scene/Light3D.h b/engines/hpl1/engine/scene/Light3D.h
index f390a05a06d..62f3e3a7735 100644
--- a/engines/hpl1/engine/scene/Light3D.h
+++ b/engines/hpl1/engine/scene/Light3D.h
@@ -28,11 +28,11 @@
#ifndef HPL_LIGHT3D_H
#define HPL_LIGHT3D_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/Renderable.h"
#include "hpl1/engine/scene/Entity3D.h"
#include "hpl1/engine/scene/Light.h"
-#include "common/list.h"
#include "hpl1/std/set.h"
class TiXmlElement;
@@ -223,6 +223,6 @@ protected:
typedef Common::List<iLight3D *> tLight3DList;
typedef tLight3DList::iterator tLight3DListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHT3D_H
diff --git a/engines/hpl1/engine/scene/Light3DPoint.h b/engines/hpl1/engine/scene/Light3DPoint.h
index a214cc9cf95..28b44a52837 100644
--- a/engines/hpl1/engine/scene/Light3DPoint.h
+++ b/engines/hpl1/engine/scene/Light3DPoint.h
@@ -48,7 +48,7 @@ class cLight3DPoint : public iLight3D {
public:
cLight3DPoint(tString asName, cResources *apResources);
- virtual ~cLight3DPoint() = default;
+ virtual ~cLight3DPoint() = default;
// SaveObject implementation
virtual iSaveData *CreateSaveData();
@@ -62,6 +62,6 @@ private:
bool CreateClipRect(cRect2l &aCliprect, cRenderSettings *apRenderSettings, iLowLevelGraphics *apLowLevelGraphics);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHT3D_POINT_H
diff --git a/engines/hpl1/engine/scene/Light3DSpot.cpp b/engines/hpl1/engine/scene/Light3DSpot.cpp
index 681958ff6a7..f296b9aa1b1 100644
--- a/engines/hpl1/engine/scene/Light3DSpot.cpp
+++ b/engines/hpl1/engine/scene/Light3DSpot.cpp
@@ -46,9 +46,9 @@
namespace hpl {
static constexpr cMatrixf g_mtxTextureUnitFix(0.5f, 0, 0, 0.5f,
- 0, -0.5f, 0, 0.5f,
- 0, 0, 0.5f, 0.5f,
- 0, 0, 0, 1.0f);
+ 0, -0.5f, 0, 0.5f,
+ 0, 0, 0.5f, 0.5f,
+ 0, 0, 0, 1.0f);
//////////////////////////////////////////////////////////////////////////
// CONSTRUCTORS
diff --git a/engines/hpl1/engine/scene/Light3DSpot.h b/engines/hpl1/engine/scene/Light3DSpot.h
index 931e9add575..52c94c27759 100644
--- a/engines/hpl1/engine/scene/Light3DSpot.h
+++ b/engines/hpl1/engine/scene/Light3DSpot.h
@@ -123,6 +123,6 @@ private:
int mlFrustumMatrixCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LIGHT3D_SPOT_H
diff --git a/engines/hpl1/engine/scene/MeshEntity.cpp b/engines/hpl1/engine/scene/MeshEntity.cpp
index d228d1b65c9..86e46af7741 100644
--- a/engines/hpl1/engine/scene/MeshEntity.cpp
+++ b/engines/hpl1/engine/scene/MeshEntity.cpp
@@ -234,7 +234,7 @@ cMeshEntity::cMeshEntity(const tString asName, cMesh *apMesh, cMaterialManager *
// Set the sub entity with the mesh node world matrix
cSubMeshEntity *pSubEntity = GetSubMeshEntityName(pMeshNode->GetSource());
if (pSubEntity) {
- /*cSubMesh *pSubMesh = */pSubEntity->GetSubMesh();
+ /*cSubMesh *pSubMesh = */ pSubEntity->GetSubMesh();
cMatrixf mtxSub = pMeshNode->GetWorldMatrix();
pSubEntity->SetMatrix(mtxSub);
@@ -352,8 +352,8 @@ cMeshEntity::cMeshEntity(const tString asName, cMesh *apMesh, cMaterialManager *
cMeshEntity::~cMeshEntity() {
for (tEntity3DListIt it = mlstAttachedEntities.begin(); it != mlstAttachedEntities.end(); ++it) {
- //iEntity3D *pEntity = *it;
- // TODO: if(mpWorld) mpWorld->DestroyUnkownEntity(pEntity);
+ // iEntity3D *pEntity = *it;
+ // TODO: if(mpWorld) mpWorld->DestroyUnkownEntity(pEntity);
}
for (int i = 0; i < (int)mvSubMeshes.size(); i++) {
@@ -920,7 +920,7 @@ void cMeshEntity::FadeSkeletonPhysicsWeight(float afTime) {
for (int bone = 0; bone < GetBoneStateNum(); ++bone) {
cBoneState *pState = GetBoneState(bone);
iPhysicsBody *pBody = pState->GetBody();
- /*iPhysicsBody *pColliderBody = */pState->GetColliderBody();
+ /*iPhysicsBody *pColliderBody = */ pState->GetColliderBody();
if (pBody)
pBody->SetActive(false);
@@ -1413,8 +1413,8 @@ kBeginSerialize(cSaveData_cMeshEntity, cSaveData_iRenderable)
cResources *pResources = apGame->GetResources();
cWorld3D *pWorld = apGame->GetScene()->GetWorld3D();
- /*cMeshLoaderHandler *pMeshLoadHandler = */pResources->GetMeshLoaderHandler();
- /*cFileSearcher *pFileSearcher = */pResources->GetFileSearcher();
+ /*cMeshLoaderHandler *pMeshLoadHandler = */ pResources->GetMeshLoaderHandler();
+ /*cFileSearcher *pFileSearcher = */ pResources->GetFileSearcher();
///////////////////////////////////
// Load mesh
diff --git a/engines/hpl1/engine/scene/MeshEntity.h b/engines/hpl1/engine/scene/MeshEntity.h
index 73b11020ae1..904b76e434f 100644
--- a/engines/hpl1/engine/scene/MeshEntity.h
+++ b/engines/hpl1/engine/scene/MeshEntity.h
@@ -37,8 +37,8 @@
#include "hpl1/engine/scene/SubMeshEntity.h"
-#include "hpl1/engine/scene/AnimationState.h"
#include "common/array.h"
+#include "hpl1/engine/scene/AnimationState.h"
#include "hpl1/std/map.h"
namespace hpl {
@@ -282,6 +282,6 @@ private:
//-----------------------------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MESH_ENTITY_H
diff --git a/engines/hpl1/engine/scene/MultiImageEntity.cpp b/engines/hpl1/engine/scene/MultiImageEntity.cpp
index 7f71be260c4..64a81fbe7d1 100644
--- a/engines/hpl1/engine/scene/MultiImageEntity.cpp
+++ b/engines/hpl1/engine/scene/MultiImageEntity.cpp
@@ -27,12 +27,12 @@
#include "hpl1/engine/scene/MultiImageEntity.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/scene/Node2D.h"
#include "hpl1/engine/scene/Scene.h"
#include "hpl1/engine/scene/World2D.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
-#include "hpl1/debug.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/scene/MultiImageEntity.h b/engines/hpl1/engine/scene/MultiImageEntity.h
index 4693c6beae6..e1f9a347a24 100644
--- a/engines/hpl1/engine/scene/MultiImageEntity.h
+++ b/engines/hpl1/engine/scene/MultiImageEntity.h
@@ -88,6 +88,6 @@ private:
bool mbFlipH;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MULTI_IMAGE_ENTITY_H
diff --git a/engines/hpl1/engine/scene/Node.h b/engines/hpl1/engine/scene/Node.h
index f877338cc04..e9924817f13 100644
--- a/engines/hpl1/engine/scene/Node.h
+++ b/engines/hpl1/engine/scene/Node.h
@@ -28,11 +28,11 @@
#ifndef HPL_NODE_H
#define HPL_NODE_H
+#include "common/list.h"
#include "hpl1/engine/game/SaveGame.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Entity.h"
#include "hpl1/engine/system/Container.h"
-#include "common/list.h"
namespace hpl {
@@ -85,6 +85,6 @@ protected:
bool mbActive;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_NODE_H
diff --git a/engines/hpl1/engine/scene/Node2D.h b/engines/hpl1/engine/scene/Node2D.h
index 062d2a416ec..2602465441f 100644
--- a/engines/hpl1/engine/scene/Node2D.h
+++ b/engines/hpl1/engine/scene/Node2D.h
@@ -28,9 +28,9 @@
#ifndef HPL_NODE2D_H
#define HPL_NODE2D_H
+#include "common/list.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Node.h"
-#include "common/list.h"
namespace hpl {
@@ -56,6 +56,6 @@ private:
cVector3f mvScale;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_NODE2D_H
diff --git a/engines/hpl1/engine/scene/Node3D.h b/engines/hpl1/engine/scene/Node3D.h
index ccc83f63917..c4719308b94 100644
--- a/engines/hpl1/engine/scene/Node3D.h
+++ b/engines/hpl1/engine/scene/Node3D.h
@@ -28,9 +28,9 @@
#ifndef HPL_NODE3D_H
#define HPL_NODE3D_H
+#include "common/list.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Node.h"
-#include "common/list.h"
namespace hpl {
@@ -123,6 +123,6 @@ private:
cNode3D *mpParent;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_NODE3D_H
diff --git a/engines/hpl1/engine/scene/NodeState.h b/engines/hpl1/engine/scene/NodeState.h
index e2dcade37e4..1335694a32f 100644
--- a/engines/hpl1/engine/scene/NodeState.h
+++ b/engines/hpl1/engine/scene/NodeState.h
@@ -42,6 +42,6 @@ public:
private:
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_NODE_STATE_H
diff --git a/engines/hpl1/engine/scene/PortalContainer.h b/engines/hpl1/engine/scene/PortalContainer.h
index 12846459c41..765ad64393c 100644
--- a/engines/hpl1/engine/scene/PortalContainer.h
+++ b/engines/hpl1/engine/scene/PortalContainer.h
@@ -28,10 +28,10 @@
#ifndef HPL_PORTAL_CONTAINER_H
#define HPL_PORTAL_CONTAINER_H
+#include "common/list.h"
#include "hpl1/engine/graphics/Renderable.h"
#include "hpl1/engine/math/BoundingVolume.h"
#include "hpl1/engine/scene/RenderableContainer.h"
-#include "common/list.h"
#include "hpl1/std/map.h"
#include "hpl1/std/set.h"
@@ -306,6 +306,6 @@ private:
int mlEntityIterateCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_PORTAL_CONTAINER_H
diff --git a/engines/hpl1/engine/scene/RenderableContainer.h b/engines/hpl1/engine/scene/RenderableContainer.h
index bd51d40708e..cd6ef415b19 100644
--- a/engines/hpl1/engine/scene/RenderableContainer.h
+++ b/engines/hpl1/engine/scene/RenderableContainer.h
@@ -68,6 +68,6 @@ public:
virtual void Compile() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // RENDERABLE_CONTAINER
diff --git a/engines/hpl1/engine/scene/Scene.h b/engines/hpl1/engine/scene/Scene.h
index 2cf65100129..4c9317791b3 100644
--- a/engines/hpl1/engine/scene/Scene.h
+++ b/engines/hpl1/engine/scene/Scene.h
@@ -34,8 +34,8 @@
#include "hpl1/engine/game/Updateable.h"
#include "hpl1/engine/scene/Camera3D.h"
-#include "hpl1/engine/resources/MeshLoader.h"
#include "common/list.h"
+#include "hpl1/engine/resources/MeshLoader.h"
namespace hpl {
@@ -160,6 +160,6 @@ private:
tStringSet m_setLoadedMaps;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SCENE_H
diff --git a/engines/hpl1/engine/scene/SectorVisibility.h b/engines/hpl1/engine/scene/SectorVisibility.h
index bd9c8942688..01a5e1372b1 100644
--- a/engines/hpl1/engine/scene/SectorVisibility.h
+++ b/engines/hpl1/engine/scene/SectorVisibility.h
@@ -160,7 +160,7 @@ private:
tString GetTabs();
- //cPortalContainer *mpContainer;
+ // cPortalContainer *mpContainer;
tSectorSet m_setStartSectors;
@@ -178,6 +178,6 @@ private:
//----------------------------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SECTOR_VISIBILTY_H
diff --git a/engines/hpl1/engine/scene/SoundEntity.cpp b/engines/hpl1/engine/scene/SoundEntity.cpp
index 311fc8c5320..c2bb557d1ea 100644
--- a/engines/hpl1/engine/scene/SoundEntity.cpp
+++ b/engines/hpl1/engine/scene/SoundEntity.cpp
@@ -43,12 +43,10 @@ namespace hpl {
tSoundEntityGlobalCallbackList *cSoundEntity::mlstGlobalCallbacks = nullptr;
-void cSoundEntity::initGlobalCallbackList()
-{
+void cSoundEntity::initGlobalCallbackList() {
cSoundEntity::mlstGlobalCallbacks = new tSoundEntityGlobalCallbackList;
}
-void cSoundEntity::finalizeGlobalCallbackList()
-{
+void cSoundEntity::finalizeGlobalCallbackList() {
delete cSoundEntity::mlstGlobalCallbacks;
}
diff --git a/engines/hpl1/engine/scene/SoundEntity.h b/engines/hpl1/engine/scene/SoundEntity.h
index 7f7a2c4b926..4ffd0b2319c 100644
--- a/engines/hpl1/engine/scene/SoundEntity.h
+++ b/engines/hpl1/engine/scene/SoundEntity.h
@@ -105,7 +105,7 @@ public:
bool IsStopped();
bool IsFadingOut();
- float getFadingSpeed() {return _fadeSpeed;}
+ float getFadingSpeed() { return _fadeSpeed; }
bool GetRemoveWhenOver();
void SetVolume(float afX) { mfVolume = afX; }
@@ -169,9 +169,9 @@ private:
float _fadeSpeed;
- static tSoundEntityGlobalCallbackList* mlstGlobalCallbacks;
+ static tSoundEntityGlobalCallbackList *mlstGlobalCallbacks;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_ENTITY_H
diff --git a/engines/hpl1/engine/scene/SoundSource.h b/engines/hpl1/engine/scene/SoundSource.h
index bc745edce3f..56e87478669 100644
--- a/engines/hpl1/engine/scene/SoundSource.h
+++ b/engines/hpl1/engine/scene/SoundSource.h
@@ -28,9 +28,9 @@
#ifndef HPL_SOUNDSOURCE_H
#define HPL_SOUNDSOURCE_H
+#include "common/list.h"
#include "hpl1/engine/scene/Entity2D.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
class TiXmlElement;
@@ -91,6 +91,6 @@ private:
typedef Common::List<cSoundSource *> tSoundSourceList;
typedef tSoundSourceList::iterator tSoundSourceListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUNDSOURCE_H
diff --git a/engines/hpl1/engine/scene/SubMeshEntity.h b/engines/hpl1/engine/scene/SubMeshEntity.h
index 16251e6c483..3f91e6a718c 100644
--- a/engines/hpl1/engine/scene/SubMeshEntity.h
+++ b/engines/hpl1/engine/scene/SubMeshEntity.h
@@ -28,6 +28,7 @@
#ifndef HPL_SUB_MESH_ENTITY_H
#define HPL_SUB_MESH_ENTITY_H
+#include "common/array.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/graphics/Renderable.h"
#include "hpl1/engine/math/MathTypes.h"
@@ -35,7 +36,6 @@
#include "hpl1/engine/scene/Entity3D.h"
#include "hpl1/engine/scene/SectorVisibility.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
#include "hpl1/std/map.h"
#include "hpl1/std/multimap.h"
@@ -180,6 +180,6 @@ typedef Common::Array<cSubMeshEntity *>::iterator tSubMeshEntityVecIt;
typedef Hpl1::Std::multimap<tString, cSubMeshEntity *> tSubMeshEntityMap;
typedef tSubMeshEntityMap::iterator tSubMeshEntityMapIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SUB_MESH_ENTITY_H
diff --git a/engines/hpl1/engine/scene/Tile.h b/engines/hpl1/engine/scene/Tile.h
index 717d8c0a359..74864221e43 100644
--- a/engines/hpl1/engine/scene/Tile.h
+++ b/engines/hpl1/engine/scene/Tile.h
@@ -28,11 +28,11 @@
#ifndef HPL_TILE_H
#define HPL_TILE_H
+#include "common/list.h"
#include "hpl1/engine/graphics/GraphicsTypes.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/TileData.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
namespace hpl {
@@ -75,6 +75,6 @@ private:
typedef Common::List<cTile *> tTileList;
typedef tTileList::iterator tTileListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILE_H
diff --git a/engines/hpl1/engine/scene/TileData.h b/engines/hpl1/engine/scene/TileData.h
index 13cc2236325..fbd2dcd6848 100644
--- a/engines/hpl1/engine/scene/TileData.h
+++ b/engines/hpl1/engine/scene/TileData.h
@@ -112,5 +112,5 @@ private:
void SetMaterial(iMaterial *apMaterial);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILEDATA_H
diff --git a/engines/hpl1/engine/scene/TileLayer.h b/engines/hpl1/engine/scene/TileLayer.h
index b3027ebf413..342aedf0db3 100644
--- a/engines/hpl1/engine/scene/TileLayer.h
+++ b/engines/hpl1/engine/scene/TileLayer.h
@@ -28,10 +28,10 @@
#ifndef HPL_TILELAYER_H
#define HPL_TILELAYER_H
+#include "common/array.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Tile.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
namespace hpl {
@@ -70,6 +70,6 @@ private:
eTileLayerType mType;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILELAYER_H
diff --git a/engines/hpl1/engine/scene/TileMap.h b/engines/hpl1/engine/scene/TileMap.h
index af9ceb30df0..1188f918d81 100644
--- a/engines/hpl1/engine/scene/TileMap.h
+++ b/engines/hpl1/engine/scene/TileMap.h
@@ -28,13 +28,13 @@
#ifndef HPL_TILEMAP_H
#define HPL_TILEMAP_H
+#include "common/array.h"
#include "hpl1/engine/graphics/Graphics.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/scene/Camera2D.h"
#include "hpl1/engine/scene/TileLayer.h"
#include "hpl1/engine/scene/TileMapIt.h"
#include "hpl1/engine/scene/TileSet.h"
-#include "common/array.h"
namespace hpl {
@@ -96,6 +96,6 @@ private:
inline void RenderTileData(cTile *apTile, int alLayer);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILEMAP_H
diff --git a/engines/hpl1/engine/scene/TileMapIt.h b/engines/hpl1/engine/scene/TileMapIt.h
index 72f2b519170..46e1caed936 100644
--- a/engines/hpl1/engine/scene/TileMapIt.h
+++ b/engines/hpl1/engine/scene/TileMapIt.h
@@ -43,6 +43,6 @@ public:
virtual int GetCurrentLayer() = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILEMAP_IT_H
diff --git a/engines/hpl1/engine/scene/TileMapLineIt.h b/engines/hpl1/engine/scene/TileMapLineIt.h
index be93dff89e1..811048ba3a1 100644
--- a/engines/hpl1/engine/scene/TileMapLineIt.h
+++ b/engines/hpl1/engine/scene/TileMapLineIt.h
@@ -78,6 +78,6 @@ private:
void GetXYIntersection(const cVector2f &avPosA, cVector2f *avXIntersect, cVector2f *avYIntersect);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILEMAP_LINE_IT_H
diff --git a/engines/hpl1/engine/scene/TileMapRectIt.h b/engines/hpl1/engine/scene/TileMapRectIt.h
index 67017ff3e54..47b07b35b4a 100644
--- a/engines/hpl1/engine/scene/TileMapRectIt.h
+++ b/engines/hpl1/engine/scene/TileMapRectIt.h
@@ -73,6 +73,6 @@ private:
void GetTile();
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILEMAP_RECT_IT_H
diff --git a/engines/hpl1/engine/scene/TileSet.h b/engines/hpl1/engine/scene/TileSet.h
index 0b34f686d00..65ee2ec881a 100644
--- a/engines/hpl1/engine/scene/TileSet.h
+++ b/engines/hpl1/engine/scene/TileSet.h
@@ -28,11 +28,11 @@
#ifndef HPL_TILESET_H
#define HPL_TILESET_H
+#include "common/array.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/resources/ResourceBase.h"
#include "hpl1/engine/scene/TileData.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/array.h"
class TiXmlElement;
@@ -74,6 +74,6 @@ private:
void GetTileNum(TiXmlElement *apElement);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_TILESET_H
diff --git a/engines/hpl1/engine/scene/World2D.cpp b/engines/hpl1/engine/scene/World2D.cpp
index 2d6c59d23f3..d2d3903e871 100644
--- a/engines/hpl1/engine/scene/World2D.cpp
+++ b/engines/hpl1/engine/scene/World2D.cpp
@@ -48,10 +48,10 @@
#include "hpl1/engine/scene/Node2D.h"
#include "hpl1/engine/scene/SoundSource.h"
#include "hpl1/engine/scene/TileMap.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/MemoryManager.h"
#include "hpl1/engine/system/Script.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/graphics/Renderer2D.h"
diff --git a/engines/hpl1/engine/scene/World2D.h b/engines/hpl1/engine/scene/World2D.h
index 4e85784bc10..ab52ab2a524 100644
--- a/engines/hpl1/engine/scene/World2D.h
+++ b/engines/hpl1/engine/scene/World2D.h
@@ -174,6 +174,6 @@ private:
int LoadTileData(cTile *apTile, tString *asData, int alStart);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WOLRD2D_H
diff --git a/engines/hpl1/engine/scene/World3D.cpp b/engines/hpl1/engine/scene/World3D.cpp
index ed94e05e508..0812c3eb4e6 100644
--- a/engines/hpl1/engine/scene/World3D.cpp
+++ b/engines/hpl1/engine/scene/World3D.cpp
@@ -29,9 +29,9 @@
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/Script.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/math/MathTypes.h"
diff --git a/engines/hpl1/engine/scene/World3D.h b/engines/hpl1/engine/scene/World3D.h
index f4865d5b008..9ebdefc68a1 100644
--- a/engines/hpl1/engine/scene/World3D.h
+++ b/engines/hpl1/engine/scene/World3D.h
@@ -366,6 +366,6 @@ private:
cColor mAmbientColor;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_WOLRD3D_H
diff --git a/engines/hpl1/engine/sound/LowLevelSound.h b/engines/hpl1/engine/sound/LowLevelSound.h
index 74d090f48e5..141608cc317 100644
--- a/engines/hpl1/engine/sound/LowLevelSound.h
+++ b/engines/hpl1/engine/sound/LowLevelSound.h
@@ -116,6 +116,6 @@ protected:
tSoundEnvList mlstSoundEnv;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELSOUND_H
diff --git a/engines/hpl1/engine/sound/MusicHandler.cpp b/engines/hpl1/engine/sound/MusicHandler.cpp
index 66b1f3396f8..18362cd16d4 100644
--- a/engines/hpl1/engine/sound/MusicHandler.cpp
+++ b/engines/hpl1/engine/sound/MusicHandler.cpp
@@ -26,15 +26,15 @@
*/
#include "hpl1/engine/sound/MusicHandler.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/math/Math.h"
#include "hpl1/engine/resources/Resources.h"
#include "hpl1/engine/resources/SoundManager.h"
#include "hpl1/engine/sound/LowLevelSound.h"
#include "hpl1/engine/sound/SoundChannel.h"
#include "hpl1/engine/sound/SoundData.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
-#include "hpl1/debug.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/sound/MusicHandler.h b/engines/hpl1/engine/sound/MusicHandler.h
index ab3aa4fb519..61ac7740ebd 100644
--- a/engines/hpl1/engine/sound/MusicHandler.h
+++ b/engines/hpl1/engine/sound/MusicHandler.h
@@ -28,8 +28,8 @@
#ifndef HPL_MUSICHANDLER_H
#define HPL_MUSICHANDLER_H
-#include "hpl1/engine/system/SystemTypes.h"
#include "common/list.h"
+#include "hpl1/engine/system/SystemTypes.h"
namespace hpl {
@@ -126,5 +126,5 @@ private:
bool LoadAndStart(const tString &asFileName, cMusicEntry *apSong, float afVolume, bool abLoop);
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_MUSICHANDLER_H
diff --git a/engines/hpl1/engine/sound/Sound.h b/engines/hpl1/engine/sound/Sound.h
index 939e4043256..efb597f2fcd 100644
--- a/engines/hpl1/engine/sound/Sound.h
+++ b/engines/hpl1/engine/sound/Sound.h
@@ -60,5 +60,5 @@ private:
cMusicHandler *mpMusicHandler;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_H
diff --git a/engines/hpl1/engine/sound/SoundChannel.h b/engines/hpl1/engine/sound/SoundChannel.h
index 3f4f86ab7d6..0050e6f7526 100644
--- a/engines/hpl1/engine/sound/SoundChannel.h
+++ b/engines/hpl1/engine/sound/SoundChannel.h
@@ -28,8 +28,8 @@
#ifndef HPL_SOUND_CHANNEL_H
#define HPL_SOUND_CHANNEL_H
-#include "hpl1/engine/math/MathTypes.h"
#include "common/list.h"
+#include "hpl1/engine/math/MathTypes.h"
namespace hpl {
class iSoundData;
@@ -184,6 +184,6 @@ protected:
typedef Common::List<iSoundChannel *> tSoundChannelList;
typedef tSoundChannelList::iterator tSoundChannelListIt;
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_CHANNEL_H
diff --git a/engines/hpl1/engine/sound/SoundData.h b/engines/hpl1/engine/sound/SoundData.h
index 3c5797aabff..06496f04740 100644
--- a/engines/hpl1/engine/sound/SoundData.h
+++ b/engines/hpl1/engine/sound/SoundData.h
@@ -65,6 +65,6 @@ protected:
cSoundManager *mpSoundManger;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_DATA_H
diff --git a/engines/hpl1/engine/sound/SoundEntityData.cpp b/engines/hpl1/engine/sound/SoundEntityData.cpp
index 1c66eab45e3..27d9192ed46 100644
--- a/engines/hpl1/engine/sound/SoundEntityData.cpp
+++ b/engines/hpl1/engine/sound/SoundEntityData.cpp
@@ -28,8 +28,8 @@
#include "hpl1/engine/sound/SoundEntityData.h"
#include "hpl1/engine/resources/Resources.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
diff --git a/engines/hpl1/engine/sound/SoundEntityData.h b/engines/hpl1/engine/sound/SoundEntityData.h
index e021e45c6ea..e2a5ee7e47c 100644
--- a/engines/hpl1/engine/sound/SoundEntityData.h
+++ b/engines/hpl1/engine/sound/SoundEntityData.h
@@ -111,6 +111,6 @@ protected:
int mlPriority;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUND_DATA_H
diff --git a/engines/hpl1/engine/sound/SoundHandler.cpp b/engines/hpl1/engine/sound/SoundHandler.cpp
index a5e8d26f6e2..b1b03894ea8 100644
--- a/engines/hpl1/engine/sound/SoundHandler.cpp
+++ b/engines/hpl1/engine/sound/SoundHandler.cpp
@@ -32,8 +32,8 @@
#include "hpl1/engine/sound/LowLevelSound.h"
#include "hpl1/engine/sound/SoundChannel.h"
#include "hpl1/engine/sound/SoundData.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/physics/PhysicsBody.h"
#include "hpl1/engine/physics/PhysicsWorld.h"
@@ -732,7 +732,7 @@ void cSoundHandler::UpdateDistanceVolume3D(cSoundEntry *apEntry, float afTimeSte
// Log(" max distance ");
} else {
float fVolume = 0;
- //bool bBlocked = false;
+ // bool bBlocked = false;
////////////////////////////////////////
// Check if sound is blocked.
@@ -759,7 +759,7 @@ void cSoundHandler::UpdateDistanceVolume3D(cSoundEntry *apEntry, float afTimeSte
}
pSound->SetFiltering(true, 0xF);
- //bBlocked = true;
+ // bBlocked = true;
} else {
// pSound->SetFiltering(false, 0xF);
diff --git a/engines/hpl1/engine/sound/SoundHandler.h b/engines/hpl1/engine/sound/SoundHandler.h
index e9a2ed8b4e1..06a3d53499b 100644
--- a/engines/hpl1/engine/sound/SoundHandler.h
+++ b/engines/hpl1/engine/sound/SoundHandler.h
@@ -28,10 +28,10 @@
#ifndef HPL_SOUNDHANDLER_H
#define HPL_SOUNDHANDLER_H
+#include "common/list.h"
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/physics/PhysicsWorld.h"
#include "hpl1/engine/system/SystemTypes.h"
-#include "common/list.h"
namespace hpl {
@@ -59,7 +59,7 @@ public:
private:
bool mbHasCollided;
- //int mlCount;
+ // int mlCount;
};
//----------------------------------------
@@ -205,6 +205,6 @@ private:
int mlIdCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SOUNDHANDLER_H
diff --git a/engines/hpl1/engine/system/BinTree.h b/engines/hpl1/engine/system/BinTree.h
index 18f07fc197a..a7ccec1ed43 100644
--- a/engines/hpl1/engine/system/BinTree.h
+++ b/engines/hpl1/engine/system/BinTree.h
@@ -226,6 +226,6 @@ private:
}
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_BINTREE_H
diff --git a/engines/hpl1/engine/system/Container.h b/engines/hpl1/engine/system/Container.h
index fc3a1f772c8..e9e19e78b17 100644
--- a/engines/hpl1/engine/system/Container.h
+++ b/engines/hpl1/engine/system/Container.h
@@ -28,12 +28,11 @@
#ifndef HPL_CONTAINER_H
#define HPL_CONTAINER_H
-#include "hpl1/engine/system/MemoryManager.h"
-#include "common/list.h"
#include "common/array.h"
+#include "common/list.h"
+#include "hpl1/engine/system/MemoryManager.h"
#include "hpl1/std/map.h"
-
namespace hpl {
//---------------------------------
@@ -260,6 +259,6 @@ public:
//---------------------------------
-} // namespace hpl
+} // namespace hpl
#endif // HPL_CONTAINER_H
diff --git a/engines/hpl1/engine/system/LogicTimer.h b/engines/hpl1/engine/system/LogicTimer.h
index 8c278057aba..42e4f8cc432 100644
--- a/engines/hpl1/engine/system/LogicTimer.h
+++ b/engines/hpl1/engine/system/LogicTimer.h
@@ -91,6 +91,6 @@ private:
LowLevelSystem *mpLowLevelSystem;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOGICTIMER_H
diff --git a/engines/hpl1/engine/system/MemoryManager.h b/engines/hpl1/engine/system/MemoryManager.h
index 30f41fff808..f2984a1ce65 100644
--- a/engines/hpl1/engine/system/MemoryManager.h
+++ b/engines/hpl1/engine/system/MemoryManager.h
@@ -28,8 +28,8 @@
#ifndef HPL_MEMORY_MANAGER_H
#define HPL_MEMORY_MANAGER_H
-#include "hpl1/std/map.h"
#include "common/str.h"
+#include "hpl1/std/map.h"
#define hplNew(classType, constructor) \
new classType constructor
diff --git a/engines/hpl1/engine/system/Script.h b/engines/hpl1/engine/system/Script.h
index 6c35ae839cc..2edc3c54c8d 100644
--- a/engines/hpl1/engine/system/Script.h
+++ b/engines/hpl1/engine/system/Script.h
@@ -221,7 +221,7 @@
#define AS_MAX_PORTABILITY
#if defined(AS_MAX_PORTABILITY)
#define SCRIPT_REGISTER_FUNC(funcname) \
- Common::String(GenericScript::funcname##_return) + " " + Common::String(#funcname) + " (" + Common::String(GenericScript::funcname##_arg) + ")", GenericScript::funcname##_Generic, asCALL_GENERIC
+ Common::String(GenericScript::funcname##_return) + " " + Common::String(#funcname) + " (" + Common::String(GenericScript::funcname##_arg) + ")", GenericScript::funcname##_Generic, asCALL_GENERIC
#else
#define SCRIPT_REGISTER_FUNC(funcname) \
GenericScript::funcname##_return + " " #funcname " (" + GenericScript::funcname##_arg + ")", (void *)funcname, asCALL_STDCALL
@@ -254,6 +254,6 @@ public:
virtual bool Run(int alHandle) = 0;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SCRIPT_H
diff --git a/engines/hpl1/engine/system/SerializeClass.cpp b/engines/hpl1/engine/system/SerializeClass.cpp
index d226df45639..9c8fbd346c1 100644
--- a/engines/hpl1/engine/system/SerializeClass.cpp
+++ b/engines/hpl1/engine/system/SerializeClass.cpp
@@ -35,10 +35,10 @@
#include "hpl1/engine/math/MathTypes.h"
#include "hpl1/engine/system/Container.h"
+#include "common/savefile.h"
+#include "hpl1/debug.h"
#include "hpl1/engine/impl/tinyXML/tinyxml.h"
#include "hpl1/hpl1.h"
-#include "hpl1/debug.h"
-#include "common/savefile.h"
#include "hpl1/serialize.h"
namespace hpl {
@@ -108,12 +108,10 @@ tSerializeSavedClassMap *cSerializeClass::m_mapSavedClasses;
bool cSerializeClass::mbDataSetup = false;
char cSerializeClass::msTempCharArray[2048];
-void cSerializeClass::initSaveClassesMap()
-{
+void cSerializeClass::initSaveClassesMap() {
cSerializeClass::m_mapSavedClasses = new tSerializeSavedClassMap;
}
-void cSerializeClass::finalizeSaveClassesMap()
-{
+void cSerializeClass::finalizeSaveClassesMap() {
delete cSerializeClass::m_mapSavedClasses;
}
@@ -125,7 +123,7 @@ void cSerializeClass::finalizeSaveClassesMap()
static bool gbLog = false;
static int glTabs = 0;
-static const char* gsTabString = "";
+static const char *gsTabString = "";
const char *GetTabs() {
return gsTabString;
@@ -260,8 +258,8 @@ bool cSerializeClass::LoadFromFile(iSerializable *apData, const tWString &asFile
g_engine->setTotalPlayTime(header.playtime);
if (pXmlDoc.LoadFile(*saveFile) == false) {
Hpl1::logError(Hpl1::kDebugResourceLoading | Hpl1::kDebugSaves,
- "Couldn't load saved class file '%S' from %s!\n", asFile.c_str(),
- pXmlDoc.ErrorDesc());
+ "Couldn't load saved class file '%S' from %s!\n", asFile.c_str(),
+ pXmlDoc.ErrorDesc());
return false;
}
@@ -414,13 +412,13 @@ tString cSerializeClass::ValueToString(void *apData, size_t alOffset, eSerialize
case eSerializeType_Matrixf: {
cMatrixf &Mtx = PointerValue(pVal, cMatrixf);
snprintf(msTempCharArray, 2048, "%f %f %f %f "
- "%f %f %f %f "
- "%f %f %f %f "
- "%f %f %f %f",
- Mtx.m[0][0], Mtx.m[0][1], Mtx.m[0][2], Mtx.m[0][3],
- Mtx.m[1][0], Mtx.m[1][1], Mtx.m[1][2], Mtx.m[1][3],
- Mtx.m[2][0], Mtx.m[2][1], Mtx.m[2][2], Mtx.m[2][3],
- Mtx.m[3][0], Mtx.m[3][1], Mtx.m[3][2], Mtx.m[3][3]);
+ "%f %f %f %f "
+ "%f %f %f %f "
+ "%f %f %f %f",
+ Mtx.m[0][0], Mtx.m[0][1], Mtx.m[0][2], Mtx.m[0][3],
+ Mtx.m[1][0], Mtx.m[1][1], Mtx.m[1][2], Mtx.m[1][3],
+ Mtx.m[2][0], Mtx.m[2][1], Mtx.m[2][2], Mtx.m[2][3],
+ Mtx.m[3][0], Mtx.m[3][1], Mtx.m[3][2], Mtx.m[3][3]);
return msTempCharArray;
break;
}
@@ -767,7 +765,7 @@ void cSerializeClass::LoadArray(TiXmlElement *apElement, iSerializable *apData,
tString sName = cString::ToString(apElement->Attribute("name"), "");
tString sClassType = cString::ToString(apElement->Attribute("class_type"), "");
eSerializeType type = cString::ToInt(apElement->Attribute("type"), eSerializeMainType_NULL);
- //size_t lSize = cString::ToInt(apElement->Attribute("size"), 0);
+ // size_t lSize = cString::ToInt(apElement->Attribute("size"), 0);
if (gbLog) {
Log("%s Begin Saving array: '%s' classtype: %s type %d\n", GetTabs(), sName.c_str(), sClassType.c_str(), type);
diff --git a/engines/hpl1/engine/system/SerializeClass.h b/engines/hpl1/engine/system/SerializeClass.h
index 27438800d40..b69ed4de741 100644
--- a/engines/hpl1/engine/system/SerializeClass.h
+++ b/engines/hpl1/engine/system/SerializeClass.h
@@ -102,66 +102,66 @@ typedef unsigned int eSerializeMainType;
/**
* This inits a class and must be first in a serializable class
*/
-#define kSerializableClassInit(aClass) \
-public: \
- const static char *msSerialize_Name; \
- const static char *msSerialize_ParentName; \
+#define kSerializableClassInit(aClass) \
+public: \
+ const static char *msSerialize_Name; \
+ const static char *msSerialize_ParentName; \
static cSerializeMemberField *mpSerialize_MemberFields; \
- virtual ~aClass() = default; \
+ virtual ~aClass() = default; \
virtual tString Serialize_GetTopClass() { return #aClass; }
-#define kSerializableClassInit_nodestructor(aClass) \
-public: \
- const static char *msSerialize_Name; \
- const static char *msSerialize_ParentName; \
- static cSerializeMemberField *mpSerialize_MemberFields; \
+#define kSerializableClassInit_nodestructor(aClass) \
+public: \
+ const static char *msSerialize_Name; \
+ const static char *msSerialize_ParentName; \
+ static cSerializeMemberField *mpSerialize_MemberFields; \
virtual tString Serialize_GetTopClass() { return #aClass; }
/**
* Declared in the cpp-file of the class to be serialized. Class must have parent!
*/
-#define kBeginSerialize(aClass, aParent) \
- namespace SerializeNamespace_##aClass { \
- extern cSerializeMemberField mvTempMemberFields[]; \
- } \
- const char *aClass::msSerialize_Name = #aClass; \
- const char *aClass::msSerialize_ParentName = #aParent; \
- cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
- namespace SerializeNamespace_##aClass { \
- typedef aClass tVarClass; \
+#define kBeginSerialize(aClass, aParent) \
+ namespace SerializeNamespace_##aClass { \
+ extern cSerializeMemberField mvTempMemberFields[]; \
+ } \
+ const char *aClass::msSerialize_Name = #aClass; \
+ const char *aClass::msSerialize_ParentName = #aParent; \
+ cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
+ namespace SerializeNamespace_##aClass { \
+ typedef aClass tVarClass; \
cSerializeMemberField mvTempMemberFields[] = {
-#define kBeginSerializeBase(aClass) \
- namespace SerializeNamespace_##aClass { \
- extern cSerializeMemberField mvTempMemberFields[]; \
- } \
- const char *aClass::msSerialize_Name = #aClass; \
- const char *aClass::msSerialize_ParentName = ""; \
- cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
- namespace SerializeNamespace_##aClass { \
- typedef aClass tVarClass; \
+#define kBeginSerializeBase(aClass) \
+ namespace SerializeNamespace_##aClass { \
+ extern cSerializeMemberField mvTempMemberFields[]; \
+ } \
+ const char *aClass::msSerialize_Name = #aClass; \
+ const char *aClass::msSerialize_ParentName = ""; \
+ cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
+ namespace SerializeNamespace_##aClass { \
+ typedef aClass tVarClass; \
cSerializeMemberField mvTempMemberFields[] = {
-#define kBeginSerializeVirtual(aClass, aParent) \
- namespace SerializeNamespace_##aClass { \
- extern cSerializeMemberField mvTempMemberFields[]; \
- } \
- const char *aClass::msSerialize_Name = #aClass; \
- const char *aClass::msSerialize_ParentName = #aParent; \
- cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
- namespace SerializeNamespace_##aClass { \
- typedef aClass tVarClass; \
+#define kBeginSerializeVirtual(aClass, aParent) \
+ namespace SerializeNamespace_##aClass { \
+ extern cSerializeMemberField mvTempMemberFields[]; \
+ } \
+ const char *aClass::msSerialize_Name = #aClass; \
+ const char *aClass::msSerialize_ParentName = #aParent; \
+ cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
+ namespace SerializeNamespace_##aClass { \
+ typedef aClass tVarClass; \
cSerializeMemberField mvTempMemberFields[] = {
-#define kBeginSerializeBaseVirtual(aClass) \
- namespace SerializeNamespace_##aClass { \
- extern cSerializeMemberField mvTempMemberFields[]; \
- } \
- const char *aClass::msSerialize_Name = #aClass; \
- const char *aClass::msSerialize_ParentName = ""; \
- cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
- namespace SerializeNamespace_##aClass { \
- typedef aClass tVarClass; \
+#define kBeginSerializeBaseVirtual(aClass) \
+ namespace SerializeNamespace_##aClass { \
+ extern cSerializeMemberField mvTempMemberFields[]; \
+ } \
+ const char *aClass::msSerialize_Name = #aClass; \
+ const char *aClass::msSerialize_ParentName = ""; \
+ cSerializeMemberField *aClass::mpSerialize_MemberFields = SerializeNamespace_##aClass::mvTempMemberFields; \
+ namespace SerializeNamespace_##aClass { \
+ typedef aClass tVarClass; \
cSerializeMemberField mvTempMemberFields[] = {
/**
@@ -205,15 +205,15 @@ public: \
class cSerializeMemberField {
public:
constexpr cSerializeMemberField(Hpl1::StaticString asName, size_t alOffset, size_t alSize, eSerializeType alType,
- eSerializeMainType aMainType) : msName(asName), msClassName(""), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(0) {
+ eSerializeMainType aMainType) : msName(asName), msClassName(""), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(0) {
}
constexpr cSerializeMemberField(Hpl1::StaticString asName, size_t alOffset, size_t alSize, eSerializeType alType,
- eSerializeMainType aMainType, size_t alArraySize) : msName(asName), msClassName(""), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(alArraySize) {
+ eSerializeMainType aMainType, size_t alArraySize) : msName(asName), msClassName(""), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(alArraySize) {
}
constexpr cSerializeMemberField(Hpl1::StaticString asName, size_t alOffset, size_t alSize, eSerializeType alType,
- eSerializeMainType aMainType, Hpl1::StaticString asClassName) : msName(asName), msClassName(asClassName), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(0) {
+ eSerializeMainType aMainType, Hpl1::StaticString asClassName) : msName(asName), msClassName(asClassName), mlOffset(alOffset), mlSize(alSize), mType(alType), mMainType(aMainType), mlArraySize(0) {
}
Hpl1::StaticString msName;
@@ -248,17 +248,15 @@ struct cSerializeSavedClass {
public:
constexpr cSerializeSavedClass() = default;
constexpr cSerializeSavedClass(const char *asName, const char *asParent,
- cSerializeMemberField *apMemberFields, size_t alSize,
- iSerializable *(*apCreateFunc)()) : msName(asName), msParentName(asParent), mpMemberFields(apMemberFields),
- mlSize(alSize), mpCreateFunc(apCreateFunc)
- {}
+ cSerializeMemberField *apMemberFields, size_t alSize,
+ iSerializable *(*apCreateFunc)()) : msName(asName), msParentName(asParent), mpMemberFields(apMemberFields),
+ mlSize(alSize), mpCreateFunc(apCreateFunc) {}
const char *msName = "";
const char *msParentName = "";
cSerializeMemberField *mpMemberFields = nullptr;
size_t mlSize = 0;
iSerializable *(*mpCreateFunc)() = nullptr;
-
};
//-------------------------------------------------
diff --git a/engines/hpl1/engine/system/String.cpp b/engines/hpl1/engine/system/String.cpp
index 940e206b8fd..2124d73716b 100644
--- a/engines/hpl1/engine/system/String.cpp
+++ b/engines/hpl1/engine/system/String.cpp
@@ -232,7 +232,7 @@ tString cString::ReplaceCharTo(tString aString, tString asOldChar, tString asNew
if (asNewChar != "") {
for (int i = 0; i < (int)aString.size(); i++) {
if (aString[i] == asOldChar[0])
- aString.setChar(asNewChar[0],i);
+ aString.setChar(asNewChar[0], i);
}
return aString;
} else {
diff --git a/engines/hpl1/engine/system/String.h b/engines/hpl1/engine/system/String.h
index 42c4726685b..641039322b2 100644
--- a/engines/hpl1/engine/system/String.h
+++ b/engines/hpl1/engine/system/String.h
@@ -201,6 +201,6 @@ public:
private:
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_STRING_H
diff --git a/engines/hpl1/engine/system/System.cpp b/engines/hpl1/engine/system/System.cpp
index e47b8966d5a..ea5e17b3ad0 100644
--- a/engines/hpl1/engine/system/System.cpp
+++ b/engines/hpl1/engine/system/System.cpp
@@ -27,8 +27,8 @@
#include "hpl1/engine/system/System.h"
#include "hpl1/engine/system/LogicTimer.h"
-#include "hpl1/engine/system/low_level_system.h"
#include "hpl1/engine/system/String.h"
+#include "hpl1/engine/system/low_level_system.h"
namespace hpl {
diff --git a/engines/hpl1/engine/system/System.h b/engines/hpl1/engine/system/System.h
index 35c66397b29..539595ad5c0 100644
--- a/engines/hpl1/engine/system/System.h
+++ b/engines/hpl1/engine/system/System.h
@@ -51,6 +51,6 @@ private:
LowLevelSystem *mpLowLevelSystem;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SYSTEM_H
diff --git a/engines/hpl1/engine/system/SystemTypes.h b/engines/hpl1/engine/system/SystemTypes.h
index fdae6a1dd87..994f6eaed17 100644
--- a/engines/hpl1/engine/system/SystemTypes.h
+++ b/engines/hpl1/engine/system/SystemTypes.h
@@ -28,11 +28,11 @@
#ifndef HPL_SYSTEM_TYPES_H
#define HPL_SYSTEM_TYPES_H
-#include "hpl1/engine/system/Container.h"
+#include "common/array.h"
#include "common/list.h"
#include "common/str.h"
-#include "common/array.h"
#include "hpl1/algorithms.h"
+#include "hpl1/engine/system/Container.h"
#include "hpl1/std/set.h"
namespace hpl {
@@ -517,6 +517,6 @@ private:
CONT *mpCont;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_SYSTEM_TYPES_H
diff --git a/engines/hpl1/engine/system/low_level_system.cpp b/engines/hpl1/engine/system/low_level_system.cpp
index fa1300ecedb..35fa264112f 100644
--- a/engines/hpl1/engine/system/low_level_system.cpp
+++ b/engines/hpl1/engine/system/low_level_system.cpp
@@ -20,8 +20,8 @@
*/
#include "hpl1/engine/impl/SqScript.h"
-#include "hpl1/engine/libraries/angelscript/add-ons/scriptstdstring.h"
#include "hpl1/engine/libraries/angelscript/add-ons/scriptarray.h"
+#include "hpl1/engine/libraries/angelscript/add-ons/scriptstdstring.h"
#include "hpl1/engine/libraries/angelscript/angelscript.h"
#include "hpl1/engine/system/String.h"
@@ -34,14 +34,14 @@ namespace hpl {
static void scriptEngineLog(const asSMessageInfo *msg) {
switch (msg->type) {
- case asMSGTYPE_ERROR:
- Hpl1::logError(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
- break;
- case asMSGTYPE_WARNING:
- Hpl1::logWarning(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
- break;
- case asMSGTYPE_INFORMATION:
- Hpl1::logInfo(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
+ case asMSGTYPE_ERROR:
+ Hpl1::logError(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
+ break;
+ case asMSGTYPE_WARNING:
+ Hpl1::logWarning(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
+ break;
+ case asMSGTYPE_INFORMATION:
+ Hpl1::logInfo(Hpl1::kDebugScripts, "%s (%d, %d) : %s\n", msg->section, msg->row, msg->col, msg->message);
}
}
diff --git a/engines/hpl1/engine/system/low_level_system.h b/engines/hpl1/engine/system/low_level_system.h
index afcad39aed3..d1ecbca1a45 100644
--- a/engines/hpl1/engine/system/low_level_system.h
+++ b/engines/hpl1/engine/system/low_level_system.h
@@ -135,11 +135,12 @@ public:
* \param alMillisecs
*/
void sleep(const unsigned int millisecs);
+
private:
asIScriptEngine *_scriptEngine;
int _handleCount;
};
-} // namespace hpl
+} // namespace hpl
#endif // HPL_LOWLEVELSYSTEM_H
diff --git a/engines/hpl1/graphics.cpp b/engines/hpl1/graphics.cpp
index 6168b38188b..d5e8be01623 100644
--- a/engines/hpl1/graphics.cpp
+++ b/engines/hpl1/graphics.cpp
@@ -21,8 +21,8 @@
#include "hpl1/graphics.h"
-#include "graphics/opengl/context.h"
#include "common/config-manager.h"
+#include "graphics/opengl/context.h"
#include "graphics/surface.h"
#include "hpl1/opengl.h"
@@ -31,7 +31,7 @@ namespace Hpl1 {
bool areShadersAvailable() {
#ifdef USE_OPENGL
return useOpenGL() && OpenGLContext.enginesShadersSupported &&
- (!ConfMan.hasKey("renderer") || ConfMan.get("renderer") == "opengl_shaders");
+ (!ConfMan.hasKey("renderer") || ConfMan.get("renderer") == "opengl_shaders");
#endif
return false;
}
@@ -50,4 +50,4 @@ bool useOpenGL() {
return false;
}
-}
\ No newline at end of file
+} // namespace Hpl1
\ No newline at end of file
diff --git a/engines/hpl1/graphics.h b/engines/hpl1/graphics.h
index 465eca4b293..2906a76ba70 100644
--- a/engines/hpl1/graphics.h
+++ b/engines/hpl1/graphics.h
@@ -36,6 +36,6 @@ Common::ScopedPtr<Graphics::Surface> createViewportScreenshot();
bool useOpenGL();
-}
+} // namespace Hpl1
#endif
\ No newline at end of file
diff --git a/engines/hpl1/hpl1.cpp b/engines/hpl1/hpl1.cpp
index deee38415c8..1e52f51ad20 100644
--- a/engines/hpl1/hpl1.cpp
+++ b/engines/hpl1/hpl1.cpp
@@ -19,23 +19,23 @@
*
*/
-#include "hpl1/penumbra-overture/Init.h"
-#include "hpl1/penumbra-overture/MainMenu.h"
-#include "hpl1/penumbra-overture/SaveHandler.h"
-#include "hpl1/engine/system/String.h"
-#include "engine/engine.h"
#include "hpl1/hpl1.h"
+#include "audio/mixer.h"
#include "common/config-manager.h"
#include "common/debug-channels.h"
#include "common/events.h"
+#include "common/savefile.h"
#include "common/scummsys.h"
#include "common/system.h"
+#include "engine/engine.h"
#include "engines/util.h"
#include "graphics/palette.h"
-#include "hpl1/detection.h"
#include "hpl1/debug.h"
-#include "audio/mixer.h"
-#include "common/savefile.h"
+#include "hpl1/detection.h"
+#include "hpl1/engine/system/String.h"
+#include "hpl1/penumbra-overture/Init.h"
+#include "hpl1/penumbra-overture/MainMenu.h"
+#include "hpl1/penumbra-overture/SaveHandler.h"
namespace Hpl1 {
@@ -58,7 +58,7 @@ Common::String Hpl1Engine::getGameId() const {
return _gameDescription->gameId;
}
-static Common::String getStartupSave(MetaEngine *meta, const char* target) {
+static Common::String getStartupSave(MetaEngine *meta, const char *target) {
if (ConfMan.hasKey("save_slot")) {
const int saveSlot = ConfMan.getInt("save_slot");
const SaveStateDescriptor saveInfo = meta->querySaveMetaInfos(target, saveSlot);
@@ -106,7 +106,7 @@ Common::String Hpl1Engine::createSaveFile(const Common::String &internalName) {
static Common::String findSaveFile(const SaveStateList &saves, const Common::String &internalName) {
for (auto &s : saves) {
- if(s.getDescription() == internalName)
+ if (s.getDescription() == internalName)
return g_engine->getSaveStateName(s.getSaveSlot());
}
logWarning(kDebugSaves | kDebugFilePath, "save file for save %s does not exist", internalName.c_str());
diff --git a/engines/hpl1/hpl1.h b/engines/hpl1/hpl1.h
index cceddd8e00e..186a475c134 100644
--- a/engines/hpl1/hpl1.h
+++ b/engines/hpl1/hpl1.h
@@ -22,6 +22,7 @@
#ifndef HPL1_HPL1_H
#define HPL1_HPL1_H
+#include "common/bitarray.h"
#include "common/error.h"
#include "common/fs.h"
#include "common/hash-str.h"
@@ -33,7 +34,6 @@
#include "engines/engine.h"
#include "engines/savestate.h"
#include "graphics/screen.h"
-#include "common/bitarray.h"
#include "hpl1/detection.h"
@@ -47,7 +47,7 @@ class Hpl1Engine : public Engine {
private:
const ADGameDescription *_gameDescription;
Common::RandomSource _randomSource;
- cInit* _gameInit;
+ cInit *_gameInit;
protected:
// Engine APIs
diff --git a/engines/hpl1/metaengine.cpp b/engines/hpl1/metaengine.cpp
index 8c9a1fefac8..af83226f91f 100644
--- a/engines/hpl1/metaengine.cpp
+++ b/engines/hpl1/metaengine.cpp
@@ -22,14 +22,14 @@
#include "hpl1/metaengine.h"
#include "backends/keymapper/action.h"
#include "backends/keymapper/keymap.h"
+#include "common/savefile.h"
+#include "common/system.h"
#include "common/translation.h"
-#include "hpl1/detection.h"
-#include "hpl1/hpl1.h"
-#include "hpl1/graphics.h"
#include "graphics/scaler.h"
#include "graphics/thumbnail.h"
-#include "common/savefile.h"
-#include "common/system.h"
+#include "hpl1/detection.h"
+#include "hpl1/graphics.h"
+#include "hpl1/hpl1.h"
const char *Hpl1MetaEngine::getName() const {
return "hpl1";
@@ -52,7 +52,7 @@ bool Hpl1MetaEngine::hasFeature(MetaEngineFeature f) const {
void Hpl1MetaEngine::getSavegameThumbnail(Graphics::Surface &thumbnail) {
Common::ScopedPtr<Graphics::Surface> screen = Hpl1::createViewportScreenshot();
- Common::ScopedPtr<Graphics::Surface> scaledScreen(screen->scale( kThumbnailWidth, kThumbnailHeight2));
+ Common::ScopedPtr<Graphics::Surface> scaledScreen(screen->scale(kThumbnailWidth, kThumbnailHeight2));
scaledScreen->convertToInPlace(Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
thumbnail.copyFrom(*scaledScreen);
screen->free();
diff --git a/engines/hpl1/opengl.cpp b/engines/hpl1/opengl.cpp
index 39b20706c48..be9b7bb0092 100644
--- a/engines/hpl1/opengl.cpp
+++ b/engines/hpl1/opengl.cpp
@@ -20,16 +20,16 @@
*/
#include "hpl1/opengl.h"
-#include "hpl1/debug.h"
#include "common/rect.h"
-#include "graphics/surface.h"
#include "common/system.h"
+#include "graphics/surface.h"
+#include "hpl1/debug.h"
#ifdef USE_OPENGL
namespace Hpl1 {
-static const char* getErrorString(const GLenum code) {
+static const char *getErrorString(const GLenum code) {
switch (code) {
case GL_INVALID_ENUM:
return "GL_INVALID_ENUM";
@@ -43,11 +43,10 @@ static const char* getErrorString(const GLenum code) {
void checkOGLErrors(const char *function, const char *file, int line) {
GLenum code;
- while((code = glGetError()) != GL_NO_ERROR)
+ while ((code = glGetError()) != GL_NO_ERROR)
logError(kDebugOpenGL, "Opengl error: \'%s\' in function %s (%s:%d)\n", getErrorString(code), function, file, line);
}
-
static Common::Rect getGLViewport() {
int viewportSize[4];
GL_CHECK(glGetIntegerv(GL_VIEWPORT, viewportSize));
diff --git a/engines/hpl1/opengl.h b/engines/hpl1/opengl.h
index 0971f0a1633..a0607a54d16 100644
--- a/engines/hpl1/opengl.h
+++ b/engines/hpl1/opengl.h
@@ -22,10 +22,10 @@
#ifndef HPL1_OPENGL_H
#define HPL1_OPENGL_H
-#include "graphics/opengl/system_headers.h"
-#include "graphics/opengl/context.h"
#include "common/ptr.h"
#include "common/scummsys.h"
+#include "graphics/opengl/context.h"
+#include "graphics/opengl/system_headers.h"
#ifdef USE_OPENGL
@@ -41,10 +41,15 @@ void checkOGLErrors(const char *function, const char *file, int line);
Common::ScopedPtr<Graphics::Surface> createGLViewportScreenshot();
-}
+} // namespace Hpl1
-#define GL_CHECK(x) {x; ::Hpl1::checkOGLErrors(__func__, __FILE__, __LINE__);}
-#define GL_CHECK_FN() {::Hpl1::checkOGLErrors(__func__, __FILE__, __LINE__);}
+#define GL_CHECK(x) \
+ { \
+ x; \
+ ::Hpl1::checkOGLErrors(__func__, __FILE__, __LINE__); \
+ }
+#define GL_CHECK_FN() \
+ { ::Hpl1::checkOGLErrors(__func__, __FILE__, __LINE__); }
#endif // USE_OPENGL
#endif // HPL1_OPENGL_H
diff --git a/engines/hpl1/penumbra-overture/AttackHandler.cpp b/engines/hpl1/penumbra-overture/AttackHandler.cpp
index d24b172c765..a987fec8a2f 100644
--- a/engines/hpl1/penumbra-overture/AttackHandler.cpp
+++ b/engines/hpl1/penumbra-overture/AttackHandler.cpp
@@ -210,7 +210,7 @@ bool cAttackHandler::CreateShapeAttack(iCollideShape *apShape, const cMatrixf &a
Common::List<iPhysicsBody *>::iterator it = lstTempBodies.begin();
for (; it != lstTempBodies.end(); ++it) {
iPhysicsBody *pBody = *it;
- /*float fMass = */pBody->GetMass();
+ /*float fMass = */ pBody->GetMass();
if (pBody->IsActive() == false)
continue;
diff --git a/engines/hpl1/penumbra-overture/ButtonHandler.cpp b/engines/hpl1/penumbra-overture/ButtonHandler.cpp
index 1bdc427f3b7..e365f5eae71 100644
--- a/engines/hpl1/penumbra-overture/ButtonHandler.cpp
+++ b/engines/hpl1/penumbra-overture/ButtonHandler.cpp
@@ -50,7 +50,7 @@ struct cButtonHandlerAction {
bool mbConfig;
};
-static const char* const gsLastPlayerAction = "GlowStick";
+static const char *const gsLastPlayerAction = "GlowStick";
static constexpr cButtonHandlerAction gvDefaultActions[] = {
{"Forward", "Keyboard", eKey_w, true},
{"Backward", "Keyboard", eKey_s, true},
@@ -107,7 +107,7 @@ static constexpr cButtonHandlerAction gvDefaultActions[] = {
#ifdef __APPLE__
{"QuitGame", "Keyboard", eKeyModifier_META | eKey_q, false},
#endif
- {"LockInput","Keyboard", eKey_k, false},
+ {"LockInput", "Keyboard", eKey_k, false},
{"Screenshot", "Keyboard", eKey_F12, false},
//{"Hit","Keyboard",eKey_h,false},
@@ -115,8 +115,7 @@ static constexpr cButtonHandlerAction gvDefaultActions[] = {
//{"Taunt","Keyboard",eKey_t,false},
{"PrintLog", "Keyboard", eKey_l, false},
- {"", "", 0, false}
-};
+ {"", "", 0, false}};
//////////////////////////////////////////////////////////////////////////
// CONSTRUCTORS
diff --git a/engines/hpl1/penumbra-overture/DemoEndText.h b/engines/hpl1/penumbra-overture/DemoEndText.h
index 54fec2b17b5..fb0ffaed2a7 100644
--- a/engines/hpl1/penumbra-overture/DemoEndText.h
+++ b/engines/hpl1/penumbra-overture/DemoEndText.h
@@ -61,7 +61,7 @@ private:
cInit *mpInit;
cGraphicsDrawer *mpDrawer;
- //FontData *mpFont;
+ // FontData *mpFont;
bool mbActive;
diff --git a/engines/hpl1/penumbra-overture/EffectHandler.cpp b/engines/hpl1/penumbra-overture/EffectHandler.cpp
index dd085162198..8cbc2e907ef 100644
--- a/engines/hpl1/penumbra-overture/EffectHandler.cpp
+++ b/engines/hpl1/penumbra-overture/EffectHandler.cpp
@@ -345,7 +345,6 @@ void cEffect_SaveEffect::NormalSaveUpdate(float afTimeStep) {
mpInit->mpSaveHandler->AutoSave(_W("spot"), 10);
break;
}
-
}
}
diff --git a/engines/hpl1/penumbra-overture/GameEnemy.cpp b/engines/hpl1/penumbra-overture/GameEnemy.cpp
index 328d1383a66..5a92d1fc710 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy.cpp
@@ -610,10 +610,10 @@ void iGameEnemy::OnDraw() {
sStateName = cString::To16Char(gvStateName[mlCurrentState]);
mpInit->mpDefaultFont->draw(cVector3f(5, 48, 100), 14, cColor(1, 1, 1, 1), eFontAlign_Left,
Common::U32String::format("Health: %f State: %S Moving: %d Stuck: %f MaxViewDist: %f", mfHealth,
- sStateName.c_str(),
- mpMover->IsMoving(),
- mpMover->GetStuckCounter(),
- gfCurrentMaxViewDist));
+ sStateName.c_str(),
+ mpMover->IsMoving(),
+ mpMover->GetStuckCounter(),
+ gfCurrentMaxViewDist));
mpInit->mpDefaultFont->draw(cVector3f(5, 64, 100), 14, cColor(1, 1, 1, 1), eFontAlign_Left,
Common::U32String::format("Speed: %f", mpMover->GetCharBody()->GetMoveSpeed(eCharDir_Forward)));
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp b/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
index 8a64b677d77..de0d608d5d8 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
@@ -719,7 +719,7 @@ void cGameEnemyState_Dog_Hunt::OnUpdate(float afTimeStep) {
// mpInit->mpEffectHandler->GetSubTitle()->Add("Update Path!",1.0f,true);
mfUpdatePathCount = mfUpdateFreq;
- /*cAINodeContainer *pNodeCont = */mpEnemy->GetMover()->GetNodeContainer();
+ /*cAINodeContainer *pNodeCont = */ mpEnemy->GetMover()->GetNodeContainer();
// Log("%s: Checking free path\n",mpEnemy->GetName().c_str());
@@ -853,7 +853,7 @@ bool cGameEnemyState_Dog_Hunt::OnHearNoise(const cVector3f &avPosition, float af
//-----------------------------------------------------------------------
void cGameEnemyState_Dog_Hunt::OnDraw() {
- /*float fWantedSpeed = */mpMover->GetCharBody()->GetMoveSpeed(eCharDir_Forward);
+ /*float fWantedSpeed = */ mpMover->GetCharBody()->GetMoveSpeed(eCharDir_Forward);
float fRealSpeed = cMath::Vector3Dist(mpMover->GetCharBody()->GetPosition(),
mpMover->GetCharBody()->GetLastPosition());
fRealSpeed = fRealSpeed / (1.0f / 60.0f);
@@ -862,11 +862,11 @@ void cGameEnemyState_Dog_Hunt::OnDraw() {
mpInit->mpDefaultFont->draw(cVector3f(0, 110, 100), 14, cColor(1, 1, 1, 1), eFontAlign_Left,
Common::U32String::format("LostPlayerCount: %f FreePath: %d NoPath: %d MaxStuck: %d Dist: %f / %f",
- mfLostPlayerCount, mbFreePlayerPath,
- mbFoundNoPath,
- mlStuckAtMaxCount,
- fDist,
- mpEnemyDog->mfAttackDistance));
+ mfLostPlayerCount, mbFreePlayerPath,
+ mbFoundNoPath,
+ mlStuckAtMaxCount,
+ fDist,
+ mpEnemyDog->mfAttackDistance));
}
//-----------------------------------------------------------------------
@@ -1491,13 +1491,13 @@ void cGameEnemyState_Dog_KnockDown::OnUpdate(float afTimeStep) {
// Calculate values
cVector3f vPosition;
cVector3f vAngles;
- /*cMatrixf mtxTransform = */mpEnemy->GetMeshEntity()->CalculateTransformFromSkeleton(&vPosition, &vAngles);
+ /*cMatrixf mtxTransform = */ mpEnemy->GetMeshEntity()->CalculateTransformFromSkeleton(&vPosition, &vAngles);
// Seems to work better...
vPosition = mpEnemy->GetMeshEntity()->GetBoundingVolume()->GetWorldCenter();
cVector3f vGroundPos = vPosition;
- /*bool bFoundGround = */mpEnemy->GetGroundFinder()->GetGround(vPosition, cVector3f(0, -1, 0), &vGroundPos, NULL);
+ /*bool bFoundGround = */ mpEnemy->GetGroundFinder()->GetGround(vPosition, cVector3f(0, -1, 0), &vGroundPos, NULL);
// Log("Found ground: %d | %s -> %s\n",bFoundGround,vPosition.ToString().c_str(),
// vGroundPos.ToString().c_str());
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Dog.h b/engines/hpl1/penumbra-overture/GameEnemy_Dog.h
index bdc49fd183a..4c31b7fb77e 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Dog.h
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Dog.h
@@ -225,7 +225,7 @@ public:
void OnAnimationOver(const tString &asName);
private:
- //bool mbCheckAnim;
+ // bool mbCheckAnim;
};
//-----------------------------------------
@@ -252,7 +252,7 @@ private:
bool mbCheckAnim;
int mlPrevToughness;
- //int mlStuckAtMaxCount;
+ // int mlStuckAtMaxCount;
};
//-----------------------------------------
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp b/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
index aacf30bd725..cc13074b38e 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
@@ -234,7 +234,7 @@ void cGameEnemyState_Spider_Hunt::OnUpdate(float afTimeStep) {
if (mfUpdatePathCount <= 0) {
mfUpdatePathCount = mfUpdateFreq;
- /*cAINodeContainer *pNodeCont = */mpEnemy->GetMover()->GetNodeContainer();
+ /*cAINodeContainer *pNodeCont = */ mpEnemy->GetMover()->GetNodeContainer();
// Check if there is a free path to the player
if (mbLostPlayer == false && mpMover->FreeDirectPathToChar(mpPlayer->GetCharacterBody())) {
@@ -559,7 +559,7 @@ void cGameEnemyState_Spider_KnockDown::OnUpdate(float afTimeStep) {
if (mfTimer <= 0) {
// Get the forward vector from root bone (the right vector)
cNodeIterator StateIt = mpEnemy->GetMeshEntity()->GetRootNode()->GetChildIterator();
- //cBoneState *pBoneState = static_cast<cBoneState *>(StateIt.Next());
+ // cBoneState *pBoneState = static_cast<cBoneState *>(StateIt.Next());
// Play animation and fade physics
float fFadeTime = 0.7f;
@@ -576,10 +576,10 @@ void cGameEnemyState_Spider_KnockDown::OnUpdate(float afTimeStep) {
// Calculate values
cVector3f vPosition;
cVector3f vAngles;
- /*cMatrixf mtxTransform = */mpEnemy->GetMeshEntity()->CalculateTransformFromSkeleton(&vPosition, &vAngles);
+ /*cMatrixf mtxTransform = */ mpEnemy->GetMeshEntity()->CalculateTransformFromSkeleton(&vPosition, &vAngles);
cVector3f vGroundPos = vPosition;
- /*bool bFoundGround = */mpEnemy->GetGroundFinder()->GetGround(vPosition, cVector3f(0, -1, 0), &vGroundPos, NULL);
+ /*bool bFoundGround = */ mpEnemy->GetGroundFinder()->GetGround(vPosition, cVector3f(0, -1, 0), &vGroundPos, NULL);
// Set body
iCharacterBody *pCharBody = mpEnemy->GetMover()->GetCharBody();
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Spider.h b/engines/hpl1/penumbra-overture/GameEnemy_Spider.h
index 359e5875620..7c45c607efa 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Spider.h
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Spider.h
@@ -144,9 +144,9 @@ public:
void OnFlashlight(const cVector3f &avPosition) {}
private:
- //float mfTimer;
- //float mfBackAngle;
- //bool mbBackwards;
+ // float mfTimer;
+ // float mfBackAngle;
+ // bool mbBackwards;
};
//-----------------------------------------
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Worm.cpp b/engines/hpl1/penumbra-overture/GameEnemy_Worm.cpp
index 573b2818b5a..c0ebdd0bf8e 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Worm.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Worm.cpp
@@ -284,7 +284,7 @@ void cGameEnemyState_Worm_Hunt::OnUpdate(float afTimeStep) {
if (mfUpdatePathCount <= 0) {
mfUpdatePathCount = mfUpdateFreq;
- /*cAINodeContainer *pNodeCont = */mpEnemy->GetMover()->GetNodeContainer();
+ /*cAINodeContainer *pNodeCont = */ mpEnemy->GetMover()->GetNodeContainer();
// Check if there is a free path to the player
if (mbLostPlayer == false && mpMover->FreeDirectPathToChar(mpPlayer->GetCharacterBody())) {
@@ -692,7 +692,7 @@ void cGameEnemy_Worm::OnUpdate(float afTimeStep) {
// Calculate direction vectors
if (vMovement.SqrLength() > 0.00001f)
mvRootGoalForward = cMath::Vector3Normalize(vMovement);
- //else
+ // else
// mvRootGoalForward = mvRootGoalForward;
// Rotate vectors to get closer to goal
diff --git a/engines/hpl1/penumbra-overture/GameEntity.cpp b/engines/hpl1/penumbra-overture/GameEntity.cpp
index f1ba3b6651c..b4d5c025d21 100644
--- a/engines/hpl1/penumbra-overture/GameEntity.cpp
+++ b/engines/hpl1/penumbra-overture/GameEntity.cpp
@@ -296,7 +296,7 @@ void iGameEntity::SetSoundEntity(cSoundEntity *apSound) {
void iGameEntity::PlayerPick() {
//////////////////////
// Script stuff
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
if (mvCallbackScripts[eGameEntityScriptType_PlayerPick]) {
tString sCommand = GetScriptCommand(eGameEntityScriptType_PlayerPick);
mpInit->RunScriptCommand(sCommand);
@@ -309,7 +309,7 @@ void iGameEntity::PlayerInteract() {
//////////////////////
// Script stuff
if (GetPickedDistance() <= mfMaxInteractDist) {
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
if (mvCallbackScripts[eGameEntityScriptType_PlayerInteract]) {
tString sCommand = GetScriptCommand(eGameEntityScriptType_PlayerInteract);
mpInit->RunScriptCommand(sCommand);
@@ -323,7 +323,7 @@ void iGameEntity::PlayerExamine() {
//////////////////////
// Script stuff
if (GetPickedDistance() <= mfMaxExamineDist) {
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
if (mvCallbackScripts[eGameEntityScriptType_PlayerExamine]) {
tString sCommand = GetScriptCommand(eGameEntityScriptType_PlayerExamine);
mpInit->RunScriptCommand(sCommand);
@@ -465,7 +465,7 @@ void iGameEntity::OnUpdate(float afTimeStep) {
////////////////////////////////////////////
/// Script Collide test stuff
iPhysicsWorld *pPhysicsWorld = mpInit->mpGame->GetScene()->GetWorld3D()->GetPhysicsWorld();
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
////////////////
// If entity has character body add it to the array and then remove.
diff --git a/engines/hpl1/penumbra-overture/GameForceArea.cpp b/engines/hpl1/penumbra-overture/GameForceArea.cpp
index 705c89de8ad..712773802fd 100644
--- a/engines/hpl1/penumbra-overture/GameForceArea.cpp
+++ b/engines/hpl1/penumbra-overture/GameForceArea.cpp
@@ -158,7 +158,7 @@ void cGameForceArea::Update(float afTimeStep) {
///////////////////////////////
// Check for collision
- //int lCollideNum = mbForceAtPoint ? 4 : 1;
+ // int lCollideNum = mbForceAtPoint ? 4 : 1;
if (pPhysicsWorld->CheckShapeCollision(pBody->GetShape(), pBody->GetLocalMatrix(),
pAreaBody->GetShape(), pAreaBody->GetLocalMatrix(), collideData, 1) == false) {
diff --git a/engines/hpl1/penumbra-overture/GameItem.cpp b/engines/hpl1/penumbra-overture/GameItem.cpp
index 7c7cc00f908..06255df8abb 100644
--- a/engines/hpl1/penumbra-overture/GameItem.cpp
+++ b/engines/hpl1/penumbra-overture/GameItem.cpp
@@ -48,7 +48,7 @@ void cGameItem_InViewRay::SetUp(iPhysicsBody *apSkipBody) {
}
bool cGameItem_InViewRay::OnIntersect(iPhysicsBody *apBody, cPhysicsRayParams *apParams) {
- //float &fDist = apParams->mfDist;
+ // float &fDist = apParams->mfDist;
// Must be positive
if (apParams->mfT < 0 || apParams->mfT > 1)
diff --git a/engines/hpl1/penumbra-overture/GameLadder.cpp b/engines/hpl1/penumbra-overture/GameLadder.cpp
index eb56b029e27..66bf4d6b12e 100644
--- a/engines/hpl1/penumbra-overture/GameLadder.cpp
+++ b/engines/hpl1/penumbra-overture/GameLadder.cpp
@@ -195,7 +195,7 @@ float cGameLadder::GetHeight() {
//-----------------------------------------------------------------------
cVector3f cGameLadder::GetStartRotation() {
- /*iCharacterBody *pCharBody = */mpInit->mpPlayer->GetCharacterBody();
+ /*iCharacterBody *pCharBody = */ mpInit->mpPlayer->GetCharacterBody();
return cMath::GetAngleFromPoints3D(cVector3f(0, 0, 0), GetForward() * -1);
}
diff --git a/engines/hpl1/penumbra-overture/GameLiquidArea.cpp b/engines/hpl1/penumbra-overture/GameLiquidArea.cpp
index d24e2a98b86..672798e35ac 100644
--- a/engines/hpl1/penumbra-overture/GameLiquidArea.cpp
+++ b/engines/hpl1/penumbra-overture/GameLiquidArea.cpp
@@ -172,7 +172,7 @@ void cGameLiquidArea::Update(float afTimeStep) {
while (bodyIt.HasNext()) {
iPhysicsBody *pBody = static_cast<iPhysicsBody *>(bodyIt.Next());
- /*iGameEntity *pEntity = (iGameEntity *)*/pBody->GetUserData();
+ /*iGameEntity *pEntity = (iGameEntity *)*/ pBody->GetUserData();
if (pBody->GetCollide() && pBody->IsActive()) {
if (pBody->GetMass() == 0 && pBody->IsCharacter() == false)
diff --git a/engines/hpl1/penumbra-overture/GameObject.cpp b/engines/hpl1/penumbra-overture/GameObject.cpp
index e2d979e0f43..b0e6d00f737 100644
--- a/engines/hpl1/penumbra-overture/GameObject.cpp
+++ b/engines/hpl1/penumbra-overture/GameObject.cpp
@@ -646,8 +646,8 @@ void cGameObject::BreakAction() {
//////////////////
// Particle System
if (mBreakProps.msPS != "") {
- /*cParticleSystem3D *pPS = */pWorld->CreateParticleSystem("Break", mBreakProps.msPS, cVector3f(1, 1, 1),
- pParentBody->GetWorldMatrix());
+ /*cParticleSystem3D *pPS = */ pWorld->CreateParticleSystem("Break", mBreakProps.msPS, cVector3f(1, 1, 1),
+ pParentBody->GetWorldMatrix());
}
//////////////////
diff --git a/engines/hpl1/penumbra-overture/GameScripts.cpp b/engines/hpl1/penumbra-overture/GameScripts.cpp
index 8a3f5e91288..c9849cc33b9 100644
--- a/engines/hpl1/penumbra-overture/GameScripts.cpp
+++ b/engines/hpl1/penumbra-overture/GameScripts.cpp
@@ -158,7 +158,7 @@ SCRIPT_DEFINE_FUNC_1(string, GetActionKeyString, string)
//-----------------------------------------------------------------------
static void AddMessageTrans(tString asTransCat,
- tString asTransName) {
+ tString asTransName) {
cInit *mpInit = gpInit;
gpInit->mpGameMessageHandler->Add(kTranslate(asTransCat, asTransName));
}
@@ -182,7 +182,7 @@ SCRIPT_DEFINE_FUNC(void, AddMessageTempString)
//-----------------------------------------------------------------------
static void AddSubTitleTrans(tString asTransCat,
- tString asTransName, float afTime) {
+ tString asTransName, float afTime) {
cInit *mpInit = gpInit;
gpInit->mpEffectHandler->GetSubTitle()->Add(kTranslate(asTransCat, asTransName), afTime, false);
}
@@ -206,7 +206,7 @@ SCRIPT_DEFINE_FUNC_1(void, AddSubTitleTempString, float)
//-----------------------------------------------------------------------
static void AddRadioMessage(tString asTransCat, tString asTransName,
- tString asSound) {
+ tString asSound) {
cInit *mpInit = gpInit;
gpInit->mpRadioHandler->Add(kTranslate(asTransCat, asTransName), asSound);
}
@@ -227,7 +227,7 @@ static void SetInventoryMessage(tString asMessage) {
SCRIPT_DEFINE_FUNC_1(void, SetInventoryMessage, string)
static void SetInventoryMessageTrans(tString asTransCat,
- tString asTransName) {
+ tString asTransName) {
cInit *mpInit = gpInit;
gpInit->mpInventory->SetMessage(kTranslate(asTransCat, asTransName));
}
@@ -243,9 +243,9 @@ SCRIPT_DEFINE_FUNC_1(void, SetMessagesOverCallback, string)
//-----------------------------------------------------------------------
static void ChangeMap(tString asMapFile, tString asMapPos,
- tString asStartSound, tString asStopSound,
- float afFadeOutTime, float afFadeInTime,
- tString asLoadTextCat, tString asLoadTextEntry) {
+ tString asStartSound, tString asStopSound,
+ float afFadeOutTime, float afFadeInTime,
+ tString asLoadTextCat, tString asLoadTextEntry) {
// if(gpInit->mpRadioHandler->IsActive()) return;
gpInit->mpMapHandler->ChangeMap(asMapFile, asMapPos, asStartSound, asStopSound,
@@ -277,7 +277,7 @@ SCRIPT_DEFINE_FUNC_2(void, AddNotebookTaskText, string, string)
//-----------------------------------------------------------------------
static void AddNotebookTask(tString asName, tString asTransCat,
- tString asTransEntry) {
+ tString asTransEntry) {
cInit *mpInit = gpInit;
gpInit->mpNotebook->AddTask(asName, kTranslate(asTransCat, asTransEntry));
}
@@ -293,7 +293,7 @@ SCRIPT_DEFINE_FUNC_1(void, RemoveNotebookTask, string)
//-----------------------------------------------------------------------
static void AddNotebookNote(tString asNameCat, tString asNameEntry,
- tString asTextCat, tString asTextEntry) {
+ tString asTextCat, tString asTextEntry) {
cInit *mpInit = gpInit;
gpInit->mpNotebook->AddNote(kTranslate(asNameCat, asNameEntry), asTextCat, asTextEntry);
}
@@ -302,7 +302,7 @@ SCRIPT_DEFINE_FUNC_4(void, AddNotebookNote, string, string, string, string)
//-----------------------------------------------------------------------
static void StartNumericalPanel(tString asName, int alCode1, int alCode2, int alCode3, int alCode4,
- float afDifficulty, tString asCallback) {
+ float afDifficulty, tString asCallback) {
gpInit->mpNumericalPanel->SetActive(true);
tIntVec vCode;
vCode.resize(4);
@@ -376,7 +376,7 @@ static void SetWaveGravityActive(bool abX) {
SCRIPT_DEFINE_FUNC_1(void, SetWaveGravityActive, bool)
static void SetupWaveGravity(float afMaxAngle, float afSwingLength,
- float afGravitySize, tString asAxis) {
+ float afGravitySize, tString asAxis) {
int lDir = cString::ToLowerCase(asAxis) == "x" ? 0 : 1;
gpInit->mpEffectHandler->GetWaveGravity()->Setup(cMath::ToRad(afMaxAngle), afSwingLength, afGravitySize, lDir);
@@ -435,7 +435,7 @@ SCRIPT_DEFINE_FUNC_1(void, SetConstantFocusOnEntity, string)
//-----------------------------------------------------------------------
static void PlayGameMusic(tString asFile, float afVolume, float afFadeStep,
- bool abLoop, int alPrio) {
+ bool abLoop, int alPrio) {
gpInit->mpMusicHandler->Play(asFile, abLoop, afVolume, afFadeStep, alPrio);
}
SCRIPT_DEFINE_FUNC_5(void, PlayGameMusic, string, float, float, bool, int)
@@ -457,8 +457,8 @@ SCRIPT_DEFINE_FUNC_4(void, StartScreenShake, float, float, float, float)
//-----------------------------------------------------------------------
static void CreateLightFlashAtArea(tString asArea, float afRadius,
- float afR, float afG, float afB, float afA,
- float afAddTime, float afNegTime) {
+ float afR, float afG, float afB, float afA,
+ float afAddTime, float afNegTime) {
cAreaEntity *pArea = gpInit->mpGame->GetScene()->GetWorld3D()->GetAreaEntity(asArea);
if (pArea == NULL) {
Error("Could not find area '%s'\n", asArea.c_str());
@@ -477,9 +477,9 @@ SCRIPT_DEFINE_FUNC_8(void, CreateLightFlashAtArea, string, float, float, float,
//-----------------------------------------------------------------------
static void CreateSplashDamage(tString asAreaName, float afRadius,
- float afMinDamage, float afMaxDamge,
- float afMinForce, float afMaxForce,
- float afMaxImpulse, int alStrength) {
+ float afMinDamage, float afMaxDamge,
+ float afMinForce, float afMaxForce,
+ float afMaxImpulse, int alStrength) {
///////////////////
// Get area
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asAreaName);
@@ -730,7 +730,7 @@ SCRIPT_DEFINE_FUNC_3(void, GiveItem, string, string, int)
//-----------------------------------------------------------------------
static void ReplaceEntity(tString asName, tString asBodyName,
- tString asNewName, tString asNewFile) {
+ tString asNewName, tString asNewFile) {
GAME_ENTITY_BEGIN(asName)
if (pEntity->GetBodyNum() == 0) {
@@ -839,8 +839,8 @@ SCRIPT_DEFINE_FUNC_2(void, SetGameEntityMaxInteractDist, string, float)
//-----------------------------------------------------------------------
static void SetGameEntityDescriptionTrans(tString asName,
- tString asTransCat,
- tString asTransName) {
+ tString asTransCat,
+ tString asTransName) {
cInit *mpInit = gpInit;
GAME_ENTITY_BEGIN(asName)
@@ -852,8 +852,8 @@ SCRIPT_DEFINE_FUNC_3(void, SetGameEntityDescriptionTrans, string, string, string
//-----------------------------------------------------------------------
static void SetGameEntityDescriptionOnceTrans(tString asName,
- tString asTransCat,
- tString asTransName) {
+ tString asTransCat,
+ tString asTransName) {
cInit *mpInit = gpInit;
GAME_ENTITY_BEGIN(asName)
@@ -873,8 +873,8 @@ static void SetGameEntityDescription(tString asName, tString asMessage) {
SCRIPT_DEFINE_FUNC_2(void, SetGameEntityDescription, string, string)
static void SetGameEntityGameNameTrans(tString asName,
- tString asTransCat,
- tString asTransName) {
+ tString asTransCat,
+ tString asTransName) {
cInit *mpInit = gpInit;
GAME_ENTITY_BEGIN(asName)
@@ -885,8 +885,8 @@ SCRIPT_DEFINE_FUNC_3(void, SetGameEntityGameNameTrans, string, string, string)
//-----------------------------------------------------------------------
static void ChangeEntityAnimation(tString asName,
- tString asAnimation,
- bool abLoop) {
+ tString asAnimation,
+ bool abLoop) {
GAME_ENTITY_BEGIN(asName)
pEntity->GetMeshEntity()->PlayName(asAnimation, abLoop, true);
@@ -912,7 +912,7 @@ SCRIPT_DEFINE_FUNC_3(void, DamageEntity, string, float, int)
//-----------------------------------------------------------------------
static void SetDoorState(tString asName,
- tString asState) {
+ tString asState) {
/*iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if(pEntity==NULL || pEntity->GetType() != eGameEntityType_Door)
{
@@ -956,9 +956,9 @@ SCRIPT_DEFINE_FUNC_2(void, SetObjectInteractMode, string, string)
//-----------------------------------------------------------------------
static void SetupLink(tString asName,
- tString asMapFile, tString asMapPos,
- tString asStartSound, tString asStopSound,
- float afFadeOutTime, float afFadeInTime) {
+ tString asMapFile, tString asMapPos,
+ tString asStartSound, tString asStopSound,
+ float afFadeOutTime, float afFadeInTime) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_Link) {
Warning("Couldn't find object entity '%s'\n", asName.c_str());
@@ -981,10 +981,10 @@ SCRIPT_DEFINE_FUNC_7(void, SetupLink, string, string, string, string, string, fl
//-----------------------------------------------------------------------
static void SetupLinkLoadText(tString asName,
- tString asMapFile, tString asMapPos,
- tString asStartSound, tString asStopSound,
- float afFadeOutTime, float afFadeInTime,
- tString asTextCat, tString asTextEntry) {
+ tString asMapFile, tString asMapPos,
+ tString asStartSound, tString asStopSound,
+ float afFadeOutTime, float afFadeInTime,
+ tString asTextCat, tString asTextEntry) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_Link) {
Warning("Couldn't find object entity '%s'\n", asName.c_str());
@@ -1048,7 +1048,7 @@ SCRIPT_DEFINE_FUNC_2(void, SetAreaCustomIcon, string, string)
//-----------------------------------------------------------------------
static void AddEnemyPatrolNode(tString asEnemy, tString asNode, float afTime,
- tString asAnimation) {
+ tString asAnimation) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asEnemy);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_Enemy) {
Warning("Couldn't find enemy entity '%s'\n", asEnemy.c_str());
@@ -1165,11 +1165,11 @@ SCRIPT_DEFINE_FUNC_2(void, SetDoorLocked, string, bool)
//-----------------------------------------------------------------------
static void SetupStickArea(tString asArea, bool abCanDeatch,
- bool abMoveBody, bool abRotateBody,
- bool abCheckCenterInArea, float afPoseTime,
- tString asAttachSound, tString asDetachSound,
- tString asAttachPS, tString asDetachPS,
- tString asAttachFunc, tString asDetachFunc) {
+ bool abMoveBody, bool abRotateBody,
+ bool abCheckCenterInArea, float afPoseTime,
+ tString asAttachSound, tString asDetachSound,
+ tString asAttachPS, tString asDetachPS,
+ tString asAttachFunc, tString asDetachFunc) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asArea);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_StickArea) {
Warning("Couldn't find stick area '%s'\n", asArea.c_str());
@@ -1250,9 +1250,9 @@ SCRIPT_DEFINE_FUNC_2(void, SetLampLitChangeCallback, string, string)
//-----------------------------------------------------------------------
static void SetupLadder(tString asName,
- tString asAttachSound,
- tString asClimbUpSound,
- tString asClimbDownSound) {
+ tString asAttachSound,
+ tString asClimbUpSound,
+ tString asClimbDownSound) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_Ladder) {
Warning("Couldn't find ladder '%s'\n", asName.c_str());
@@ -1269,8 +1269,8 @@ SCRIPT_DEFINE_FUNC_4(void, SetupLadder, string, string, string, string)
//-----------------------------------------------------------------------
static void SetupDamageArea(tString asName, float afDamage,
- float afUpdatesPerSec, int alStrength,
- bool abDisableObjects, bool abDisableEnemies) {
+ float afUpdatesPerSec, int alStrength,
+ bool abDisableObjects, bool abDisableEnemies) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_DamageArea) {
Warning("Couldn't find damage area '%s'\n", asName.c_str());
@@ -1289,10 +1289,10 @@ SCRIPT_DEFINE_FUNC_6(void, SetupDamageArea, string, float, float, int, bool, boo
//-----------------------------------------------------------------------
static void SetupForceArea(tString asName,
- float afMaxForce, float afConstant,
- float afDestSpeed, float afMaxMass,
- bool abMulWithMass, bool abForceAtPoint,
- bool abAffectBodies, bool abAffectCharacters) {
+ float afMaxForce, float afConstant,
+ float afDestSpeed, float afMaxMass,
+ bool abMulWithMass, bool abForceAtPoint,
+ bool abAffectBodies, bool abAffectCharacters) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_ForceArea) {
Warning("Couldn't find force area '%s'\n", asName.c_str());
@@ -1314,11 +1314,11 @@ SCRIPT_DEFINE_FUNC_9(void, SetupForceArea, string, float, float, float, float, b
//-----------------------------------------------------------------------
static void SetupLiquidArea(tString asName,
- float afDensity, float afLinearViscosity,
- float afAngularViscosity,
- tString asPhysicsMaterial,
- float fR, float fG, float fB,
- bool abHasWaves) {
+ float afDensity, float afLinearViscosity,
+ float afAngularViscosity,
+ tString asPhysicsMaterial,
+ float fR, float fG, float fB,
+ bool abHasWaves) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_LiquidArea) {
Warning("Couldn't find liquid area '%s'\n", asName.c_str());
@@ -1341,8 +1341,8 @@ SCRIPT_DEFINE_FUNC_9(void, SetupLiquidArea, string, float, float, float, string,
//-----------------------------------------------------------------------
static void SetupSaveArea(tString asName,
- tString asMessageCat, tString asMessageEntry,
- tString asSound) {
+ tString asMessageCat, tString asMessageEntry,
+ tString asSound) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asName);
if (pEntity == NULL || pEntity->GetType() != eGameEntityType_SaveArea) {
Warning("Couldn't find save area '%s'\n", asName.c_str());
@@ -1380,9 +1380,9 @@ static eGameCollideScriptType GetGameCollideScriptType(const tString &asType) {
//////////////////////////////
static void AddEntityCollideCallback(tString asType,
- tString asDestName,
- tString asEntityName,
- tString asFuncName) {
+ tString asDestName,
+ tString asEntityName,
+ tString asFuncName) {
if (cString::ToLowerCase(asDestName) == "player") {
eGameCollideScriptType type = GetGameCollideScriptType(asType);
@@ -1406,8 +1406,8 @@ SCRIPT_DEFINE_FUNC_4(void, AddEntityCollideCallback, string, string, string, str
//////////////////////////////
static void RemoveEntityCollideCallback(tString asType,
- tString asDestName,
- tString asEntityName) {
+ tString asDestName,
+ tString asEntityName) {
if (cString::ToLowerCase(asDestName) == "player") {
eGameCollideScriptType type = GetGameCollideScriptType(asType);
@@ -1453,8 +1453,8 @@ static eGameEntityScriptType GetGameScriptType(const tString &asType) {
/////////////////////
static void AddEntityCallback(tString asType,
- tString asDestName,
- tString asFuncName) {
+ tString asDestName,
+ tString asFuncName) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asDestName);
if (pEntity == NULL) {
Warning("Couldn't find entity '%s'\n", asDestName.c_str());
@@ -1472,7 +1472,7 @@ SCRIPT_DEFINE_FUNC_3(void, AddEntityCallback, string, string, string)
/////////////////////
static void RemoveEntityCallback(tString asType,
- tString asDestName) {
+ tString asDestName) {
iGameEntity *pEntity = gpInit->mpMapHandler->GetGameEntity(asDestName);
if (pEntity == NULL) {
Warning("Couldn't find entity '%s'\n", asDestName.c_str());
@@ -1494,7 +1494,7 @@ SCRIPT_DEFINE_FUNC_2(void, RemoveEntityCallback, string, string)
//-----------------------------------------------------------------------
static void CreateSoundEntityAt(tString asType, tString asDestName,
- tString asSoundName, tString asSoundFile) {
+ tString asSoundName, tString asSoundFile) {
cWorld3D *pWorld = gpInit->mpGame->GetScene()->GetWorld3D();
iPhysicsWorld *pPhysicsWorld = gpInit->mpGame->GetScene()->GetWorld3D()->GetPhysicsWorld();
@@ -1744,8 +1744,7 @@ void cGameScripts::Init() {
pLowLevelSystem->addScriptFunc(SCRIPT_REGISTER_FUNC(CreateSoundEntityAt));
}
-void cGameScripts::finalize()
-{
+void cGameScripts::finalize() {
delete gsTempString;
}
diff --git a/engines/hpl1/penumbra-overture/GameSwingDoor.cpp b/engines/hpl1/penumbra-overture/GameSwingDoor.cpp
index a6fa6ff1bec..1819cb8367c 100644
--- a/engines/hpl1/penumbra-overture/GameSwingDoor.cpp
+++ b/engines/hpl1/penumbra-overture/GameSwingDoor.cpp
@@ -123,7 +123,7 @@ cGameSwingDoor::cGameSwingDoor(cInit *apInit, const tString &asName) : iGameEnti
//-----------------------------------------------------------------------
cGameSwingDoor::~cGameSwingDoor(void) {
- /*iPhysicsWorld *pPhysicsWorld = */mpInit->mpGame->GetScene()->GetWorld3D()->GetPhysicsWorld();
+ /*iPhysicsWorld *pPhysicsWorld = */ mpInit->mpGame->GetScene()->GetWorld3D()->GetPhysicsWorld();
// for(size_t i=0; i<mvStopControllers.size(); ++i)
//{
@@ -305,13 +305,13 @@ void cGameSwingDoor::BreakAction() {
mpInit->mpPlayer->ChangeState(ePlayerState_Normal);
}
- /*cBoundingVolume *pBV = */mpMeshEntity->GetBoundingVolume();
+ /*cBoundingVolume *pBV = */ mpMeshEntity->GetBoundingVolume();
//////////////////
// Particle System
if (msBreakPS != "") {
- /*cParticleSystem3D *pPS = */pWorld->CreateParticleSystem("Break", msBreakPS, cVector3f(1, 1, 1),
- pDynBody->GetWorldMatrix());
+ /*cParticleSystem3D *pPS = */ pWorld->CreateParticleSystem("Break", msBreakPS, cVector3f(1, 1, 1),
+ pDynBody->GetWorldMatrix());
}
//////////////////
diff --git a/engines/hpl1/penumbra-overture/GraphicsHelper.cpp b/engines/hpl1/penumbra-overture/GraphicsHelper.cpp
index 7314caab85c..f0c68399497 100644
--- a/engines/hpl1/penumbra-overture/GraphicsHelper.cpp
+++ b/engines/hpl1/penumbra-overture/GraphicsHelper.cpp
@@ -109,7 +109,7 @@ void cGraphicsHelper::DrawLoadingScreen(const tString &asFile) {
DrawTexture(pTex, cVector3f(0, 0, 0), cVector2f(800, 600), cColor(1, 1));
mpFont->draw(cVector3f(400, 300, 50), 22, cColor(1, 1), eFontAlign_Center,
- kTranslate("LoadTexts", "Loading"));
+ kTranslate("LoadTexts", "Loading"));
mpDrawer->DrawAll();
diff --git a/engines/hpl1/penumbra-overture/HudModel_Throw.cpp b/engines/hpl1/penumbra-overture/HudModel_Throw.cpp
index 1ff3c813783..e51daed8a75 100644
--- a/engines/hpl1/penumbra-overture/HudModel_Throw.cpp
+++ b/engines/hpl1/penumbra-overture/HudModel_Throw.cpp
@@ -27,15 +27,14 @@
#include "hpl1/penumbra-overture/HudModel_Throw.h"
-#include "hpl1/penumbra-overture/Init.h"
-#include "hpl1/penumbra-overture/Player.h"
-#include "hpl1/penumbra-overture/PlayerHelper.h"
#include "hpl1/penumbra-overture/AttackHandler.h"
-#include "hpl1/penumbra-overture/GameEntity.h"
#include "hpl1/penumbra-overture/GameEnemy.h"
-#include "hpl1/penumbra-overture/MapHandler.h"
+#include "hpl1/penumbra-overture/GameEntity.h"
+#include "hpl1/penumbra-overture/Init.h"
#include "hpl1/penumbra-overture/Inventory.h"
-
+#include "hpl1/penumbra-overture/MapHandler.h"
+#include "hpl1/penumbra-overture/Player.h"
+#include "hpl1/penumbra-overture/PlayerHelper.h"
/////////////////////////////////////////////////////////////////////////
// HUD MODEL THROW
@@ -43,8 +42,7 @@
//-----------------------------------------------------------------------
-cHudModel_Throw::cHudModel_Throw() : iHudModel(ePlayerHandType_Throw)
-{
+cHudModel_Throw::cHudModel_Throw() : iHudModel(ePlayerHandType_Throw) {
mbButtonDown = false;
mfChargeCount = 0;
@@ -52,122 +50,111 @@ cHudModel_Throw::cHudModel_Throw() : iHudModel(ePlayerHandType_Throw)
//-----------------------------------------------------------------------
-void cHudModel_Throw::LoadData(TiXmlElement *apRootElem)
-{
+void cHudModel_Throw::LoadData(TiXmlElement *apRootElem) {
////////////////////////////////////////////////
- //Load the MAIN element.
+ // Load the MAIN element.
TiXmlElement *pMeleeElem = apRootElem->FirstChildElement("THROW");
- if(pMeleeElem==NULL){
+ if (pMeleeElem == NULL) {
Error("Couldn't load THROW element from XML document\n");
return;
}
-
- //mbDrawDebug = cString::ToBool(pMeleeElem->Attribute("DrawDebug"),false);
- mChargePose = GetPoseFromElem("ChargePose",pMeleeElem);
- mfChargeTime = cString::ToFloat(pMeleeElem->Attribute("ChargeTime"),0);
- mfMinImpulse = cString::ToFloat(pMeleeElem->Attribute("MinImpulse"),0);
- mfMaxImpulse = cString::ToFloat(pMeleeElem->Attribute("MaxImpulse"),0);
+ // mbDrawDebug = cString::ToBool(pMeleeElem->Attribute("DrawDebug"),false);
+ mChargePose = GetPoseFromElem("ChargePose", pMeleeElem);
+
+ mfChargeTime = cString::ToFloat(pMeleeElem->Attribute("ChargeTime"), 0);
+ mfMinImpulse = cString::ToFloat(pMeleeElem->Attribute("MinImpulse"), 0);
+ mfMaxImpulse = cString::ToFloat(pMeleeElem->Attribute("MaxImpulse"), 0);
- mfReloadTime = cString::ToFloat(pMeleeElem->Attribute("ReloadTime"),0);
+ mfReloadTime = cString::ToFloat(pMeleeElem->Attribute("ReloadTime"), 0);
- mvTorque = cString::ToVector3f(pMeleeElem->Attribute("Torque"),0);
+ mvTorque = cString::ToVector3f(pMeleeElem->Attribute("Torque"), 0);
- msThrowEntity = cString::ToString(pMeleeElem->Attribute("ThrowEntity"),"");
+ msThrowEntity = cString::ToString(pMeleeElem->Attribute("ThrowEntity"), "");
- msChargeSound = cString::ToString(pMeleeElem->Attribute("ChargeSound"),"");
- msThrowSound = cString::ToString(pMeleeElem->Attribute("ThrowSound"),"");
+ msChargeSound = cString::ToString(pMeleeElem->Attribute("ChargeSound"), "");
+ msThrowSound = cString::ToString(pMeleeElem->Attribute("ThrowSound"), "");
}
//-----------------------------------------------------------------------
-void cHudModel_Throw::OnStart()
-{
+void cHudModel_Throw::OnStart() {
mbButtonDown = false;
mfChargeCount = 0;
}
//-----------------------------------------------------------------------
-void cHudModel_Throw::ResetExtraData()
-{
+void cHudModel_Throw::ResetExtraData() {
mbButtonDown = false;
mfChargeCount = 0;
}
//-----------------------------------------------------------------------
-bool cHudModel_Throw::UpdatePoseMatrix(cMatrixf& aPoseMtx, float afTimeStep)
-{
- if(mbButtonDown)
- {
- mfChargeCount += afTimeStep / mfChargeTime;
- if(mfChargeCount > 1) mfChargeCount = 1;
+bool cHudModel_Throw::UpdatePoseMatrix(cMatrixf &aPoseMtx, float afTimeStep) {
+ if (mbButtonDown) {
+ mfChargeCount += afTimeStep / mfChargeTime;
+ if (mfChargeCount > 1)
+ mfChargeCount = 1;
+ } else {
+ mfChargeCount -= afTimeStep * 4;
+ if (mfChargeCount < 0)
+ mfChargeCount = 0;
}
- else
- {
- mfChargeCount -= afTimeStep*4;
- if(mfChargeCount < 0) mfChargeCount = 0;
- }
-
+
cMatrixf mtxA = mEquipPose.ToMatrix();
cMatrixf mtxB = mChargePose.ToMatrix();
- aPoseMtx = cMath::MatrixSlerp(mfChargeCount,mtxA,mtxB,true);
+ aPoseMtx = cMath::MatrixSlerp(mfChargeCount, mtxA, mtxB, true);
return true;
}
//-----------------------------------------------------------------------
-void cHudModel_Throw::OnAttackDown()
-{
- if(mState == eHudModelState_Idle)
- {
+void cHudModel_Throw::OnAttackDown() {
+ if (mState == eHudModelState_Idle) {
mbButtonDown = true;
-
- if(msChargeSound != "")
- {
+
+ if (msChargeSound != "") {
cSoundHandler *pSoundHandler = mpInit->mpGame->GetSound()->GetSoundHandler();
- pSoundHandler->PlayGui(msChargeSound,false,1.0f);
+ pSoundHandler->PlayGui(msChargeSound, false, 1.0f);
}
}
}
//-----------------------------------------------------------------------
-void cHudModel_Throw::OnAttackUp()
-{
- if(mbButtonDown == false) return;
-
+void cHudModel_Throw::OnAttackUp() {
+ if (mbButtonDown == false)
+ return;
+
mbButtonDown = false;
-
- //Play sound
- if(msThrowSound != "")
- {
+
+ // Play sound
+ if (msThrowSound != "") {
cSoundHandler *pSoundHandler = mpInit->mpGame->GetSound()->GetSoundHandler();
- pSoundHandler->PlayGui(msThrowSound,false,1.0f);
+ pSoundHandler->PlayGui(msThrowSound, false, 1.0f);
}
///////////////////////////////
- //Create entity
+ // Create entity
cCamera3D *pCam = mpInit->mpPlayer->GetCamera();
-
- cVector3f vRot = cVector3f(pCam->GetPitch(),pCam->GetYaw(), pCam->GetRoll());
+
+ cVector3f vRot = cVector3f(pCam->GetPitch(), pCam->GetYaw(), pCam->GetRoll());
cMatrixf mtxStart = cMath::MatrixRotate(vRot, eEulerRotationOrder_XYZ);
mtxStart.SetTranslation(pCam->GetPosition());
-
- iEntity3D *pEntity = mpInit->mpGame->GetScene()->GetWorld3D()->CreateEntity("Throw",mtxStart,
+
+ iEntity3D *pEntity = mpInit->mpGame->GetScene()->GetWorld3D()->CreateEntity("Throw", mtxStart,
msThrowEntity, true);
- if(pEntity)
- {
+ if (pEntity) {
iGameEntity *pEntity2 = mpInit->mpMapHandler->GetLatestEntity();
-
+
float fImpulse = mfMinImpulse * (1 - mfChargeCount) + mfMaxImpulse * mfChargeCount;
-
- cVector3f vRot2 =cMath::MatrixMul(mtxStart.GetRotation(),mvTorque);
- for(int i=0; i< pEntity2->GetBodyNum(); ++i)
- {
+ cVector3f vRot2 = cMath::MatrixMul(mtxStart.GetRotation(), mvTorque);
+
+ for (int i = 0; i < pEntity2->GetBodyNum(); ++i) {
iPhysicsBody *pBody = pEntity2->GetBody(i);
pBody->AddImpulse(pCam->GetForward() * fImpulse);
pBody->AddTorque(vRot2);
@@ -177,30 +164,27 @@ void cHudModel_Throw::OnAttackUp()
mpInit->mpPlayer->GetHidden()->UnHide();
//////////////////////
- //Reset animations
+ // Reset animations
- mfChargeCount = 0;
+ mfChargeCount = 0;
mfTime = -mfReloadTime;
mState = eHudModelState_Equip;
//////////////////////
- //Decrease item amount
+ // Decrease item amount
mpItem->AddCount(-1);
- if(mpItem->GetCount()<=0)
- {
+ if (mpItem->GetCount() <= 0) {
mfTime = 0.0f;
mpInit->mpInventory->RemoveItem(mpItem);
- mpInit->mpPlayerHands->SetCurrentModel(1,"");
+ mpInit->mpPlayerHands->SetCurrentModel(1, "");
mpInit->mpPlayer->ChangeState(ePlayerState_Normal);
}
-
}
//-----------------------------------------------------------------------
-bool cHudModel_Throw::OnMouseMove(const cVector2f &avMovement)
-{
+bool cHudModel_Throw::OnMouseMove(const cVector2f &avMovement) {
return false;
}
diff --git a/engines/hpl1/penumbra-overture/HudModel_Weapon.cpp b/engines/hpl1/penumbra-overture/HudModel_Weapon.cpp
index 81931e0edf9..d717dc8977e 100644
--- a/engines/hpl1/penumbra-overture/HudModel_Weapon.cpp
+++ b/engines/hpl1/penumbra-overture/HudModel_Weapon.cpp
@@ -582,7 +582,7 @@ void cHudModel_WeaponMelee::Attack() {
while (it.HasNext()) {
iPhysicsBody *pBody = it.Next();
- /*float fMass = */pBody->GetMass();
+ /*float fMass = */ pBody->GetMass();
if (pBody->IsActive() == false)
continue;
diff --git a/engines/hpl1/penumbra-overture/Init.cpp b/engines/hpl1/penumbra-overture/Init.cpp
index 35043bb0a2e..b42b6938128 100644
--- a/engines/hpl1/penumbra-overture/Init.cpp
+++ b/engines/hpl1/penumbra-overture/Init.cpp
@@ -25,6 +25,7 @@
* This file is part of Penumbra Overture.
*/
+#include "hpl1/penumbra-overture/Init.h"
#include "hpl1/engine/graphics/Material.h"
#include "hpl1/penumbra-overture/ButtonHandler.h"
#include "hpl1/penumbra-overture/GameArea.h"
@@ -42,7 +43,6 @@
#include "hpl1/penumbra-overture/GameScripts.h"
#include "hpl1/penumbra-overture/GameStickArea.h"
#include "hpl1/penumbra-overture/GameSwingDoor.h"
-#include "hpl1/penumbra-overture/Init.h"
#include "hpl1/penumbra-overture/MapHandler.h"
#include "hpl1/penumbra-overture/Player.h"
diff --git a/engines/hpl1/penumbra-overture/Inventory.cpp b/engines/hpl1/penumbra-overture/Inventory.cpp
index 6c42d3c1a88..24a8c06fc8a 100644
--- a/engines/hpl1/penumbra-overture/Inventory.cpp
+++ b/engines/hpl1/penumbra-overture/Inventory.cpp
@@ -37,8 +37,8 @@
#include "hpl1/penumbra-overture/RadioHandler.h"
#include "hpl1/penumbra-overture/SaveHandler.h"
-#include "hpl1/penumbra-overture/GlobalInit.h"
#include "hpl1/algorithms.h"
+#include "hpl1/penumbra-overture/GlobalInit.h"
//////////////////////////////////////////////////////////////////////////
// CONSTRUCTORS
@@ -1435,7 +1435,7 @@ void cInventory::AddCombineCallback(const tString &asItem1, const tString &asIte
template<typename Map>
void removeCallbacks(Map &callbackMap, const tString &fn) {
- auto newEnd = Hpl1::removeIf(callbackMap.begin(), callbackMap.end(), [&](typename Map::value_type& p) -> bool {
+ auto newEnd = Hpl1::removeIf(callbackMap.begin(), callbackMap.end(), [&](typename Map::value_type &p) -> bool {
if (p.second->msFunction == fn) {
hplDelete(p.second);
return true;
diff --git a/engines/hpl1/penumbra-overture/Inventory.h b/engines/hpl1/penumbra-overture/Inventory.h
index 35ed11e2142..1bfb9fb8e70 100644
--- a/engines/hpl1/penumbra-overture/Inventory.h
+++ b/engines/hpl1/penumbra-overture/Inventory.h
@@ -177,7 +177,7 @@ private:
cGfxObject *mpGfxObjectAdditive;
cGraphicsDrawer *mpDrawer;
- //cInventoryItem *mpItem;
+ // cInventoryItem *mpItem;
bool mbCanBeDropped;
bool mbHasCount;
diff --git a/engines/hpl1/penumbra-overture/MainMenu.cpp b/engines/hpl1/penumbra-overture/MainMenu.cpp
index 0557e52eecf..244b1910bf3 100644
--- a/engines/hpl1/penumbra-overture/MainMenu.cpp
+++ b/engines/hpl1/penumbra-overture/MainMenu.cpp
@@ -27,6 +27,10 @@
#include "hpl1/penumbra-overture/MainMenu.h"
+#include "common/savefile.h"
+#include "hpl1/debug.h"
+#include "hpl1/graphics.h"
+#include "hpl1/hpl1.h"
#include "hpl1/penumbra-overture/ButtonHandler.h"
#include "hpl1/penumbra-overture/EffectHandler.h"
#include "hpl1/penumbra-overture/GraphicsHelper.h"
@@ -36,11 +40,6 @@
#include "hpl1/penumbra-overture/Player.h"
#include "hpl1/penumbra-overture/PlayerHelper.h"
#include "hpl1/penumbra-overture/SaveHandler.h"
-#include "hpl1/hpl1.h"
-#include "hpl1/debug.h"
-#include "common/savefile.h"
-#include "hpl1/graphics.h"
-
float gfMenuFadeAmount;
bool gbMustRestart = false;
@@ -501,7 +500,7 @@ void cMainMenuWidget_List::OnDraw() {
if ((int)i - mlFirstRow >= mlMaxRows)
break;
- if (mlSelected ==(int)i) {
+ if (mlSelected == (int)i) {
mpFont->draw(vPos, mvFontSize, cColor(0.95f, 1), eFontAlign_Left, mvEntries[i]);
mpDrawer->DrawGfxObject(mpBackGfx, vPos + cVector3f(0, 2, -1),
cVector2f(mvSize.x - 5, mvFontSize.y),
@@ -1022,7 +1021,7 @@ public:
}
gpLanguageText->msText = cString::To16Char(cString::SetFileExt(mvFiles[mlCurrentFile], ""));
- mpInit->msLanguageFile =mvFiles[mlCurrentFile];
+ mpInit->msLanguageFile = mvFiles[mlCurrentFile];
if (mpInit->mpMapHandler->GetCurrentMapName() != "") {
gbMustRestart = true;
@@ -1065,11 +1064,11 @@ cMainMenuWidget_Text *gpFSAAText = NULL;
cMainMenuWidget_Text *gpDoFText = NULL;
constexpr cVector2l gvResolutions[] = {cVector2l(640, 480), cVector2l(800, 600), cVector2l(1024, 768),
- cVector2l(1152, 864), cVector2l(1280, 720), cVector2l(1280, 768),
- cVector2l(1280, 800), cVector2l(1280, 960), cVector2l(1280, 1024),
- cVector2l(1360, 768), cVector2l(1360, 1024), cVector2l(1400, 1050),
- cVector2l(1440, 900), cVector2l(1680, 1050), cVector2l(1600, 1200),
- cVector2l(1920, 1080), cVector2l(1920, 1200)};
+ cVector2l(1152, 864), cVector2l(1280, 720), cVector2l(1280, 768),
+ cVector2l(1280, 800), cVector2l(1280, 960), cVector2l(1280, 1024),
+ cVector2l(1360, 768), cVector2l(1360, 1024), cVector2l(1400, 1050),
+ cVector2l(1440, 900), cVector2l(1680, 1050), cVector2l(1600, 1200),
+ cVector2l(1920, 1080), cVector2l(1920, 1200)};
int glResolutionNum = 17;
constexpr const char *gvTextureQuality[] = {"High", "Medium", "Low"};
@@ -1546,7 +1545,7 @@ public:
}
private:
- //cMainMenuWidget_Text *mpKeyWidget;
+ // cMainMenuWidget_Text *mpKeyWidget;
tString msActionName;
};
@@ -2503,7 +2502,7 @@ void cMainMenu::CreateWidgets() {
float fKeyTextXAdd = 195;
// Key buttons
- /*cInput *pInput = */mpInit->mpGame->GetInput();
+ /*cInput *pInput = */ mpInit->mpGame->GetInput();
vPos = vTextStart; // cVector3f(400, 260, 40);
vPos.y += 46;
vPos.x += 15;
diff --git a/engines/hpl1/penumbra-overture/MapHandler.cpp b/engines/hpl1/penumbra-overture/MapHandler.cpp
index 278740cefa8..1406fb75a5e 100644
--- a/engines/hpl1/penumbra-overture/MapHandler.cpp
+++ b/engines/hpl1/penumbra-overture/MapHandler.cpp
@@ -241,7 +241,7 @@ cEffectLightFlash::~cEffectLightFlash() {
//-----------------------------------------------------------------------
void cEffectLightFlash::Update(float afTimeStep) {
- /*cColor Col = */mpLight->GetDiffuseColor();
+ /*cColor Col = */ mpLight->GetDiffuseColor();
// Log("Update...\n");
if (mbIsDying == false) {
if (mpLight->IsFading() == false) {
@@ -1053,8 +1053,8 @@ void cMapHandler::RenderItemEffect() {
if (gpuProgram) {
gpuProgram->Bind();
gpuProgram->SetMatrixf("worldViewProj",
- eGpuProgramMatrix_ViewProjection,
- eGpuProgramMatrixOp_Identity);
+ eGpuProgramMatrix_ViewProjection,
+ eGpuProgramMatrixOp_Identity);
gpuProgram->SetColor3f("ambientColor", pItem->GetFlashAlpha());
}
@@ -1133,8 +1133,8 @@ void cMapHandler::OnPostSceneDraw() {
mpInit->mpGame->GetGraphics()->GetLowLevel()->SetDepthTestActive(false);
- /*cVector3f vMin = */mpScene->GetWorld3D()->GetPhysicsWorld()->GetWorldSizeMin();
- /*cVector3f vMax = */mpScene->GetWorld3D()->GetPhysicsWorld()->GetWorldSizeMax();
+ /*cVector3f vMin = */ mpScene->GetWorld3D()->GetPhysicsWorld()->GetWorldSizeMin();
+ /*cVector3f vMax = */ mpScene->GetWorld3D()->GetPhysicsWorld()->GetWorldSizeMax();
// mpInit->mpGame->GetGraphics()->GetLowLevel()->DrawBoxMaxMin(vMax,vMin,cColor(1,0,1));
@@ -1169,7 +1169,7 @@ void cMapHandler::OnPostSceneDraw() {
GIt = m_mapGameEntities.begin();
for (; GIt != m_mapGameEntities.end(); ++GIt) {
- //iGameEntity *pEntity = GIt->second;
+ // iGameEntity *pEntity = GIt->second;
// if(pEntity->GetBodyNum()<=0) continue;
@@ -1621,7 +1621,7 @@ void cMapHandler::PreUpdate(double afTimeSinceVisit) {
mbPreUpdating = true;
- //unsigned long lStart = mpInit->mpGame->GetSystem()->GetLowLevel()->getTime();
+ // unsigned long lStart = mpInit->mpGame->GetSystem()->GetLowLevel()->getTime();
// Enable all physic bodies
cPhysicsBodyIterator bodyIt = pPhysicsWorld->GetBodyIterator();
@@ -1659,7 +1659,7 @@ void cMapHandler::PreUpdate(double afTimeSinceVisit) {
mpInit->mpGame->GetSound()->GetSoundHandler()->SetSilent(false);
}
- //unsigned long lTime = mpInit->mpGame->GetSystem()->GetLowLevel()->getTime() - lStart;
+ // unsigned long lTime = mpInit->mpGame->GetSystem()->GetLowLevel()->getTime() - lStart;
// Log("PREUPDATE time: %d\n",lTime);
diff --git a/engines/hpl1/penumbra-overture/Notebook.cpp b/engines/hpl1/penumbra-overture/Notebook.cpp
index 522e6590057..3ce04dc9d5c 100644
--- a/engines/hpl1/penumbra-overture/Notebook.cpp
+++ b/engines/hpl1/penumbra-overture/Notebook.cpp
@@ -308,7 +308,7 @@ void cNotebookState_TaskList::OnDraw() {
//////////////////////////////////
// Page number
mpTextFont->draw(cVector3f(400, 490, 16), 15, cColor(0.05f, mpNotebook->GetAlpha()), eFontAlign_Center,
- Common::U32String::format("%d", mlCurrentPage + 1));
+ Common::U32String::format("%d", mlCurrentPage + 1));
//////////////////////////////////
// Draw arrows back and forward
diff --git a/engines/hpl1/penumbra-overture/Player.cpp b/engines/hpl1/penumbra-overture/Player.cpp
index bf030c4a2c9..d3c35d1f4f8 100644
--- a/engines/hpl1/penumbra-overture/Player.cpp
+++ b/engines/hpl1/penumbra-overture/Player.cpp
@@ -897,8 +897,8 @@ public:
};
void cPlayer::Update(float afTimeStep) {
- //cSystem *pSystem = mpInit->mpGame->GetSystem();
- //unsigned int lTime = pSystem->GetLowLevel()->getTime();
+ // cSystem *pSystem = mpInit->mpGame->GetSystem();
+ // unsigned int lTime = pSystem->GetLowLevel()->getTime();
iPhysicsWorld *pPhysicsWorld = mpScene->GetWorld3D()->GetPhysicsWorld();
// LogUpdate(" Death\n");
@@ -930,8 +930,8 @@ void cPlayer::Update(float afTimeStep) {
}
//LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);*/
- //lTime = pSystem->GetLowLevel()->getTime();
- // LogUpdate(" misc\n");
+ // lTime = pSystem->GetLowLevel()->getTime();
+ // LogUpdate(" misc\n");
//////////////////////
// Reset roll
mpInit->mpPlayer->GetCamera()->SetRoll(0);
@@ -951,28 +951,28 @@ void cPlayer::Update(float afTimeStep) {
/////////////////////////////////////////////////
// Flashlight
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" flashlight");
mpFlashLight->Update(afTimeStep);
/////////////////////////////////////////////////
// Glowstick
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" glowstick\n");
mpGlowStick->Update(afTimeStep);
/////////////////////////////////////////////////
// Flare
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" flare\n");
mpFlare->Update(afTimeStep);
/////////////////////////////////////////////////
// Lean
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" more misc\n");
mpLean->Update(afTimeStep);
@@ -999,17 +999,17 @@ void cPlayer::Update(float afTimeStep) {
////////////////////////////////////////
// Hidden
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" hidden\n");
mpHidden->Update(afTimeStep);
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" collide scripts\n");
/////////////////////////////////////////////////
// Collide script
pPhysicsWorld = mpInit->mpGame->GetScene()->GetWorld3D()->GetPhysicsWorld();
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
cCollideData collideData;
collideData.SetMaxSize(1);
@@ -1105,7 +1105,7 @@ void cPlayer::Update(float afTimeStep) {
mlGroundCount--;
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" Check For ground\n");
//////////////////////////////
// Cast ray and check for ground.
@@ -1121,7 +1121,7 @@ void cPlayer::Update(float afTimeStep) {
//////////////////////////////
// Update movement
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" Movement\n");
if (mbMoving == false)
@@ -1135,7 +1135,7 @@ void cPlayer::Update(float afTimeStep) {
//////////////////////////////
// Update camera pos add
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" Camera pos\n");
if (mpCharBody) {
float fYAdd = mfCameraHeightAdd + mpHeadMove->GetPos() + mfHeightAdd + mpDeath->GetHeighAdd() +
@@ -1161,7 +1161,7 @@ void cPlayer::Update(float afTimeStep) {
SetPickedBody(NULL);
// LogUpdate(" took %d ms\n",pSystem->GetLowLevel()->GetTime() - lTime);
- //lTime = pSystem->GetLowLevel()->getTime();
+ // lTime = pSystem->GetLowLevel()->getTime();
// LogUpdate(" state %d\n",mState);
if (mpInit->mpInventory->IsActive() == false &&
mpInit->mpNotebook->IsActive() == false) {
@@ -1376,8 +1376,7 @@ void cPlayer::OnDraw() {
// DEBUG: health
if (mbShowHealth) {
- mpFont->draw(cVector3f(5, 5, 0), 12, cColor(1, 1, 1, 1), eFontAlign_Left, Common::U32String::format("Health: %.0f",
- mfHealth));
+ mpFont->draw(cVector3f(5, 5, 0), 12, cColor(1, 1, 1, 1), eFontAlign_Left, Common::U32String::format("Health: %.0f", mfHealth));
}
// DEBUG: misc
@@ -1427,15 +1426,15 @@ void cPlayer::OnDraw() {
}
mpFont->draw(cVector3f((float)lCol * 250, 26 + (float)lRow * 11, 0), 10, cColor(1, 1, 1, 1), eFontAlign_Left,
Common::U32String::format("%S(%.2f (%.2f %.2f)->%.2f", cString::To16Char(vSoundNames[i]).c_str(),
- pEntry->mpSound->GetVolume(),
- pEntry->mfNormalVolumeMul,
- pEntry->mfNormalVolumeFadeSpeed,
- pEntry->mfNormalVolumeFadeDest,
- pEntry->mpSound->GetPriority(),
- pEntry->mpSound->GetElapsedTime(),
- pEntry->mpSound->GetTotalTime()
-
- ));
+ pEntry->mpSound->GetVolume(),
+ pEntry->mfNormalVolumeMul,
+ pEntry->mfNormalVolumeFadeSpeed,
+ pEntry->mfNormalVolumeFadeDest,
+ pEntry->mpSound->GetPriority(),
+ pEntry->mpSound->GetElapsedTime(),
+ pEntry->mpSound->GetTotalTime()
+
+ ));
// pEntry->mpSound->GetPriority(),
// pEntry->mpSound->IsBufferUnderrun()?1:0);
@@ -1453,12 +1452,12 @@ void cPlayer::OnDraw() {
iSoundChannel *pChannel = pMusic->mpStream;
mpFont->draw(cVector3f(5, 18 + 70, 0), 10, cColor(1, 1, 1, 1), eFontAlign_Left,
Common::U32String::format("Music: '%S' vol: %.2f playing: %d prio: %d elapsed: %.2f total time: %.2f",
- cString::To16Char(pChannel->GetData()->GetName()).c_str(),
- pChannel->GetVolume(),
- pChannel->IsPlaying(),
- pChannel->GetPriority(),
- pChannel->GetElapsedTime(),
- pChannel->GetTotalTime()));
+ cString::To16Char(pChannel->GetData()->GetName()).c_str(),
+ pChannel->GetVolume(),
+ pChannel->IsPlaying(),
+ pChannel->GetPriority(),
+ pChannel->GetElapsedTime(),
+ pChannel->GetTotalTime()));
}
}
diff --git a/engines/hpl1/penumbra-overture/Player.h b/engines/hpl1/penumbra-overture/Player.h
index 25233f2ce55..f67631620de 100644
--- a/engines/hpl1/penumbra-overture/Player.h
+++ b/engines/hpl1/penumbra-overture/Player.h
@@ -409,7 +409,7 @@ private:
float mfMaxMoveDist;
float mfMaxGrabDist;
- //float mfMaxGrabForce;
+ // float mfMaxGrabForce;
float mfMaxUseItemDist;
diff --git a/engines/hpl1/penumbra-overture/PlayerHands.cpp b/engines/hpl1/penumbra-overture/PlayerHands.cpp
index f67e1ee5bbe..d76c016964a 100644
--- a/engines/hpl1/penumbra-overture/PlayerHands.cpp
+++ b/engines/hpl1/penumbra-overture/PlayerHands.cpp
@@ -495,7 +495,7 @@ void cPlayerHands::SetCurrentModel(int alNum, const tString &asName) {
iHudModel *pHandModel = it->second;
- /*cWorld3D *pWorld = */mpInit->mpGame->GetScene()->GetWorld3D();
+ /*cWorld3D *pWorld = */ mpInit->mpGame->GetScene()->GetWorld3D();
if (mvCurrentHudModels[alNum]) {
if (mvCurrentHudModels[alNum] != pHandModel) {
@@ -612,10 +612,10 @@ void cPlayerHands::UpdatePrevPostions() {
float fRotNum = 0;
float fPosNum = 0;
- //float fRotMulStart = 1.0f;
- //float fRotMulEnd = 0.1f;
- //float fSize = (float)mlstRotations.size();
- //float fD = (fRotMulStart - fRotMulEnd) / fSize;
+ // float fRotMulStart = 1.0f;
+ // float fRotMulEnd = 0.1f;
+ // float fSize = (float)mlstRotations.size();
+ // float fD = (fRotMulStart - fRotMulEnd) / fSize;
float fMul = 1.0f; // fRotMulEnd;
for (tVector3fListIt it = mlstRotations.begin(); it != mlstRotations.end(); ++it) {
diff --git a/engines/hpl1/penumbra-overture/PlayerHelper.h b/engines/hpl1/penumbra-overture/PlayerHelper.h
index bd7c4fdc067..d07c084246e 100644
--- a/engines/hpl1/penumbra-overture/PlayerHelper.h
+++ b/engines/hpl1/penumbra-overture/PlayerHelper.h
@@ -332,7 +332,7 @@ private:
float mfClosestDist;
iPhysicsBody *mpClosestBody;
- //iTexture *mpTextureCache;
+ // iTexture *mpTextureCache;
cInit *mpInit;
@@ -421,8 +421,8 @@ private:
int mlAmount;
- //cLight3DPoint *mpLight;
- //cMeshEntity *mpMeshEntity;
+ // cLight3DPoint *mpLight;
+ // cMeshEntity *mpMeshEntity;
cInit *mpInit;
cGraphicsDrawer *mpDrawer;
diff --git a/engines/hpl1/penumbra-overture/PlayerMoveStates.h b/engines/hpl1/penumbra-overture/PlayerMoveStates.h
index e7266d2b35a..8266b8ae647 100644
--- a/engines/hpl1/penumbra-overture/PlayerMoveStates.h
+++ b/engines/hpl1/penumbra-overture/PlayerMoveStates.h
@@ -368,7 +368,7 @@ public:
float fSpeed = vForceVel.Length();
if (fSpeed > mfMaxForward) {
- //float fNeg = fSpeed - mfMaxForward;
+ // float fNeg = fSpeed - mfMaxForward;
float fForwardSpeed = pBody->GetMoveSpeed(eCharDir_Forward);
/*if(fForwardSpeed>0){
@@ -468,9 +468,9 @@ public:
iCollideShape *pShape = pBody->GetExtraBody(i)->GetShape();
cVector3f vNewPos = pBody->GetPosition();
- /*bool bCollide = */pWorld->CheckShapeWorldCollision(&vNewPos, pShape,
- cMath::MatrixTranslate(pBody->GetPosition()),
- pBody->GetBody(), false, true);
More information about the Scummvm-git-logs
mailing list