Mass refactoring part 1/2: establishing multiple subprojects, moving source files to their new location, adding resources/templates to version control

.gitignore

@@ -31,4 +31,11 @@ Makefile*
 
 #QtCtreator Qml
 *.qmlproject.user
-*.qmlproject.user.*
+*.qmlproject.user.*
+
+# PrimeWorldEditor files
+bin/*.log
+bin/dump/*
+bin/PrimeWorldEditor.exe
+build/*
+externals/*

OpenGL/CShaderGenerator.cpp.bW5112

@@ -1,445 +0,0 @@
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <gl/glew.h>
-#include "CShaderGenerator.h"
-
-const std::string gkCoordSrc[] = {
-    "RawPosition.xyz",
-    "RawNormal.xyz",
-    "0.0, 0.0, 0.0",
-    "0.0, 0.0, 0.0",
-    "RawTex0.xy, 1.0",
-    "RawTex1.xy, 1.0",
-    "RawTex2.xy, 1.0",
-    "RawTex3.xy, 1.0",
-    "RawTex4.xy, 1.0",
-    "RawTex5.xy, 1.0",
-    "RawTex6.xy, 1.0",
-    "RawTex7.xy, 1.0"
-};
-
-const std::string gkKonstColor[] = {
-    "1.0, 1.0, 1.0",
-    "0.875, 0.875, 0.875",
-    "0.75, 0.75, 0.75",
-    "0.625, 0.625, 0.625",
-    "0.5, 0.5, 0.5",
-    "0.375, 0.375, 0.375",
-    "0.25, 0.25, 0.25",
-    "0.125, 0.125, 0.125",
-    "",
-    "",
-    "",
-    "",
-    "KonstColors[0].rgb",
-    "KonstColors[1].rgb",
-    "KonstColors[2].rgb",
-    "KonstColors[3].rgb",
-    "KonstColors[0].rrr",
-    "KonstColors[1].rrr",
-    "KonstColors[2].rrr",
-    "KonstColors[3].rrr",
-    "KonstColors[0].ggg",
-    "KonstColors[1].ggg",
-    "KonstColors[2].ggg",
-    "KonstColors[3].ggg",
-    "KonstColors[0].bbb",
-    "KonstColors[1].bbb",
-    "KonstColors[2].bbb",
-    "KonstColors[3].bbb",
-    "KonstColors[0].aaa",
-    "KonstColors[1].aaa",
-    "KonstColors[2].aaa",
-    "KonstColors[3].aaa"
-};
-
-const std::string gkKonstAlpha[] = {
-    "1.0",
-    "0.875",
-    "0.75",
-    "0.625",
-    "0.5",
-    "0.375",
-    "0.25",
-    "0.125",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "KonstColors[0].r",
-    "KonstColors[1].r",
-    "KonstColors[2].r",
-    "KonstColors[3].r",
-    "KonstColors[0].g",
-    "KonstColors[1].g",
-    "KonstColors[2].g",
-    "KonstColors[3].g",
-    "KonstColors[0].b",
-    "KonstColors[1].b",
-    "KonstColors[2].b",
-    "KonstColors[3].b",
-    "KonstColors[0].a",
-    "KonstColors[1].a",
-    "KonstColors[2].a",
-    "KonstColors[3].a"
-};
-
-const std::string gkTevColor[] = {
-    "Prev.rgb",
-    "Prev.aaa",
-    "C0.rgb",
-    "C0.aaa",
-    "C1.rgb",
-    "C1.aaa",
-    "C2.rgb",
-    "C2.aaa",
-    "Tex.rgb",
-    "Tex.aaa",
-    "Ras.rgb",
-    "Ras.aaa",
-    "1.0, 1.0, 1.0",
-    "0.5, 0.5, 0.5",
-    "Konst.rgb",
-    "0, 0, 0"
-};
-
-const std::string gkTevAlpha[] = {
-    "Prev.a",
-    "C0.a",
-    "C1.a",
-    "C2.a",
-    "Tex.a",
-    "Ras.a",
-    "Konst.a",
-    "0"
-};
-
-const std::string gkTevRigid[] = {
-    "Prev",
-    "C0",
-    "C1",
-    "C2"
-};
-
-CShaderGenerator::CShaderGenerator()
-{
-}
-
-CShaderGenerator::~CShaderGenerator()
-{
-}
-
-bool CShaderGenerator::CreateVertexShader(const CMaterial& Mat)
-{
-    std::stringstream ShaderCode;
-
-    ShaderCode << "#version 330 core\n"
-               << "\n";
-
-    // Input
-    ShaderCode << "// Input\n";
-    EVertexDescription VtxDesc = Mat.GetVtxDesc();
-    if (VtxDesc & ePosition) ShaderCode << "layout(location = 0) in vec3 RawPosition;\n";
-    if (VtxDesc & eNormal)   ShaderCode << "layout(location = 1) in vec3 RawNormal;\n";
-    if (VtxDesc & eColor0)   ShaderCode << "layout(location = 2) in vec4 RawColor0;\n";
-    if (VtxDesc & eColor1)   ShaderCode << "layout(location = 3) in vec4 RawColor1;\n";
-    if (VtxDesc & eTex0)     ShaderCode << "layout(location = 4) in vec2 RawTex0;\n";
-    if (VtxDesc & eTex1)     ShaderCode << "layout(location = 5) in vec2 RawTex1;\n";
-    if (VtxDesc & eTex2)     ShaderCode << "layout(location = 6) in vec2 RawTex2;\n";
-    if (VtxDesc & eTex3)     ShaderCode << "layout(location = 7) in vec2 RawTex3;\n";
-    if (VtxDesc & eTex4)     ShaderCode << "layout(location = 8) in vec2 RawTex4;\n";
-    if (VtxDesc & eTex5)     ShaderCode << "layout(location = 9) in vec2 RawTex5;\n";
-    if (VtxDesc & eTex6)     ShaderCode << "layout(location = 10) in vec2 RawTex6;\n";
-    ShaderCode << "\n";
-
-    // Output
-    ShaderCode << "// Output\n";
-    if (VtxDesc & eNormal)  ShaderCode << "out vec3 Normal;\n";
-    if (VtxDesc & eColor0) ShaderCode << "out vec4 Color0;\n";
-    if (VtxDesc & eColor1) ShaderCode << "out vec4 Color1;\n";
-
-    for (u32 iPass = 0; iPass < Mat.mPasses.size(); iPass++)
-        if (Mat.mPasses[iPass].TexCoordSource != 0xFF)
-            ShaderCode << "out vec3 Tex" << iPass << ";\n";
-
-    ShaderCode << "out vec4 COLOR0A0;\n"
-               << "out vec4 COLOR1A1;\n";
-    ShaderCode << "\n";
-
-    // Uniforms
-    ShaderCode << "// Uniforms\n"
-               << "layout(std140) uniform MVPBlock\n"
-               << "{\n"
-               << "    mat4 ModelMtx;\n"
-               << "    mat4 ViewMtx;\n"
-               << "    mat4 ProjMtx;\n"
-               << "};\n"
-               << "\n"
-               << "layout(std140) uniform VertexBlock\n"
-               << "{\n"
-               << "    mat4 TexMtx[10];\n"
-               << "    mat4 PostMtx[20];\n"
-               << "    vec4 COLOR0_Amb;\n"
-               << "    vec4 COLOR0_Mat;\n"
-               << "    vec4 COLOR1_Amb;\n"
-               << "    vec4 COLOR1_Mat;\n"
-               << "};\n"
-               << "\n"
-               << "struct GXLight\n"
-               << "{\n"
-               << "    vec4 Position;\n"
-               << "    vec4 Direction;\n"
-               << "    vec4 Color;\n"
-               << "    vec4 DistAtten;\n"
-               << "    vec4 AngleAtten;\n"
-               << "};\n"
-               << "layout(std140) uniform LightBlock {\n"
-               << "    GXLight Lights[8];\n"
-               << "};\n"
-               << "uniform int NumLights;\n"
-               << "\n";
-
-    // Main
-   ShaderCode  << "// Main\n"
-               << "void main()\n"
-               << "{\n"
-               << "    mat4 MVP = ModelMtx * ViewMtx * ProjMtx;\n"
-               << "    mat4 MV = ModelMtx * ViewMtx;\n";
-
-    if (VtxDesc & ePosition) ShaderCode << "    gl_Position = vec4(RawPosition, 1) * MVP;\n";
-    if (VtxDesc & eNormal)   ShaderCode << "    Normal = normalize(RawNormal.xyz * inverse(transpose(mat3(MV))));\n";
-    if (VtxDesc & eColor0)   ShaderCode << "    Color1 = RawColor0;\n";
-    if (VtxDesc & eColor1)   ShaderCode << "    Color2 = RawColor1;\n";
-
-    // Per-vertex lighting
-    ShaderCode << "\n"
-               << "    // Dynamic Lighting\n";
-
-    // The 0x1 bit on the flag determines whether lighting is enabled for COLOR0
-    if (Mat.mChanCtrlFlags & 0x1)
-    {
-        u8 DiffuseFunction = (Mat.mChanCtrlFlags >> 11) & 0x3;
-
-        if (Mat.mChanCount > 0)
-        {
-            ShaderCode << "    vec4 Illum = vec4(0.0);\n"
-                       << "    vec3 PositionMV = vec3(vec4(RawPosition, 1.0) * MV);\n"
-                       << "    \n"
-                       << "    for (int iLight = 0; iLight < NumLights; iLight++)\n"
-                       << "    {\n"
-                       << "        vec3 LightPosMV = vec3(Lights[iLight].Position * ViewMtx);\n"
-                       << "        vec3 LightDirMV = normalize(Lights[iLight].Direction.xyz * inverse(transpose(mat3(ViewMtx))));\n"
-                       << "        vec3 LightDist = LightPosMV.xyz - PositionMV.xyz;\n"
-                       << "        float DistSquared = dot(LightDist, LightDist);\n"
-                       << "        float Dist = sqrt(DistSquared);\n"
-                       << "        LightDist /= Dist;\n"
-                       << "        vec3 AngleAtten = Lights[iLight].AngleAtten.xyz;\n"
-                       << "        AngleAtten = vec3(AngleAtten.x, AngleAtten.y, AngleAtten.z);\n"
-                       << "        float Atten = max(0, dot(LightDist, LightDirMV.xyz));\n"
-                       << "        Atten = max(0, dot(AngleAtten, vec3(1.0, Atten, Atten * Atten))) / dot(Lights[iLight].DistAtten.xyz, vec3(1.0, Dist, DistSquared));\n";
-
-                 if (DiffuseFunction == 2) ShaderCode << "        float DiffuseAtten = max(0, dot(Normal, LightDist));\n";
-            else if (DiffuseFunction == 1) ShaderCode << "        float DiffuseAtten = dot(Normal, LightDist);\n";
-            else                           ShaderCode << "        float DiffuseAtten = 1.0;\n";
-
-            ShaderCode << "        Illum += (Atten * DiffuseAtten * Lights[iLight].Color);\n"
-                       << "    }\n"
-                       << "    COLOR0A0 = COLOR0_Mat * (Illum + COLOR0_Amb);\n"
-                       << "    COLOR1A1 = COLOR1_Mat * (Illum + COLOR1_Amb);\n"
-                       << "    \n";
-        }
-        else
-        {
-            ShaderCode << "    COLOR0A0 = COLOR0_Mat;\n"
-                       << "    COLOR1A1 = COLOR1_Mat;\n";
-        }
-    }
-
-    else
-    {
-        ShaderCode << "    COLOR0A0 = COLOR0_Mat;\n"
-                   << "    COLOR1A1 = COLOR1_Mat;\n"
-                   << "\n";
-    }
-
-    // Texture coordinate generation
-    ShaderCode << "    \n"
-               << "    // TexGen\n";
-
-    for (u32 iCoord = 0; iCoord < Mat.mPasses.size(); iCoord++)
-    {
-        if (Mat.mPasses[iCoord].TexCoordSource == 0xFF) continue;
-
-        s32 AnimType = Mat.mPasses[iCoord].AnimMode;
-
-        // Texture Matrix
-        if (AnimType == -1) // No animation
-            ShaderCode << "    Tex" << iCoord << " = vec3(" << gkCoordSrc[Mat.mPasses[iCoord].TexCoordSource] << ");\n";
-
-        else // Animation used - texture matrix at least, possibly normalization/post-transform
-        {
-            // Texture Matrix
-            ShaderCode << "    Tex" << iCoord << " = vec3(vec4(" << gkCoordSrc[Mat.mPasses[iCoord].TexCoordSource] << ", 1.0) * TexMtx[" << iCoord << "]).xyz;\n";
-
-            if ((AnimType < 2) || (AnimType > 5))
-            {
-                // Normalization + Post-Transform
-                ShaderCode << "    Tex" << iCoord << " = normalize(Tex" << iCoord << ");\n";
-                ShaderCode << "    Tex" << iCoord << " = vec3(vec4(Tex" << iCoord << ", 1.0) * PostMtx[" << iCoord << "]).xyz;\n";
-            }
-        }
-
-        ShaderCode << "\n";
-    }
-    ShaderCode << "}\n\n";
-
-
-    // Done!
-    return mShader->CompileVertexSource(ShaderCode.str().c_str());
-}
-
-bool CShaderGenerator::CreatePixelShader(const CMaterial& Mat)
-{
-    std::stringstream ShaderCode;
-    ShaderCode << "#version 330 core\n"
-               << "\n"
-               << "#extension GL_ARB_shading_language_420pack : enable\n" // Needed to set texture binding layouts
-               << "\n";
-
-    EVertexDescription VtxDesc = Mat.GetVtxDesc();
-    if (VtxDesc & ePosition) ShaderCode << "in vec3 Position;\n";
-    if (VtxDesc & eNormal)   ShaderCode << "in vec3 Normal;\n";
-    if (VtxDesc & eColor0)   ShaderCode << "in vec4 Color0;\n";
-    if (VtxDesc & eColor1)   ShaderCode << "in vec4 Color1;\n";
-
-    for (u32 iPass = 0; iPass < Mat.mPasses.size(); iPass++)
-        if (Mat.mPasses[iPass].TexCoordSource != 0xFF)
-            ShaderCode << "in vec3 Tex" << iPass << ";\n";
-
-    ShaderCode << "in vec4 COLOR0A0;\n"
-               << "in vec4 COLOR1A1;\n"
-               << "\n"
-               << "out vec4 PixelColor;\n"
-               << "\n"
-               << "layout(std140) uniform PixelBlock {\n"
-               << "    vec4 KonstColors[4];\n"
-               << "    vec4 TevColor;\n"
-               << "    vec4 TintColor;\n"
-               << "};\n\n";
-
-    for (u32 iTex = 0; iTex < Mat.mPasses.size(); iTex++)
-        if (Mat.mPasses[iTex].pTexture != nullptr)
-            ShaderCode << "layout(binding = " << iTex << ") uniform sampler2D Texture" << iTex << ";\n";
-
-    ShaderCode <<"\n";
-
-    ShaderCode << "void main()\n"
-               << "{\n"
-               << "    vec4 TevInA = vec4(0, 0, 0, 0), TevInB = vec4(0, 0, 0, 0), TevInC = vec4(0, 0, 0, 0), TevInD = vec4(0, 0, 0, 0);\n"
-               << "    vec4 Prev = vec4(0, 0, 0, 0), C0 = TevColor, C1 = C0, C2 = C0;\n"
-               << "    vec4 Ras = vec4(0, 0, 0, 1), Tex = vec4(0, 0, 0, 0);\n"
-               << "    vec4 Konst = vec4(1, 1, 1, 1);\n";
-
-    ShaderCode << "    vec2 TevCoord = vec2(0, 0);\n"
-               << "    \n";
-
-    for (u32 iPass = 0; iPass < Mat.mPasses.size(); iPass++)
-    {
-        ShaderCode << "    // TEV Stage " << iPass << "\n";
-        const CMaterial::SPass *pPass = &Mat.mPasses[iPass];
-
-        if (pPass->Hidden)
-        {
-            ShaderCode << "    // Pass is hidden\n\n";
-            continue;
-        }
-
-        if (pPass->TexCoordSource != 0xFF)
-            ShaderCode << "    TevCoord = (Tex" << iPass << ".z == 0.0 ? Tex" << iPass << ".xy : Tex" << iPass << ".xy / Tex" << iPass << ".z);\n";
-
-        if (pPass->pTexture != nullptr)
-            ShaderCode << "    Tex = texture(Texture" << iPass << ", TevCoord);\n";
-
-        ShaderCode << "    Konst = vec4(" << gkKonstColor[pPass->KonstColorSel] << ", " << gkKonstAlpha[pPass->KonstAlphaSel] << ");\n";
-
-        if (pPass->RasSel != 0xFF)
-        {
-                 if (pPass->RasSel == 0x0) ShaderCode << "    Ras = vec4(COLOR0A0.xyz, 1.0);\n";
-            else if (pPass->RasSel == 0x1) ShaderCode << "    Ras = vec4(COLOR1A1.xyz, 1.0);\n";
-            else if (pPass->RasSel == 0x2) ShaderCode << "    Ras = vec4(0.0, 0.0, 0.0, COLOR0A0.w);\n";
-            else if (pPass->RasSel == 0x3) ShaderCode << "    Ras = vec4(0.0, 0.0, 0.0, COLOR1A1.w);\n";
-            else if (pPass->RasSel == 0x4) ShaderCode << "    Ras = COLOR0A0;\n";
-            else if (pPass->RasSel == 0x5) ShaderCode << "    Ras = COLOR1A1;\n";
-            else if (pPass->RasSel == 0x6) ShaderCode << "    Ras = vec4(0.0, 0.0, 0.0, 0.0);\n";
-        }
-
-        for (u8 iInput = 0; iInput < 4; iInput++)
-        {
-            u8 TevCharacter = iInput + 0x41; // the current stage number represented as an ASCII letter; eg 0 is 'A'
-
-            ShaderCode << "    TevIn" << TevCharacter << " = vec4("
-                       << gkTevColor[Mat.GetTevColorIn(iPass, iInput) & 0xF]
-                       << ", "
-                       << gkTevAlpha[Mat.GetTevAlphaIn(iPass, iInput) & 0x7]
-                       << ");\n";
-        }
-
-        // Applying TRAN and BLOL (opacity and bloom maps) in Corruption require accessing specific color channels
-        // This feels hacky and might not be the best way to implement this
-        if (pPass->Type == "TRAN")
-        {
-            ShaderCode << "    // TRAN Combine\n"
-                       << "    Prev.a = 1.0 - Tex.r;\n\n";
-        }
-        /*else if (pPass->Type == "BLOL")
-        {
-            ShaderCode << "    // BLOL Combine\n"
-                       << "    C0.rgb += vec3(Tex.g, Tex.g, Tex.g);\n\n";
-        }*/
-
-        else
-        {
-            ShaderCode << "    // RGB Combine\n"
-                       << "    "
-                       << gkTevRigid[pPass->ColorOutputRegister]
-                       << ".rgb = ";
-
-            ShaderCode << "clamp(vec3(TevInD.rgb + ((1.0 - TevInC.rgb) * TevInA.rgb + TevInC.rgb * TevInB.rgb)), vec3(0, 0, 0), vec3(1.0, 1.0, 1.0));\n";
-
-            ShaderCode << "    // Alpha Combine\n"
-                       << "    "
-                       << gkTevRigid[pPass->AlphaOutputRegister]
-                       << ".a = ";
-
-            ShaderCode << "clamp(TevInD.a + ((1.0 - TevInC.a) * TevInA.a + TevInC.a * TevInB.a), 0.0, 1.0);\n\n";
-        }
-    }
-
-    if (Mat.GetOptions() & ePunchthrough) {
-        ShaderCode << "    if (Prev.a <= 0.25) discard;\n"
-                   << "    else Prev.a = 1.0;\n";
-    }
-
-    ShaderCode << "    PixelColor = Prev.rgba * TintColor;\n"
-               << "}\n\n";
-
-    // Done!
-    return mShader->CompilePixelSource(ShaderCode.str().c_str());
-}
-
-CShader* CShaderGenerator::GenerateShader(const CMaterial& Mat)
-{
-    CShaderGenerator Generator;
-    Generator.mShader = new CShader();
-
-    bool success = Generator.CreateVertexShader(Mat);
-    if (success) success = Generator.CreatePixelShader(Mat);
-
-    Generator.mShader->LinkShaders();
-    return Generator.mShader;
-}

