[Scummvm-git-logs] scummvm master -> 62dc0ff8bd13b5a96e23e707a765d1589ee2e7f7
sev-
sev at scummvm.org
Sat May 8 11:43:48 UTC 2021
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f06c1764af SLUDGE: Remove another unneeded include
ef02391959 SLUDGE: Properly dump floor data
9759e9d131 SLUDGE: Dump zbuffer data
8880eceaa7 SLUDGE: Reduce header dependency
62dc0ff8bd SLUDGE: Fix zbuffer ordering
Commit: f06c1764af4445510edf7c1e732a7fb49fe118e6
https://github.com/scummvm/scummvm/commit/f06c1764af4445510edf7c1e732a7fb49fe118e6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-08T13:43:29+02:00
Commit Message:
SLUDGE: Remove another unneeded include
Changed paths:
engines/sludge/region.h
diff --git a/engines/sludge/region.h b/engines/sludge/region.h
index 6de5ff98fd..5a4728e48c 100644
--- a/engines/sludge/region.h
+++ b/engines/sludge/region.h
@@ -22,8 +22,6 @@
#ifndef SLUDGE_REGION_H
#define SLUDGE_REGION_H
-//#include "sludge/freeze.h"
-
namespace Sludge {
struct ObjectType;
Commit: ef023919597bc3312bfec93f21338c3000c85937
https://github.com/scummvm/scummvm/commit/ef023919597bc3312bfec93f21338c3000c85937
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-08T13:43:29+02:00
Commit Message:
SLUDGE: Properly dump floor data
Changed paths:
engines/sludge/floor.cpp
engines/sludge/floor.h
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index 2224c2d2c4..1cd3da4ffb 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -20,6 +20,8 @@
*
*/
+#include "common/config-manager.h"
+
#include "sludge/fileset.h"
#include "sludge/floor.h"
#include "sludge/graphics.h"
@@ -141,7 +143,7 @@ bool FloorManager::setFloor(int fileNum) {
if (!g_sludge->_resMan->openFileFromNum(fileNum))
return false;
- g_sludge->_resMan->dumpFile(fileNum, "floor%04d.flo");
+ g_sludge->_resMan->dumpFile(fileNum, "floor%04d.flo.comp");
// Find out how many polygons there are and reserve memory
@@ -154,16 +156,13 @@ bool FloorManager::setFloor(int fileNum) {
// Read in each polygon
for (i = 0; i < _currentFloor->numPolygons; i++) {
-
// Find out how many vertex IDs there are and reserve memory
-
_currentFloor->polygon[i].numVertices = g_sludge->_resMan->getData()->readByte();
_currentFloor->polygon[i].vertexID = new int[_currentFloor->polygon[i].numVertices];
if (!checkNew(_currentFloor->polygon[i].vertexID))
return false;
// Read in each vertex ID
-
for (j = 0; j < _currentFloor->polygon[i].numVertices; j++) {
_currentFloor->polygon[i].vertexID[j] = g_sludge->_resMan->getData()->readUint16BE();
}
@@ -177,13 +176,14 @@ bool FloorManager::setFloor(int fileNum) {
return false;
for (j = 0; j < i; j++) {
-
_currentFloor->vertex[j].x = g_sludge->_resMan->getData()->readUint16BE();
_currentFloor->vertex[j].y = g_sludge->_resMan->getData()->readUint16BE();
}
g_sludge->_resMan->finishAccess();
+ dumpFloor(fileNum);
+
// Now build the movement martix
_currentFloor->matrix = new int *[_currentFloor->numPolygons];
@@ -254,6 +254,29 @@ bool FloorManager::setFloor(int fileNum) {
return true;
}
+void FloorManager::dumpFloor(int fileNum) {
+ if (!ConfMan.getBool("dump_scripts"))
+ return;
+
+ Common::DumpFile dumpFile;
+ dumpFile.open(Common::String::format("dumps/floor%04d.flo", fileNum));
+
+ for (int i = 0; i < _currentFloor->numPolygons; i++) {
+ int nV = _currentFloor->polygon[i].numVertices;
+ if (nV > 1) {
+ int vert = _currentFloor->polygon[i].vertexID[0];
+ dumpFile.writeString(Common::String::format("* %d, %d", _currentFloor->vertex[vert].x, _currentFloor->vertex[vert].y));
+ for (int j = 1; j < nV; j++) {
+ vert = _currentFloor->polygon[i].vertexID[j];
+ dumpFile.writeString(Common::String::format("; %d, %d", _currentFloor->vertex[vert].x, _currentFloor->vertex[vert].y));
+ }
+ dumpFile.writeString("\n");
+ }
+ }
+
+ dumpFile.close();
+}
+
void FloorManager::drawFloor() {
int i, j, nV;
for (i = 0; i < _currentFloor->numPolygons; i++) {
diff --git a/engines/sludge/floor.h b/engines/sludge/floor.h
index 2cafba6379..c00678b506 100644
--- a/engines/sludge/floor.h
+++ b/engines/sludge/floor.h
@@ -76,6 +76,7 @@ private:
bool closestPointOnLine(int &closestX, int &closestY, int x1, int y1, int x2, int y2, int xP, int yP);
bool pointInFloorPolygon(FloorPolygon &floorPoly, int x, int y);
bool polysShareSide(FloorPolygon &a, FloorPolygon &b);
+ void dumpFloor(int fileNum);
};
} // End of namespace Sludge
Commit: 9759e9d131a92c58865be72f401a7ffd08299c23
https://github.com/scummvm/scummvm/commit/9759e9d131a92c58865be72f401a7ffd08299c23
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-08T13:43:29+02:00
Commit Message:
SLUDGE: Dump zbuffer data
Changed paths:
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 8d04bcccbd..6c76538a7f 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -20,6 +20,9 @@
*
*/
+#include "common/config-manager.h"
+#include "image/png.h"
+
#include "sludge/fileset.h"
#include "sludge/graphics.h"
#include "sludge/newfatal.h"
@@ -168,6 +171,22 @@ bool GraphicsManager::setZBuffer(int num) {
g_sludge->_resMan->finishAccess();
setResourceForFatal(-1);
+
+ if (!ConfMan.getBool("dump_scripts"))
+ return true;
+
+ // Debug code to output light map image
+
+ for (int i = 0; i < _zBuffer->numPanels; ++i) {
+ Common::DumpFile *outFile = new Common::DumpFile();
+
+ outFile->open(Common::String::format("dumps/zbuffer%04d-%d.png", num, i));
+ Image::writePNG(*outFile, _zBuffer->sprites[i]);
+ outFile->finalize();
+ outFile->close();
+ delete outFile;
+ }
+
return true;
}
Commit: 8880eceaa71ebede3b75e69b10a2d48cdc1692ab
https://github.com/scummvm/scummvm/commit/8880eceaa71ebede3b75e69b10a2d48cdc1692ab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-08T13:43:29+02:00
Commit Message:
SLUDGE: Reduce header dependency
Changed paths:
engines/sludge/fileset.cpp
engines/sludge/floor.cpp
engines/sludge/imgloader.cpp
engines/sludge/sludge.cpp
engines/sludge/sludge.h
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/fileset.cpp b/engines/sludge/fileset.cpp
index 936ce150fb..3aaecc2729 100644
--- a/engines/sludge/fileset.cpp
+++ b/engines/sludge/fileset.cpp
@@ -21,7 +21,6 @@
*/
#include "common/debug.h"
-#include "common/config-manager.h"
#include "sludge/fileset.h"
#include "sludge/moreio.h"
@@ -221,7 +220,7 @@ void ResourceManager::finishAccess() {
}
void ResourceManager::dumpFile(int num, const char *pattern) {
- if (!ConfMan.getBool("dump_scripts"))
+ if (!g_sludge->_dumpScripts)
return;
Common::DumpFile dumpFile;
diff --git a/engines/sludge/floor.cpp b/engines/sludge/floor.cpp
index 1cd3da4ffb..bdad412c79 100644
--- a/engines/sludge/floor.cpp
+++ b/engines/sludge/floor.cpp
@@ -20,8 +20,6 @@
*
*/
-#include "common/config-manager.h"
-
#include "sludge/fileset.h"
#include "sludge/floor.h"
#include "sludge/graphics.h"
@@ -255,7 +253,7 @@ bool FloorManager::setFloor(int fileNum) {
}
void FloorManager::dumpFloor(int fileNum) {
- if (!ConfMan.getBool("dump_scripts"))
+ if (!g_sludge->_dumpScripts)
return;
Common::DumpFile dumpFile;
diff --git a/engines/sludge/imgloader.cpp b/engines/sludge/imgloader.cpp
index 2e5a921d45..9fec70a1d4 100644
--- a/engines/sludge/imgloader.cpp
+++ b/engines/sludge/imgloader.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "common/config-manager.h"
#include "common/debug.h"
#include "image/png.h"
@@ -54,7 +53,7 @@ bool ImgLoader::loadImage(int num, const char *fname, Common::SeekableReadStream
g_sludge->_resMan->dumpFile(num, Common::String::format("%s%%04d.png", fname).c_str());
}
- if (!ConfMan.getBool("dump_scripts"))
+ if (!g_sludge->_dumpScripts)
return true;
if (dumpPng || (fname && num == -1)) {
diff --git a/engines/sludge/sludge.cpp b/engines/sludge/sludge.cpp
index 976510a2df..9393c44a2e 100644
--- a/engines/sludge/sludge.cpp
+++ b/engines/sludge/sludge.cpp
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
+#include "common/config-manager.h"
#include "common/debug-channels.h"
#include "common/error.h"
#include "common/random.h"
@@ -66,6 +67,8 @@ SludgeEngine::SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc)
DebugMan.enableDebugChannel("Data Load");
DebugMan.enableDebugChannel("Built-in");
+ _dumpScripts = ConfMan.getBool("dump_scripts");
+
// init graphics
_origFormat = new Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0);
_pixelFormat = new Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
diff --git a/engines/sludge/sludge.h b/engines/sludge/sludge.h
index e379e26e06..cb32f666d4 100644
--- a/engines/sludge/sludge.h
+++ b/engines/sludge/sludge.h
@@ -97,6 +97,8 @@ public:
FatalMsgManager *_fatalMan;
StatusBarManager *_statusBar;
+ bool _dumpScripts;
+
SludgeEngine(OSystem *syst, const SludgeGameDescription *gameDesc);
~SludgeEngine() override;
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 6c76538a7f..fa00ccdfff 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -20,7 +20,6 @@
*
*/
-#include "common/config-manager.h"
#include "image/png.h"
#include "sludge/fileset.h"
@@ -172,7 +171,7 @@ bool GraphicsManager::setZBuffer(int num) {
g_sludge->_resMan->finishAccess();
setResourceForFatal(-1);
- if (!ConfMan.getBool("dump_scripts"))
+ if (!g_sludge->_dumpScripts)
return true;
// Debug code to output light map image
Commit: 62dc0ff8bd13b5a96e23e707a765d1589ee2e7f7
https://github.com/scummvm/scummvm/commit/62dc0ff8bd13b5a96e23e707a765d1589ee2e7f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-08T13:43:29+02:00
Commit Message:
SLUDGE: Fix zbuffer ordering
Changed paths:
engines/sludge/zbuffer.cpp
diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index fa00ccdfff..7877606994 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -151,7 +151,7 @@ bool GraphicsManager::setZBuffer(int num) {
for (int i = 0; i < _zBuffer->numPanels; ++i) {
byte *target = (byte *)_zBuffer->sprites[i].getBasePtr(x, y);
- if (n && (sorted[i] == n || i == 0)) {
+ if (sorted[i] == n || i == 0) {
byte *source = (byte *)_backdropSurface.getBasePtr(x, y);
target[0] = source[0];
target[1] = source[1];
More information about the Scummvm-git-logs
mailing list