Tested some of the Material Code. Seems to work. The project should now be following the code standard properly (hopefully).

This commit is contained in:
antc13
2015-12-10 11:18:34 +01:00
parent 74c1beed20
commit a22d086e60
9 changed files with 189 additions and 138 deletions
+16 -22
View File
@@ -1,11 +1,9 @@
#ifndef BUTTONS_H
#define BUTTONS_H
#ifndef Menu_Menu_h__
#define Menu_Menu_h__
#include <map>
#include <vector>
#include "MayaIncludes.h"
#include "Material.h"
// Qt
#pragma comment(lib, "QtCore4")
#pragma comment(lib, "QtGui4")
@@ -32,12 +30,9 @@
#include <QtGui/qlineedit.h>
#include <QtGui/qgroupbox.h>
struct VertexLayout
{
float pos[3];
float normal[3];
float uv[2];
};
#include "MayaIncludes.h"
#include "Material.h"
#include "Mesh.h"
class Menu : public QWidget
{
@@ -46,7 +41,6 @@ public:
Menu(QDialog* dialog);
~Menu();
void GetMeshData(MObject object);
void GetMaterialData();
private slots:
@@ -62,20 +56,20 @@ private slots:
private:
Menu();
QPushButton* exportSelectedButton;
QPushButton* browseButton;
QPushButton* exportAllButton;
QPushButton* cancelButton;
QPushButton* m_ExportSelectedButton = nullptr;
QPushButton* m_BrowseButton = nullptr;
QPushButton* m_ExportAllButton = nullptr;
QPushButton* m_CancelButton = nullptr;
QCheckBox* exportAnimationsButton;
QCheckBox* copyTexturesButton;
QCheckBox* button3;
QCheckBox* m_ExportAnimationsButton = nullptr;
QCheckBox* m_CopyTexturesButton = nullptr;
QCheckBox* m_Button3 = nullptr;
QLineEdit* exportPath;
QFileDialog* fileDialog;
QDialog* dialogPointer;
QLineEdit* m_ExportPath = nullptr;
QFileDialog* m_FileDialog = nullptr;
QDialog* m_DialogPointer = nullptr;
Material* MaterialHandler;
Material* m_MaterialHandler = nullptr;
};
#endif