UI/CMaterialEditor.cpp

@@ -1,14 +0,0 @@
-#include "CMaterialEditor.h"
-#include "ui_CMaterialEditor.h"
-
-CMaterialEditor::CMaterialEditor(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::CMaterialEditor)
-{
-    ui->setupUi(this);
-}
-
-CMaterialEditor::~CMaterialEditor()
-{
-    delete ui;
-}

UI/CMaterialEditor.h

@@ -1,22 +0,0 @@
-#ifndef CMATERIALEDITOR_H
-#define CMATERIALEDITOR_H
-
-#include <QDialog>
-
-namespace Ui {
-class CMaterialEditor;
-}
-
-class CMaterialEditor : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit CMaterialEditor(QWidget *parent = 0);
-    ~CMaterialEditor();
-
-private:
-    Ui::CMaterialEditor *ui;
-};
-
-#endif // CMATERIALEDITOR_H

UI/CMaterialEditor.ui

@@ -1,18 +0,0 @@
-<ui version="4.0">
- <class>CMaterialEditor</class>
- <widget class="QDialog" name="CMaterialEditor">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
- </widget>
- <resources/>
- <connections/>
-</ui>

UI/CSimpleDelegate.cpp

@@ -1,12 +0,0 @@
-#include "CSimpleDelegate.h"
-
-CSimpleDelegate::CSimpleDelegate()
-{
-
-}
-
-CSimpleDelegate::~CSimpleDelegate()
-{
-
-}
-

