STARTREK: Move space functions into separate file

5 files changed, 203 insertions, 164 deletions

diff --git a/engines/startrek/module.mk b/engines/startrek/module.mk
index b0f103468b..bef2c8df5b 100644
--- a/engines/startrek/module.mk
+++ b/engines/startrek/module.mk
@@ -16,6 +16,7 @@ MODULE_OBJS = \
 	room.o \
 	saveload.o \
 	sound.o \
+	space.o \
 	sprite.o \
 	startrek.o \
 	text.o \
diff --git a/engines/startrek/space.cpp b/engines/startrek/space.cpp
new file mode 100644
index 0000000000..1171952ed4
--- /dev/null
+++ b/engines/startrek/space.cpp
@@ -0,0 +1,154 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+
+#include "startrek/startrek.h"
+
+namespace StarTrek {
+
+void StarTrekEngine::initStarfieldPosition() {
+	memset(&_starfieldPosition, 0, sizeof(_starfieldPosition));
+	// TODO: matrix initialization
+}
+
+void StarTrekEngine::initStarfield(int16 x, int16 y, int16 width, int16 height, int16 arg8) {
+	_starfieldXVar1 = (x + width) / 2;
+	_starfieldYVar1 = (y + height) / 2;
+	_starfieldXVar2 = (width - x + 1) / 2;
+	_starfieldYVar2 = (height - y + 1) / 2;
+
+	_starfieldRect.left = _starfieldXVar1 - _starfieldXVar2;
+	_starfieldRect.right = _starfieldXVar1 + _starfieldXVar2;
+	_starfieldRect.top = _starfieldYVar1 - _starfieldYVar2;
+	_starfieldRect.bottom = _starfieldYVar1 + _starfieldYVar2;
+
+	memset(_starList, 0, sizeof(_starList));
+	_starfieldPointDivisor = 150;
+}
+
+void StarTrekEngine::clearStarfieldPixels() {
+	_gfx->fillBackgroundRect(_starfieldRect, 0);
+}
+
+void StarTrekEngine::drawStarfield() {
+	// TODO: make these class variables
+	Point3W starPositionWeightings[] = {{0x4000, 0, 0}, {0, 0x4000, 0}, {0, 0, 0x4000}};
+	float flt_50898 = 50.0; // ?
+
+	int16 var28 = ((_starfieldXVar2 * 3) >> 1);
+	int16 xvar = var28 / 2;
+	int16 var2a = ((_starfieldYVar2 * 3) >> 1);
+	int16 yvar = var2a / 2;
+	int16 var8 = _starfieldPointDivisor << 3;
+
+	SharedPtr<FileStream> file = loadFile("stars.shp");
+
+	for (int i = 0; i < NUM_STARS; i++) {
+		Star *star = &_starList[i];
+		if ((i & 0xf) == 0) {
+			file->seek(0, SEEK_SET);
+		}
+
+		if (!star->active) {
+			int16 var4 = getRandomWord() / var28 - xvar;
+			int16 var6 = getRandomWord() / var2a - yvar;
+			Point3 point = constructPoint3ForStarfield(var4, var6, var8);
+			star->pos = applyPointWeightings(starPositionWeightings, point) + _starfieldPosition;
+			star->active = true;
+		}
+
+		Point3 p = star->pos - _starfieldPosition;
+		Point3 point2 = applyPointWeightings2(p, starPositionWeightings);
+
+		if (point2.z > flt_50898 && point2.z < 0x3fff
+				&& abs(point2.x) < point2.z && abs(point2.y) < point2.z) {
+
+			int16 x = _starfieldXVar1 + (point2.x * _starfieldPointDivisor / point2.z);
+			int16 y = _starfieldYVar1 - (point2.y * _starfieldPointDivisor / point2.z);
+
+			int fileOffset = file->pos();
+			file->readUint32();
+			int16 width = file->readUint16();
+			int16 height = file->readUint16();
+
+			Common::Rect starRect(x, y, x + width, y + height);
+			Common::Rect drawRect = _starfieldRect.findIntersectingRect(starRect);
+
+			file->seek(fileOffset, SEEK_SET);
+			SharedPtr<Bitmap> bitmap = SharedPtr<Bitmap>(new Bitmap(file));
+
+			if (!drawRect.isEmpty())
+				_gfx->drawBitmapToBackground(starRect, drawRect, bitmap);
+			bitmap.reset();
+		} else {
+			star->active = false;
+
+			file->readUint32();
+			int16 offset2 = file->readUint16() * file->readUint16();
+			file->seek(file->pos() + offset2, SEEK_SET);
+		}
+	}
+}
+
+void StarTrekEngine::updateStarfieldAndShips(bool arg0) {
+	_starfieldSprite.bitmapChanged = true;
+	// sub_24b74(...);
+	clearStarfieldPixels();
+	drawStarfield();
+
+	// TODO
+}
+
+Point3 StarTrekEngine::constructPoint3ForStarfield(int16 x, int16 y, int16 z) {
+	Point3 point;
+	point.z = z;
+	point.y = y * z / _starfieldPointDivisor;
+	point.x = x * z / _starfieldPointDivisor;
+
+	return point;
+}
+
+Point3 StarTrekEngine::applyPointWeightings(Point3W *weight, const Point3 &point) {
+	int32 ret[3];
+	for (int i = 0; i < 3; i++) {
+		ret[i] = weight[i].x * (point.x & 0xffff) + weight[i].y * (point.y & 0xffff) + weight[i].z * (point.z & 0xffff);
+		ret[i] <<= 2;
+	}
+	Point3 p;
+	p.x = ret[0] >> 16;
+	p.y = ret[1] >> 16;
+	p.z = ret[2] >> 16;
+	return p;
+}
+
+Point3 StarTrekEngine::applyPointWeightings2(const Point3 &point, Point3W *weight) {
+	Point3 p = Point3();
+	p.x = (weight[0].x * (point.x & 0xffff) + weight[1].x * (point.y & 0xffff) + weight[2].x * (point.z & 0xffff)) << 2;
+	p.y = (weight[0].y * (point.x & 0xffff) + weight[1].y * (point.y & 0xffff) + weight[2].y * (point.z & 0xffff)) << 2;
+	p.z = (weight[0].z * (point.x & 0xffff) + weight[1].z * (point.y & 0xffff) + weight[2].z * (point.z & 0xffff)) << 2;
+	p.x >>= 16;
+	p.y >>= 16;
+	p.z >>= 16;
+	return p;
+}
+
+}
diff --git a/engines/startrek/space.h b/engines/startrek/space.h
new file mode 100644
index 0000000000..f5d08e5d1e
--- /dev/null
+++ b/engines/startrek/space.h
@@ -0,0 +1,46 @@
+// Pseudo-3D structs
+
+struct Point3 {
+	int32 x;
+	int32 y;
+	int32 z;
+
+	Point3 operator+(const Point3 &p) const {
+		Point3 p2;
+		p2.x = x + p.x;
+		p2.y = y + p.y;
+		p2.z = z + p.z;
+		return p2;
+	}
+	Point3 operator-(const Point3 &p) const {
+		Point3 p2;
+		p2.x = x - p.x;
+		p2.y = y - p.y;
+		p2.z = z - p.z;
+		return p2;
+	}
+};
+
+struct Point3W {
+	int16 x;
+	int16 y;
+	int16 z;
+};
+
+struct Star {
+	bool active;
+	Point3 pos;
+};
+
+// Struct for objects in space.
+// TODO: what does this stand for? Maybe rename it.
+struct R3 {
+	Point3 pos; // 0x0
+	int16 field1e; // 0x1e
+};
+
+// Maximum number of stars visible at once in the starfields
+#define NUM_STARS 16
+
+// Maximum number of R3 objects in space at once
+#define NUM_SPACE_OBJECTS 0x30
diff --git a/engines/startrek/startrek.cpp b/engines/startrek/startrek.cpp
index a6addb799b..ab1e3c7ee5 100644
--- a/engines/startrek/startrek.cpp
+++ b/engines/startrek/startrek.cpp
@@ -355,132 +355,6 @@ void StarTrekEngine::loadSubtitleSprite(int index, Sprite *sprite) {
 	}
 }
 
