summaryrefslogtreecommitdiff
path: root/lyt/materials/material.h
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2010-10-08 04:53:53 +0200
committerTreeki <treeki@gmail.com>2010-10-08 04:53:53 +0200
commitd74825ae7be1cee0cfd625a79289e9494fcda661 (patch)
treef3b9a19c76734802697a6d053e24dab4a4708f38 /lyt/materials/material.h
parente813d6ede6bed1e69d749bb32529d657a9d96173 (diff)
downloadLayoutStudio-d74825ae7be1cee0cfd625a79289e9494fcda661.tar.gz
LayoutStudio-d74825ae7be1cee0cfd625a79289e9494fcda661.zip
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
Diffstat (limited to 'lyt/materials/material.h')
-rw-r--r--lyt/materials/material.h39
1 files changed, 5 insertions, 34 deletions
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;