UI/CSimpleDelegate.h

@@ -1,12 +0,0 @@
-#ifndef CSIMPLEDELEGATE_H
-#define CSIMPLEDELEGATE_H
-
-
-class CSimpleDelegate
-{
-public:
-    CSimpleDelegate();
-    ~CSimpleDelegate();
-};
-
-#endif // CSIMPLEDELEGATE_H

UI/PWEMaterialEditor.h

@@ -1,22 +0,0 @@
-#ifndef PWEMATERIALEDITOR_H
-#define PWEMATERIALEDITOR_H
-
-#include <QDialog>
-
-namespace Ui {
-class PWEMaterialEditor;
-}
-
-class PWEMaterialEditor : public QDialog
-{
-    Q_OBJECT
-
-public:
-    explicit PWEMaterialEditor(QWidget *parent = 0);
-    ~PWEMaterialEditor();
-
-private:
-    Ui::PWEMaterialEditor *ui;
-};
-
-#endif // PWEMATERIALEDITOR_H

resources/shaders/BillboardShader.ps

@@ -0,0 +1,22 @@
+#version 330 core
+
+// Input
+in vec2 TexCoord;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform sampler2D Texture;
+uniform vec4 TintColor;
+
+// Main
+void main()
+{
+	vec4 TextureColor = texture(Texture, TexCoord);
+	if (TextureColor.a < 0.25) discard;
+	
+	PixelColor = texture(Texture, TexCoord) * TintColor;
+	PixelColor.a = 0;
+}
+