-void StarTrekEngine::initStarfieldPosition() {
-	memset(&_starfieldPosition, 0, sizeof(_starfieldPosition));
-	// TODO: matrix initialization
-}
-
-void StarTrekEngine::initStarfield(int16 x, int16 y, int16 width, int16 height, int16 arg8) {
-	_starfieldXVar1 = (x + width) / 2;
-	_starfieldYVar1 = (y + height) / 2;
-	_starfieldXVar2 = (width - x + 1) / 2;
-	_starfieldYVar2 = (height - y + 1) / 2;
-
-	_starfieldRect.left = _starfieldXVar1 - _starfieldXVar2;
-	_starfieldRect.right = _starfieldXVar1 + _starfieldXVar2;
-	_starfieldRect.top = _starfieldYVar1 - _starfieldYVar2;
-	_starfieldRect.bottom = _starfieldYVar1 + _starfieldYVar2;
-
-	memset(_starList, 0, sizeof(_starList));
-	_starfieldPointDivisor = 150;
-}
-
-void StarTrekEngine::clearStarfieldPixels() {
-	_gfx->fillBackgroundRect(_starfieldRect, 0);
-}
-
-void StarTrekEngine::drawStarfield() {
-	// TODO: make these class variables
-	Point3W starPositionWeightings[] = {{0x4000, 0, 0}, {0, 0x4000, 0}, {0, 0, 0x4000}};
-	float flt_50898 = 50.0; // ?
-
-	int16 var28 = ((_starfieldXVar2 * 3) >> 1);
-	int16 xvar = var28 / 2;
-	int16 var2a = ((_starfieldYVar2 * 3) >> 1);
-	int16 yvar = var2a / 2;
-	int16 var8 = _starfieldPointDivisor << 3;
-
-	SharedPtr<FileStream> file = loadFile("stars.shp");
-
-	for (int i = 0; i < NUM_STARS; i++) {
-		Star *star = &_starList[i];
-		if ((i & 0xf) == 0) {
-			file->seek(0, SEEK_SET);
-		}
-
-		if (!star->active) {
-			int16 var4 = getRandomWord() / var28 - xvar;
-			int16 var6 = getRandomWord() / var2a - yvar;
-			Point3 point = constructPoint3ForStarfield(var4, var6, var8);
-			star->pos = applyPointWeightings(starPositionWeightings, point) + _starfieldPosition;
-			star->active = true;
-		}
-
-		Point3 p = star->pos - _starfieldPosition;
-		Point3 point2 = applyPointWeightings2(p, starPositionWeightings);
-
-		if (point2.z > flt_50898 && point2.z < 0x3fff
-				&& abs(point2.x) < point2.z && abs(point2.y) < point2.z) {
-
-			int16 x = _starfieldXVar1 + (point2.x * _starfieldPointDivisor / point2.z);
-			int16 y = _starfieldYVar1 - (point2.y * _starfieldPointDivisor / point2.z);
-
-			int fileOffset = file->pos();
-			file->readUint32();
-			int16 width = file->readUint16();
-			int16 height = file->readUint16();
-
-			Common::Rect starRect(x, y, x + width, y + height);
-			Common::Rect drawRect = _starfieldRect.findIntersectingRect(starRect);
-
-			file->seek(fileOffset, SEEK_SET);
-			SharedPtr<Bitmap> bitmap = SharedPtr<Bitmap>(new Bitmap(file));
-
-			if (!drawRect.isEmpty())
-				_gfx->drawBitmapToBackground(starRect, drawRect, bitmap);
-			bitmap.reset();
-		} else {
-			star->active = false;
-
-			file->readUint32();
-			int16 offset2 = file->readUint16() * file->readUint16();
-			file->seek(file->pos() + offset2, SEEK_SET);
-		}
-	}
-}
-
-void StarTrekEngine::updateStarfieldAndShips(bool arg0) {
-	_starfieldSprite.bitmapChanged = true;
-	// sub_24b74(...);
-	clearStarfieldPixels();
-	drawStarfield();
-
-	// TODO
-}
-
-Point3 StarTrekEngine::constructPoint3ForStarfield(int16 x, int16 y, int16 z) {
-	Point3 point;
-	point.z = z;
-	point.y = y * z / _starfieldPointDivisor;
-	point.x = x * z / _starfieldPointDivisor;
-
-	return point;
-}
-
-Point3 StarTrekEngine::applyPointWeightings(Point3W *weight, const Point3 &point) {
-	int32 ret[3];
-	for (int i = 0; i < 3; i++) {
-		ret[i] = weight[i].x * (point.x & 0xffff) + weight[i].y * (point.y & 0xffff) + weight[i].z * (point.z & 0xffff);
-		ret[i] <<= 2;
-	}
-	Point3 p;
-	p.x = ret[0] >> 16;
-	p.y = ret[1] >> 16;
-	p.z = ret[2] >> 16;
-	return p;
-}
-
-Point3 StarTrekEngine::applyPointWeightings2(const Point3 &point, Point3W *weight) {
-	Point3 p = Point3();
-	p.x = (weight[0].x * (point.x & 0xffff) + weight[1].x * (point.y & 0xffff) + weight[2].x * (point.z & 0xffff)) << 2;
-	p.y = (weight[0].y * (point.x & 0xffff) + weight[1].y * (point.y & 0xffff) + weight[2].y * (point.z & 0xffff)) << 2;
-	p.z = (weight[0].z * (point.x & 0xffff) + weight[1].z * (point.y & 0xffff) + weight[2].z * (point.z & 0xffff)) << 2;
-	p.x >>= 16;
-	p.y >>= 16;
-	p.z >>= 16;
-	return p;
-}
-
 void StarTrekEngine::runTransportSequence(const Common::String &name) {
 	const uint16 crewmanTransportPositions[][2] = {
 		{ 0x8e, 0x7c },
diff --git a/engines/startrek/startrek.h b/engines/startrek/startrek.h
index d5000f79ea..3f5636f9db 100644
--- a/engines/startrek/startrek.h
+++ b/engines/startrek/startrek.h
@@ -46,6 +46,7 @@
 #include "startrek/items.h"
 #include "startrek/object.h"
 #include "startrek/sound.h"
+#include "startrek/space.h"
 
 
 using Common::SharedPtr;
@@ -199,43 +200,6 @@ struct TrekEvent {
 };
 
 
-// Pseudo-3D structs
-
-struct Point3 {
-	int32 x;
-	int32 y;
-	int32 z;
-
-	Point3 operator+(const Point3 &p) const {
-		Point3 p2;
-		p2.x = x + p.x;
-		p2.y = y + p.y;
-		p2.z = z + p.z;
-		return p2;
-	}
-	Point3 operator-(const Point3 &p) const {
-		Point3 p2;
-		p2.x = x - p.x;
-		p2.y = y - p.y;
-		p2.z = z - p.z;
-		return p2;
-	}
-};
-
-struct Point3W {
-	int16 x;
-	int16 y;
-	int16 z;
-};
-
-struct Star {
-	bool active;
-	Point3 pos;
-};
-
-#define NUM_STARS 16
-
-
 struct StarTrekGameDescription;
 class Graphics;
 class IWFile;
@@ -278,7 +242,7 @@ private:
 	void playIntro();
 	void loadSubtitleSprite(int index, Sprite *sprite);
 
-	// Space, pseudo-3D
+	// Space, pseudo-3D (space.cpp)
 	void initStarfieldPosition();
 	void initStarfield(int16 x, int16 y, int16 width, int16 height, int16 arg8);
 	void clearStarfieldPixels();