[Scummvm-git-logs] scummvm master -> 5a48d528f6d646e3de3f7bbabda5e73649a94f31
aquadran
noreply at scummvm.org
Sat Jun 25 21:56:17 UTC 2022
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:
5a48d528f6 WINTERMUTE: WME3D: Janitorial
Commit: 5a48d528f6d646e3de3f7bbabda5e73649a94f31
https://github.com/scummvm/scummvm/commit/5a48d528f6d646e3de3f7bbabda5e73649a94f31
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-06-25T23:56:12+02:00
Commit Message:
WINTERMUTE: WME3D: Janitorial
Changed paths:
engines/wintermute/ad/ad_actor_3dx.cpp
engines/wintermute/ad/ad_attach_3dx.cpp
engines/wintermute/ad/ad_object_3d.h
engines/wintermute/ad/ad_path3d.h
engines/wintermute/ad/ad_path_point3d.h
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/ad/ad_scene_geometry.cpp
engines/wintermute/ad/ad_waypoint_group3d.cpp
engines/wintermute/ad/ad_waypoint_group3d.h
engines/wintermute/base/gfx/3ds/light3d.cpp
engines/wintermute/base/gfx/3ds/mesh3ds.h
engines/wintermute/base/gfx/base_renderer.cpp
engines/wintermute/base/gfx/base_renderer3d.h
engines/wintermute/base/gfx/x/animation.cpp
engines/wintermute/base/gfx/x/frame_node.h
engines/wintermute/base/gfx/x/modelx.cpp
engines/wintermute/dctypes.h
diff --git a/engines/wintermute/ad/ad_actor_3dx.cpp b/engines/wintermute/ad/ad_actor_3dx.cpp
index bc8d2dfbc77..06de2bf1527 100644
--- a/engines/wintermute/ad/ad_actor_3dx.cpp
+++ b/engines/wintermute/ad/ad_actor_3dx.cpp
@@ -27,6 +27,7 @@
#include "common/math.h"
#include "common/util.h"
+
#include "engines/wintermute/ad/ad_actor_3dx.h"
#include "engines/wintermute/ad/ad_attach_3dx.h"
#include "engines/wintermute/ad/ad_entity.h"
@@ -104,7 +105,6 @@ AdActor3DX::~AdActor3DX() {
for (uint32 i = 0; i < _attachments.size(); i++) {
delete _attachments[i];
}
-
_attachments.clear();
// delete transition times
@@ -969,7 +969,6 @@ bool AdActor3DX::loadBuffer(byte *buffer, bool complete) {
case TOKEN_SHADOW_COLOR: {
int r, g, b, a;
parser.scanStr((char *)params, "%d,%d,%d,%d", &r, &g, &b, &a);
- // TODO: not sure if this is correct
_shadowColor = BYTETORGBA(r, g, b, a);
break;
@@ -1254,7 +1253,6 @@ bool AdActor3DX::playAnim3DX(int channel, const char *name, bool setState) {
}
bool res = _modelX->playAnim(channel, name, _defaultTransTime, true, _defaultStopTransTime);
-
if (res && setState) {
_state = STATE_PLAYING_ANIM;
_stateAnimChannel = channel;
@@ -2495,6 +2493,7 @@ bool AdActor3DX::parseEffect(byte *buffer) {
}
if (effectFile && material) {
+ // TODO: Implement
}
delete[] effectFile;
diff --git a/engines/wintermute/ad/ad_attach_3dx.cpp b/engines/wintermute/ad/ad_attach_3dx.cpp
index 4e271fb137c..4f848494087 100644
--- a/engines/wintermute/ad/ad_attach_3dx.cpp
+++ b/engines/wintermute/ad/ad_attach_3dx.cpp
@@ -59,7 +59,6 @@ bool AdAttach3DX::init(const char *modelFile, const char *name, const char *pare
setName(name);
_modelX = new ModelX(_gameRef, _owner);
-
if (!_modelX) {
return false;
}
diff --git a/engines/wintermute/ad/ad_object_3d.h b/engines/wintermute/ad/ad_object_3d.h
index 025aafcc2b7..e2b43a3b2fd 100644
--- a/engines/wintermute/ad/ad_object_3d.h
+++ b/engines/wintermute/ad/ad_object_3d.h
@@ -29,6 +29,7 @@
#define WINTERMUTE_AD_OBJECT_3D_H
#include "engines/wintermute/ad/ad_object.h"
+
#include "math/matrix4.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/ad/ad_path3d.h b/engines/wintermute/ad/ad_path3d.h
index cdab03f5f85..042e095a111 100644
--- a/engines/wintermute/ad/ad_path3d.h
+++ b/engines/wintermute/ad/ad_path3d.h
@@ -31,6 +31,7 @@
#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
#include "engines/wintermute/persistent.h"
+
#include "math/vector3d.h"
namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_path_point3d.h b/engines/wintermute/ad/ad_path_point3d.h
index d261aebb010..97f90bcf56c 100644
--- a/engines/wintermute/ad/ad_path_point3d.h
+++ b/engines/wintermute/ad/ad_path_point3d.h
@@ -31,6 +31,7 @@
#include "engines/wintermute/persistent.h"
#include "engines/wintermute/base/base.h"
+
#include "math/vector3d.h"
namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index e5a77d6b960..87b26e4ef8a 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -211,7 +211,6 @@ void AdScene::cleanup() {
#ifdef ENABLE_WME3D
delete _sceneGeometry;
#endif
-
delete _viewport;
_viewport = nullptr;
@@ -813,17 +812,15 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
cmd = PARSERR_GENERIC;
}
break;
+
#ifdef ENABLE_WME3D
case TOKEN_GEOMETRY:
delete _sceneGeometry;
-
if (!_gameRef->_useD3D) {
break;
}
-
_sceneGeometry = new AdSceneGeometry(_gameRef);
-
- if(_sceneGeometry == nullptr || !_sceneGeometry->loadFile(params)) {
+ if (_sceneGeometry == nullptr || !_sceneGeometry->loadFile(params)) {
delete _sceneGeometry;
cmd = PARSERR_GENERIC;
}
@@ -862,6 +859,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
parser.scanStr(params, "%b", &_2DPathfinding);
break;
#endif
+
case TOKEN_CAMERA:
Common::strlcpy(camera, params, MAX_PATH_LENGTH);
break;
@@ -1017,8 +1015,7 @@ bool AdScene::loadBuffer(char *buffer, bool complete) {
_sceneGeometry->dropWaypoints();
}
- Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
-
+ Camera3D *activeCamera = _sceneGeometry->getActiveCamera();
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera);
}
@@ -1285,7 +1282,6 @@ bool AdScene::updateFreeObjects() {
#ifdef ENABLE_WME3D
if (adGame->_objects[i]->_is3D && _sceneGeometry) {
Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
-
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera, !is3DSet);
is3DSet = true;
@@ -1304,7 +1300,6 @@ bool AdScene::updateFreeObjects() {
#ifdef ENABLE_WME3D
if (_objects[i]->_is3D && _sceneGeometry) {
Camera3D* activeCamera = _sceneGeometry->getActiveCamera();
-
if (activeCamera != nullptr) {
_gameRef->_renderer->setup3D(activeCamera, !is3DSet);
is3DSet = true;
@@ -2653,7 +2648,6 @@ bool AdScene::scSetProperty(const char *name, ScValue *value) {
return STATUS_OK;
}
-
#ifdef ENABLE_WME3D
//////////////////////////////////////////////////////////////////////////
// WaypointsHeight
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index b093de20f05..1dd75033246 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -27,6 +27,7 @@
#include "common/math.h"
#include "common/util.h"
+
#include "engines/wintermute/ad/ad_block.h"
#include "engines/wintermute/ad/ad_game.h"
#include "engines/wintermute/ad/ad_generic.h"
@@ -50,6 +51,7 @@
#include "engines/wintermute/math/math_util.h"
#include "engines/wintermute/system/sys_class_registry.h"
#include "engines/wintermute/wintermute.h"
+
#include "math/glmath.h"
namespace Wintermute {
diff --git a/engines/wintermute/ad/ad_waypoint_group3d.cpp b/engines/wintermute/ad/ad_waypoint_group3d.cpp
index 96f53220320..e84bb6a37ac 100644
--- a/engines/wintermute/ad/ad_waypoint_group3d.cpp
+++ b/engines/wintermute/ad/ad_waypoint_group3d.cpp
@@ -26,6 +26,7 @@
*/
#include "common/util.h"
+
#include "engines/wintermute/ad/ad_waypoint_group3d.h"
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
diff --git a/engines/wintermute/ad/ad_waypoint_group3d.h b/engines/wintermute/ad/ad_waypoint_group3d.h
index ab206b41aba..e0c2fb2af57 100644
--- a/engines/wintermute/ad/ad_waypoint_group3d.h
+++ b/engines/wintermute/ad/ad_waypoint_group3d.h
@@ -31,6 +31,7 @@
#include "engines/wintermute/base/base.h"
#include "engines/wintermute/coll_templ.h"
+
#include "math/vector3d.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/3ds/light3d.cpp b/engines/wintermute/base/gfx/3ds/light3d.cpp
index 099510cdd6f..945fdb842fb 100644
--- a/engines/wintermute/base/gfx/3ds/light3d.cpp
+++ b/engines/wintermute/base/gfx/3ds/light3d.cpp
@@ -31,7 +31,9 @@
#include "engines/wintermute/base/gfx/3ds/loader3ds.h"
#include "engines/wintermute/math/math_util.h"
#include "engines/wintermute/wintypes.h"
+
#include "graphics/opengl/system_headers.h"
+
#include "math/glmath.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/3ds/mesh3ds.h b/engines/wintermute/base/gfx/3ds/mesh3ds.h
index a8902318c13..eddd43456a7 100644
--- a/engines/wintermute/base/gfx/3ds/mesh3ds.h
+++ b/engines/wintermute/base/gfx/3ds/mesh3ds.h
@@ -23,6 +23,7 @@
#define WINTERMUTE_MESH_3DS_H
#include "common/memstream.h"
+
#include "math/vector4d.h"
namespace Wintermute {
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 7eddbc6bebd..658ba838427 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -263,7 +263,7 @@ bool BaseRenderer::setup2D(bool Force) {
#ifdef ENABLE_WME3D
//////////////////////////////////////////////////////////////////////////
-bool BaseRenderer::setup3D(Camera3D* camera, bool force) {
+bool BaseRenderer::setup3D(Camera3D *camera, bool force) {
return STATUS_FAILED;
}
#endif
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index 9a41e85053b..43c9ddfc0ea 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -27,6 +27,7 @@
#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/math/rect32.h"
#include "engines/wintermute/math/vector2.h"
+
#include "graphics/transform_struct.h"
#include "math/matrix4.h"
diff --git a/engines/wintermute/base/gfx/x/animation.cpp b/engines/wintermute/base/gfx/x/animation.cpp
index 218166d7612..5c0d4e4ec4f 100644
--- a/engines/wintermute/base/gfx/x/animation.cpp
+++ b/engines/wintermute/base/gfx/x/animation.cpp
@@ -111,7 +111,7 @@ bool Animation::loadFromX(XFileLexer &lexer, AnimationSet *parentAnimSet) {
lexer.advanceToNextToken();
lexer.advanceOnOpenBraces();
- // I think we can ignore these for the moment)
+ // I think we can ignore these for the moment
lexer.readInt(); // whether animation is open or closed
lexer.readInt(); // position quality
lexer.advanceToNextToken(); // skip closed braces
diff --git a/engines/wintermute/base/gfx/x/frame_node.h b/engines/wintermute/base/gfx/x/frame_node.h
index 0c6eea25ca5..aac91763402 100644
--- a/engines/wintermute/base/gfx/x/frame_node.h
+++ b/engines/wintermute/base/gfx/x/frame_node.h
@@ -32,6 +32,7 @@
#include "engines/wintermute/base/gfx/x/meshx.h"
#include "engines/wintermute/base/gfx/x/modelx.h"
#include "engines/wintermute/coll_templ.h"
+
#include "math/matrix4.h"
#include "math/quat.h"
#include "math/vector3d.h"
diff --git a/engines/wintermute/base/gfx/x/modelx.cpp b/engines/wintermute/base/gfx/x/modelx.cpp
index 78ef9852c10..f8a3535f9f5 100644
--- a/engines/wintermute/base/gfx/x/modelx.cpp
+++ b/engines/wintermute/base/gfx/x/modelx.cpp
@@ -188,14 +188,12 @@ void ModelX::cleanup(bool complete) {
for (uint32 i = 0; i < _animationSets.size(); i++) {
delete _animationSets[i];
}
-
_animationSets.clear();
if (complete) {
for (uint i = 0; i < _mergedModels.size(); ++i) {
delete[] _mergedModels[i];
}
-
_mergedModels.clear();
}
@@ -203,13 +201,11 @@ void ModelX::cleanup(bool complete) {
delete _matSprites[i];
_matSprites[i] = nullptr;
}
-
_matSprites.clear();
for (uint i = 0; i < _materialReferences.size(); ++i) {
delete _materialReferences[i]._material;
}
-
_materialReferences.clear();
// remove root frame
diff --git a/engines/wintermute/dctypes.h b/engines/wintermute/dctypes.h
index 9b4c5c59a86..992a92e04f8 100644
--- a/engines/wintermute/dctypes.h
+++ b/engines/wintermute/dctypes.h
@@ -234,9 +234,7 @@ enum TShadowType {
#ifdef ENABLE_WME3D
struct FogParameters {
- FogParameters() : _start(0.0f), _end(0.0f), _color(0x00000000), _enabled(false) {
-
- }
+ FogParameters() : _start(0.0f), _end(0.0f), _color(0x00000000), _enabled(false) {}
float _start;
float _end;
More information about the Scummvm-git-logs
mailing list