resources/shaders/BillboardShader.vs

@@ -0,0 +1,33 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+layout(location = 4) in vec2 Tex0;
+
+// Output
+out vec2 TexCoord;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 TranslateMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+uniform vec2 BillboardScale;
+
+// Main
+void main()
+{
+	mat4 MV = TranslateMtx * ViewMtx;
+	mat4 VP = mat4 (	   1,		 0,		   0, MV[0][3],
+						   0,		 1,		   0, MV[1][3],
+						   0,		 0,		   1, MV[2][3],
+					MV[3][0], MV[3][1], MV[3][2], MV[3][3]) * ProjMtx;
+	
+	gl_Position = vec4(Position,1) * vec4(BillboardScale.xy, 1, 1) * VP;
+
+	TexCoord = vec2(Tex0.x, -Tex0.y);
+}
+

resources/shaders/CollisionShader.ps

@@ -0,0 +1,17 @@
+#version 330 core
+
+// Input
+in vec2 TexCoord;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform sampler2D Texture;
+uniform vec4 TintColor;
+
+// Main
+void main()
+{
+	PixelColor = vec4(texture(Texture, TexCoord).rgb, 0) * TintColor;
+}

resources/shaders/CollisionShader.vs

@@ -0,0 +1,28 @@
+// This shader will be obsoleted soon when the collision rendering is improved
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+
+// Output
+out vec2 TexCoord;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 ModelMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+// Main
+void main()
+{
+	mat4 MVP = ModelMtx * ViewMtx * ProjMtx;
+	gl_Position = vec4(Position, 1) * MVP;
+	
+	// UV Generation
+	float avg = (Position.x + Position.z) / 2;
+	TexCoord.x = avg;
+	TexCoord.y = Position.y + (avg / 2);
+}

