material bugfixes, plus the beginning of U8 archive code, and a nice little API for handling archive filesystems

6 files changed, 366 insertions, 0 deletions

diff --git a/wii/archiveu8.cpp b/wii/archiveu8.cpp
new file mode 100644
index 0000000..aeb3aac
--- /dev/null
+++ b/wii/archiveu8.cpp
@@ -0,0 +1,20 @@
+/*******************************************************************************
+  This file is part of LayoutStudio (http://github.com/Treeki/LayoutStudio)
+  Copyright (c) 2010 Treeki (treeki@gmail.com)
+
+  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, version 2.0.
+
+  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 2.0 for more details.
+
+  You should have received a copy of the GNU General Public License 2.0
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+#include "archiveu8.h"
+
+
diff --git a/wii/archiveu8.h b/wii/archiveu8.h
new file mode 100644
index 0000000..66f3fbe
--- /dev/null
+++ b/wii/archiveu8.h
@@ -0,0 +1,37 @@
+/*******************************************************************************
+  This file is part of LayoutStudio (http://github.com/Treeki/LayoutStudio)
+  Copyright (c) 2010 Treeki (treeki@gmail.com)
+
+  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, version 2.0.
+
+  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 2.0 for more details.
+
+  You should have received a copy of the GNU General Public License 2.0
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+#ifndef WIIARCHIVEU8_H
+#define WIIARCHIVEU8_H
+
+#include "common.h"
+#include "filesystem.h"
+
+
+
+
+class WiiArchiveU8 {
+public:
+	WiiArchiveU8();
+	WiiArchiveU8(QDataStream &stream);
+
+	WiiDirectory root;
+
+	void writeToDataStream(QDataStream &out);
+};
+
+#endif // WIIARCHIVEU8_H
diff --git a/lyt/common.cpp b/wii/common.cpp
index ba86246..f4a961c 100644
--- a/lyt/common.cpp
+++ b/wii/common.cpp
@@ -107,3 +107,4 @@ void WriteFixedLengthASCII(QDataStream &out, QString str, int length) {
 	out.writeRawData(paddedStr.constData(), paddedStr.length());
 }
 
+
diff --git a/wii/common.h b/wii/common.h
new file mode 100644
index 0000000..aa7dce0
--- /dev/null
+++ b/wii/common.h
@@ -0,0 +1,97 @@
+#ifndef WIICOMMON_H
+#define WIICOMMON_H
+
+#include <QtGlobal>
+#include <QtCore/QByteArray>
+#include <QtGui/QColor>
+#include <QtCore/QPointF>
+#include <QtCore/QDataStream>
+#include <QtCore/QStringList>
+#include <QtCore/QDebug>
+#include <QtCore/QVector>
+
+inline quint32 BitExtract(quint32 value, int count, int start) {
+	// this function relies on heavy compiler optimisation to be efficient :p
+	quint32 mask = 0;
+	for (int i = start; i < start+count; i++) {
+		mask |= (0x80000000 >> i);
+	}
+
+	return (value & mask) >> (32 - (start + count));
+}
+
+inline quint32 BitInsert(quint32 value, int newValue, int count, int start) {
+	quint32 mask = 0;
+	for (int i = start; i < start+count; i++) {
+		mask |= (0x80000000 >> i);
+	}
+
+	value &= ~mask;
+	value |= (newValue << (32 - (start + count))) & mask;
+	return value;
+}
+
+
+
+
+
+QByteArray PadByteArray(QByteArray original, int newLength, char padWith='\0');
+
+inline quint32 ColorToRGBA(QColor col) {
+	return (col.red() << 24) | (col.green() << 16) | (col.blue() << 8) | (col.alpha());
+}
+
+inline QColor RGBAToColor(quint32 col) {
+	return QColor(col >> 24, (col >> 16) & 0xFF, (col >> 8) & 0xFF, col & 0xFF);
+}
+
+inline void ReadRGBA8Color(QColor &out, QDataStream &in) {
+	quint32 col;
+	in >> (quint32&)col;
+	out = RGBAToColor(col);
+}
+
+inline void WriteRGBA8Color(QColor &in, QDataStream &out) {
+	out << (quint32)ColorToRGBA(in);
+}
+
+inline void ReadS10Color(QColor &out, QDataStream &in) {
+	quint16 r, g, b, a;
+	in >> (quint16&)r;
+	in >> (quint16&)g;
+	in >> (quint16&)b;
+	in >> (quint16&)a;
+	out.setRgb(r, g, b, a);
+}
+
+inline void WriteS10Color(QColor &in, QDataStream &out) {
+	out << (quint16)in.red();
+	out << (quint16)in.green();
+	out << (quint16)in.blue();
+	out << (quint16)in.alpha();
+}
+
+inline void ReadPointF(QDataStream &stream, QPointF &point) {
+	float x, y;
+	stream >> x;
+	stream >> y;
+	point.setX(x);
+	point.setY(y);
+}
+
+inline void WritePointF(QDataStream &stream, const QPointF &point) {
+	stream << (float)point.x();
+	stream << (float)point.y();
+}
+
+inline void InitDataStream(QDataStream &stream) {
+	stream.setByteOrder(QDataStream::BigEndian);
+	stream.setVersion(QDataStream::Qt_4_5);
+}
+
+QStringList ReadStringList(QDataStream &in);
+
+QString ReadFixedLengthASCII(QDataStream &in, int length);
+void WriteFixedLengthASCII(QDataStream &out, QString str, int length);
+
+#endif // WIICOMMON_H
diff --git a/wii/filesystem.cpp b/wii/filesystem.cpp
new file mode 100644
index 0000000..9926109
--- /dev/null
+++ b/wii/filesystem.cpp
@@ -0,0 +1,138 @@
+/*******************************************************************************
+  This file is part of LayoutStudio (http://github.com/Treeki/LayoutStudio)
+  Copyright (c) 2010 Treeki (treeki@gmail.com)
+
+  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, version 2.0.
+
+  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 2.0 for more details.
+
+  You should have received a copy of the GNU General Public License 2.0
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+#include "filesystem.h"
+
+
+/******************************************************************************/
+
+WiiFSObject::WiiFSObject() { parent = 0; }
+WiiFSObject::~WiiFSObject() { }
+
+
+
+void WiiFSObject::unlinkFromParent() {
+	if (this->parent == 0)
+		return;
+
+	if (this->parent->isDirectory()) {
+		WiiDirectory *p = (WiiDirectory *)this->parent;
+		if (p->children.contains(this))
+			p->children.removeAt(p->children.indexOf(this));
+	}
+
+	this->parent = 0;
+}
+
+bool WiiFSObject::nameIsEqual(QString check) {
+	return (bool)(QString::compare(this->name, check, Qt::CaseInsensitive));
+}
+
+bool WiiFSObject::isFile() { return false; }
+bool WiiFSObject::isDirectory() { return false; }
+
+/******************************************************************************/
+
+bool WiiFile::isFile() { return true; }
+
+/******************************************************************************/
+
+WiiDirectory::~WiiDirectory() {
+	foreach (WiiFSObject *ptr, children)
+		delete ptr;
+}
+
+bool WiiDirectory::isDirectory() { return true; }
+
+WiiFSObject *WiiDirectory::findByName(QString name, bool recursive) {
+	foreach (WiiFSObject *obj, children) {
+		if (obj->nameIsEqual(name))
+			return obj;
+
+		if (recursive && obj->isDirectory()) {
+			WiiDirectory *dir = (WiiDirectory*)obj;
+			WiiFSObject *tryThis = dir->findByName(name, recursive);
+
+			if (tryThis)
+				return tryThis;
+		}
+	}
+
+	return 0;
+}
+
+WiiFSObject *WiiDirectory::resolvePath(QString path) {
+	QStringList pathComponents = path.split('/');
+	WiiDirectory *currentDir = this;
+
+	// special case: handle absolute paths
+	if (pathComponents.at(0) == "") {
+		while (currentDir->parent != 0)
+			currentDir = currentDir->parent;
+
+		pathComponents.removeFirst();
+	}
+
+	// now we can loop through the path
+	while (!pathComponents.isEmpty()) {
+		QString next = pathComponents.takeFirst();
+
+		// get the next object in the path
+		if (next == ".") {
+			next = currentDir;
+		} else if (next == "..") {
+			next = currentDir->parent;
+		} else {
+			WiiFSObject *nextObj = currentDir->findByName(next, false);
+		}
+
+		if (nextObj == 0) {
+			qWarning() << "Failed to resolve path" << path << ": missing component" << next;
+			return 0;
+		}
+
+		if (pathComponents.isEmpty()) {
+			// we've reached the end \o/
+			return nextObj;
+		}
+
+		// verify that this object is a directory
+		if (!nextObj->isDirectory()) {
+			qWarning() << "Failed to resolve path" << path << ": component" << next << "is not a directory";
+		}
+
+		// ok, this has to be a directory, so let's just continue
+		currentDir = (WiiDirectory *)nextObj;
+	}
+
+	// we should not reach here
+	return 0;
+}
+
+bool WiiDirectory::addChild(WiiFSObject *obj) {
+	// verify to make sure an object does not exist with this name
+	if (this->findByName(obj->name, false) != 0)
+		return false;
+
+	obj->unlinkFromParent();
+
+	this->children.append(obj);
+	obj->parent = this;
+
+	return true;
+}
+
diff --git a/wii/filesystem.h b/wii/filesystem.h
new file mode 100644
index 0000000..1a7ecfa
--- /dev/null
+++ b/wii/filesystem.h
@@ -0,0 +1,73 @@
+/*******************************************************************************
+  This file is part of LayoutStudio (http://github.com/Treeki/LayoutStudio)
+  Copyright (c) 2010 Treeki (treeki@gmail.com)
+
+  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, version 2.0.
+
+  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 2.0 for more details.
+
+  You should have received a copy of the GNU General Public License 2.0
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*******************************************************************************/
+
+#ifndef WIIFILESYSTEM_H
+#define WIIFILESYSTEM_H
+
+#include "common.h"
+
+
+class WiiFSObject {
+	// abstract base class of all filesystem objects
+public:
+	virtual ~WiiFSObject();
+
+	WiiFSObject *parent;
+
+	QString name;
+
+
+	void unlinkFromParent();
+	bool nameIsEqual(QString check);
+
+	virtual bool isFile();
+	virtual bool isDirectory();
+
+
+protected:
+	WiiFSObject(); // don't instantiate this class directly!
+};
+
+
+/******************************************************************************/
+
+class WiiFile : public WiiFSObject {
+public:
+	QByteArray data;
+
+
+	bool isFile();
+};
+
+/******************************************************************************/
+
+class WiiDirectory : public WiiFSObject {
+public:
+	~WiiDirectory();
+
+	QList<WiiFSObject *> children;
+
+
+	bool isDirectory();
+
+	WiiFSObject *findByName(QString name, bool recursive);
+	WiiFSObject *resolvePath(QString path);
+	bool addChild(WiiFSObject *obj);
+};
+
+
+#endif // FILESYSTEM_H