From d74825ae7be1cee0cfd625a79289e9494fcda661 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Fri, 8 Oct 2010 04:53:53 +0200
Subject: added a short-term todo list to the readme, and some more material
 code. three structs left! hopefully I'll have materials done tomorrow :D

---
 lyt/materials/material.h | 39 +++++----------------------------------
 1 file changed, 5 insertions(+), 34 deletions(-)

(limited to 'lyt/materials/material.h')

diff --git a/lyt/materials/material.h b/lyt/materials/material.h
index 19cd9c5..f881803 100644
--- a/lyt/materials/material.h
+++ b/lyt/materials/material.h
@@ -27,6 +27,10 @@
 #include "texmap.h"
 #include "texsrt.h"
 #include "texcoordgen.h"
+#include "chanctrl.h"
+#include "tevswaptable.h"
+#include "indtexstage.h"
+
 
 class LYTLayout;
 
@@ -50,39 +54,6 @@ public:
 
 
 
-class LYTChanCtrl {
-public:
-	void writeToDataStream(QDataStream &out);
-	void readFromDataStream(QDataStream &in);
-
-	void dumpToDebug();
-
-	quint8 colourMatSrc;
-	quint8 alphaMatSrc;
-};
-
-class LYTTevSwapMode {
-public:
-	void writeToDataStream(QDataStream &out);
-	void readFromDataStream(QDataStream &in);
-
-	void dumpToDebug();
-
-	int red;
-	int green;
-	int blue;
-	int alpha;
-};
-
-class LYTIndirectStage {
-public:
-	void writeToDataStream(QDataStream &out);
-	void readFromDataStream(QDataStream &in);
-
-	void dumpToDebug();
-
-};
-
 class LYTTevStage {
 public:
 	void writeToDataStream(QDataStream &out);
@@ -142,7 +113,7 @@ public:
 	QColor matCol;
 
 	bool hasTevSwapTable;
-	LYTTevSwapMode tevSwapTable;
+	LYTTevSwapTable tevSwapTable;
 
 	bool hasAlphaCompare;
 	LYTAlphaCompare alphaCompare;
-- 
cgit v1.2.3