resources/shaders/ColorShader.ps

@@ -0,0 +1,13 @@
+#version 330 core
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform vec4 ColorIn;
+
+// Main
+void main()
+{
+	PixelColor = ColorIn;
+}

resources/shaders/ColorShader.vs

@@ -0,0 +1,19 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 ModelMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+// Main
+void main()
+{
+	mat4 MVP = ModelMtx * ViewMtx * ProjMtx;
+	gl_Position = vec4(Position, 1) * MVP;
+};

resources/shaders/ColorShaderLighting.ps

@@ -0,0 +1,16 @@
+#version 330 core
+
+// Input
+in vec4 COLOR0A0;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform vec4 ColorIn;
+
+// Main
+void main()
+{
+    PixelColor = ColorIn * COLOR0A0;
+}

resources/shaders/ColorShaderLighting.vs

@@ -0,0 +1,69 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 RawPosition;
+layout(location = 1) in vec3 RawNormal;
+
+// Output
+out vec4 COLOR0A0;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 ModelMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+layout(std140) uniform VertexBlock
+{
+    mat4 TexMtx[10];
+    mat4 PostMtx[20];
+    vec4 COLOR0_Amb;
+    vec4 COLOR0_Mat;
+    vec4 COLOR1_Amb;
+    vec4 COLOR1_Mat;
+};
+
+struct SGXLight
+{
+    vec4 Position;
+    vec4 Direction;
+    vec4 Color;
+    vec4 DistAtten;
+    vec4 AngleAtten;
+};
+layout(std140) uniform LightBlock {
+    SGXLight Lights[8];
+};
+uniform int NumLights;
+
+// Main
+void main()
+{
+    mat4 MVP = ModelMtx * ViewMtx * ProjMtx;
+    mat4 MV = ModelMtx * ViewMtx;
+    gl_Position = vec4(RawPosition, 1) * MVP;
+    vec3 Normal = normalize(RawNormal.xyz * inverse(transpose(mat3(MV))));
+
+    // Dynamic Lighting
+    vec4 Illum = vec4(0.0);
+    vec3 PositionMV = vec3(vec4(RawPosition, 1.0) * MV);
+    
+    for (int iLight = 0; iLight < NumLights; iLight++)
+    {
+        vec3 LightPosMV = vec3(Lights[iLight].Position * ViewMtx);
+        vec3 LightDirMV = normalize(Lights[iLight].Direction.xyz * inverse(transpose(mat3(ViewMtx))));
+        vec3 LightDist = LightPosMV.xyz - PositionMV.xyz;
+        float DistSquared = dot(LightDist, LightDist);
+        float Dist = sqrt(DistSquared);
+        LightDist /= Dist;
+        vec3 AngleAtten = Lights[iLight].AngleAtten.xyz;
+        AngleAtten = vec3(AngleAtten.x, AngleAtten.y, AngleAtten.z);
+        float Atten = max(0, dot(LightDist, LightDirMV.xyz));
+        Atten = max(0, dot(AngleAtten, vec3(1.0, Atten, Atten * Atten))) / dot(Lights[iLight].DistAtten.xyz, vec3(1.0, Dist, DistSquared));
+        float DiffuseAtten = max(0, dot(Normal, LightDist));
+        Illum += (Atten * DiffuseAtten * Lights[iLight].Color);
+    }
+    COLOR0A0 = COLOR0_Mat * (Illum + COLOR0_Amb);
+};

resources/shaders/LightBillboardShader.ps

@@ -0,0 +1,28 @@
+#version 330 core
+
+// Input
+in vec2 TexCoord;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform sampler2D Texture;
+uniform sampler2D LightMask;
+uniform vec4 LightColor;
+uniform vec4 TintColor;
+
+// Main
+void main()
+{
+	vec4 TextureColor = texture(Texture, TexCoord);
+	if (TextureColor.a < 0.25) discard;
+	
+	vec4 MaskColor = texture(LightMask, TexCoord);
+	float MaskValue = (MaskColor.r + MaskColor.g + MaskColor.b) / 3;
+	vec4 MaskedColor = mix(vec4(1,1,1,1), LightColor, MaskValue);
+	
+	PixelColor = TextureColor * MaskedColor * TintColor;
+	PixelColor.a = 0;
+}
+

resources/shaders/LightBillboardShader.vs

@@ -0,0 +1,33 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+layout(location = 4) in vec2 Tex0;
+
+// Output
+out vec2 TexCoord;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 TranslateMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+uniform vec2 BillboardScale;
+
+// Main
+void main()
+{
+	mat4 MV = TranslateMtx * ViewMtx;
+	mat4 VP = mat4 (	   1,		 0,		   0, MV[0][3],
+						   0,		 1,		   0, MV[1][3],
+						   0,		 0,		   1, MV[2][3],
+					MV[3][0], MV[3][1], MV[3][2], MV[3][3]) * ProjMtx;
+	
+	gl_Position = vec4(Position,1) * vec4(BillboardScale.xy, 1, 1) * VP;
+
+	TexCoord = vec2(Tex0.x, -Tex0.y);
+}
+

resources/shaders/TextShader.ps

@@ -0,0 +1,27 @@
+#version 330 core
+
+// Input
+in vec2 TexCoord;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform int RGBALayer;
+uniform vec4 FontColor;
+uniform sampler2D Texture;
+
+// Main
+void main()
+{
+	switch (RGBALayer)
+	{
+	case 0x0: PixelColor = texture(Texture, TexCoord).rrrr; break;
+	case 0x1: PixelColor = texture(Texture, TexCoord).gggg; break;
+	case 0x2: PixelColor = texture(Texture, TexCoord).bbbb; break;
+	case 0x3: PixelColor = texture(Texture, TexCoord).aaaa; break;
+	default:  PixelColor = vec4(0,0,0,0); break;
+	}
+	
+	PixelColor *= FontColor;
+}

resources/shaders/TextShader.vs

@@ -0,0 +1,18 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+layout(location = 4) in vec2 Tex0;
+
+// Output
+out vec2 TexCoord;
+
+// Uniforms
+uniform mat4 ModelMtx;
+
+// Main
+void main()
+{
+	gl_Position = vec4(Position, 1) * ModelMtx;
+	TexCoord = Tex0;
+}

resources/shaders/TextureShader.ps

@@ -0,0 +1,17 @@
+#version 330 core
+
+// Input
+in vec2 TexCoord;
+
+// Output
+out vec4 PixelColor;
+
+// Uniforms
+uniform sampler2D Texture;
+uniform vec4 TintColor;
+
+// Main
+void main()
+{
+	PixelColor = texture(Texture, TexCoord) * TintColor;
+}

resources/shaders/TextureShader.vs

@@ -0,0 +1,24 @@
+#version 330 core
+
+// Input
+layout(location = 0) in vec3 Position;
+layout(location = 4) in vec2 Tex0;
+
+// Output
+out vec2 TexCoord;
+
+// Uniforms
+layout(std140) uniform MVPBlock
+{
+	mat4 ModelMtx;
+	mat4 ViewMtx;
+	mat4 ProjMtx;
+};
+
+// Main
+void main()
+{
+	mat4 MVP = ModelMtx * ViewMtx * ProjMtx;
+	gl_Position = vec4(Position, 1) * MVP;
+	TexCoord = Tex0;
+};

src/Common/Common.pro

@@ -0,0 +1,95 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2015-12-13T15:27:18
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+CONFIG += staticlib
+TEMPLATE = lib
+DESTDIR = $$PWD/../../build/Common
+
+unix {
+    target.path = /usr/lib
+    INSTALLS += target
+}
+
+CONFIG (debug, debug|release) {
+    # Debug Config
+    OBJECTS_DIR = $$PWD/../../build/Common/debug
+    TARGET = Commond
+
+    # Debug Libs
+    LIBS += -L$$PWD/../../externals/FileIO/lib/ -lFileIOd
+}
+
+CONFIG (release, debug|release) {
+    # Release Config
+    OBJECTS_DIR = $$PWD/../../build/Common/release
+    TARGET = Common
+
+    # Release Libs
+    LIBS += -L$$PWD/../../externals/FileIO/lib/ -lFileIO
+}
+
+# Debug/Release Libs
+LIBS += -L$$PWD/../../externals/lzo-2.08/lib -llzo-2.08 \
+        -L$$PWD/../../externals/zlib/lib -lzdll \
+
+# Include Paths
+INCLUDEPATH += $$PWD/.. \
+               $$PWD/../../externals/FileIO/include \
+               $$PWD/../../externals/glm/glm \
+               $$PWD/../../externals/lzo-2.08/include \
+               $$PWD/../../externals/zlib/include
+
+# Source Files
+HEADERS += \
+    AnimUtil.h \
+    CColor.h \
+    CFourCC.h \
+    CHashFNV1A.h \
+    CompressionUtil.h \
+    CTimer.h \
+    CUniqueID.h \
+    EKeyInputs.h \
+    EMouseInputs.h \
+    EnumUtil.h \
+    ETransformSpace.h \
+    TString.h \
+    types.h \
+    Math/CAABox.h \
+    Math/CFrustumPlanes.h \
+    Math/CMatrix4f.h \
+    Math/CPlane.h \
+    Math/CQuaternion.h \
+    Math/CRay.h \
+    Math/CTransform4f.h \
+    Math/CVector2f.h \
+    Math/CVector2i.h \
+    Math/CVector3f.h \
+    Math/CVector4f.h \
+    Math/Math.h
+
+SOURCES += \
+    AnimUtil.cpp \
+    CColor.cpp \
+    CFourCC.cpp \
+    CHashFNV1A.cpp \
+    CompressionUtil.cpp \
+    CTimer.cpp \
+    CUniqueID.cpp \
+    TString.cpp \
+    Math/CAABox.cpp \
+    Math/CFrustumPlanes.cpp \
+    Math/CMatrix4f.cpp \
+    Math/CPlane.cpp \
+    Math/CQuaternion.cpp \
+    Math/CRay.cpp \
+    Math/CTransform4f.cpp \
+    Math/CVector2f.cpp \
+    Math/CVector2i.cpp \
+    Math/CVector3f.cpp \
+    Math/CVector4f.cpp \
+    Math/Math.cpp