Modified:
/trunk/CMakeLists.txt
/trunk/include/qt/qtmaterialeditor.h
/trunk/include/qt/qtmaterialpreview.h
/trunk/shaderz.xcodeproj/vijayjoseph.mode1v3
/trunk/shaderz.xcodeproj/vijayjoseph.pbxuser
/trunk/src/qt/qtmaterialeditor.cpp
/trunk/src/qt/qtmaterialpreview.cpp
=======================================
--- /trunk/CMakeLists.txt Sun Sep 26 11:43:10 2010
+++ /trunk/CMakeLists.txt Mon Sep 27 09:06:10 2010
@@ -85,6 +85,7 @@
include/qt/qtmainwindow.h
include/qt/qtshaderparameterwidget.h
include/qt/qtmaterialeditor.h
+ include/qt/qtmaterialpreview.h
)
set( FORMS )
=======================================
--- /trunk/include/qt/qtmaterialeditor.h Sun Sep 26 11:43:10 2010
+++ /trunk/include/qt/qtmaterialeditor.h Mon Sep 27 09:06:10 2010
@@ -18,6 +18,8 @@
namespace Shaderz
{
+ class qtMaterialPreview;
+
class qtMaterialEditor : public QDialog
{
Q_OBJECT
@@ -26,7 +28,19 @@
qtMaterialEditor(QWidget* InParent);
protected:
- QGroupBox* m_pMaterialPreviewContainer;
+ // assists in layout of the material preview widgets
+ void materialPreviewLayoutHepler();
+ virtual void resizeEvent(QResizeEvent* InEventInfo);
+
+ public slots:
+ virtual void onSelectedPreviewMaterialChanged(qtMaterialPreview*
newSelection);
+
+ protected:
+ QGroupBox* m_pMaterialPreviewContainer;
+ std::vector<qtMaterialPreview*> m_vMaterialPreviewInstances;
+
+ static int m_PreviewWidgetMinSize;
+ static int m_PreviewWidgetSpacing;
private:
typedef QDialog ParentClass;
=======================================
--- /trunk/include/qt/qtmaterialpreview.h Sun Sep 26 11:43:10 2010
+++ /trunk/include/qt/qtmaterialpreview.h Mon Sep 27 09:06:10 2010
@@ -23,6 +23,11 @@
*/
class qtMaterialPreview : public qtShaderzViewWidget
{
+ Q_OBJECT
+
+ signals:
+ void selected(qtMaterialPreview* selectedWidget);
+
public:
qtMaterialPreview( QWidget * pParent = 0,
const char * pName = 0,
@@ -30,10 +35,11 @@
WindowFlags f = 0,
std::string sSceneFilePath = ""
);
-
+
+ virtual void setSelected(bool bIsSelected = true);
+
protected:
virtual void drawSelectionBox(void);
- virtual void setSelected(bool bIsSelected = true);
virtual void loadScene(std::string);
virtual void setShader(shMaterial* shader);
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Sun Sep 26 11:43:10 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Mon Sep 27 09:06:10 2010
@@ -216,7 +216,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>497A431A124FC73D00FF7E76</string>
+ <string>497A431E124FCC2F00FF7E76</string>
<key>history</key>
<array>
<string>497A4311124FC60000FF7E76</string>
@@ -256,7 +256,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>497A431B124FC73D00FF7E76</string>
+ <string>497A431F124FCC2F00FF7E76</string>
<key>history</key>
<array>
<string>497A4309124FC58D00FF7E76</string>
@@ -296,7 +296,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>497A431C124FC73D00FF7E76</string>
+ <string>497A4320124FCC2F00FF7E76</string>
<key>history</key>
<array>
<string>497A430B124FC58D00FF7E76</string>
@@ -336,7 +336,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>497A431D124FC73D00FF7E76</string>
+ <string>497A4321124FCC2F00FF7E76</string>
<key>history</key>
<array>
<string>497A4301124FC4C600FF7E76</string>
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Sun Sep 26 11:43:10 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Mon Sep 27 09:06:10 2010
@@ -56,2022 +56,6 @@
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
- 497A40E3124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 65";
- rLen = 0;
- rLoc = 3022;
- rType = 0;
- vrLen = 988;
- vrLoc = 1313;
- };
- 497A40E4124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A40E5124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 48";
- rLen = 17;
- rLoc = 1728;
- rType = 0;
- vrLen = 1393;
- vrLoc = 544;
- };
- 497A40E6124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 87";
- rLen = 28;
- rLoc = 2256;
- rType = 0;
- vrLen = 1986;
- vrLoc = 2214;
- };
- 497A40E7124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A40E8124ECE9B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 22;
- rLoc = 111;
- rType = 0;
- vrLen = 1444;
- vrLoc = 8721;
- };
- 497A40E9124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 71";
- rLen = 0;
- rLoc = 3249;
- rType = 0;
- vrLen = 1071;
- vrLoc = 1313;
- };
- 497A40EA124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A40EB124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 48";
- rLen = 17;
- rLoc = 1728;
- rType = 0;
- vrLen = 1393;
- vrLoc = 544;
- };
- 497A40EC124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 87";
- rLen = 28;
- rLoc = 2256;
- rType = 0;
- vrLen = 1986;
- vrLoc = 2214;
- };
- 497A40ED124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A40EE124ECFD500FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 22;
- rLoc = 111;
- rType = 0;
- vrLen = 1444;
- vrLoc = 8721;
- };
- 497A40F7124ED3A100FF7E76 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- };
- 497A40F8124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 58";
- rLen = 0;
- rLoc = 1723;
- rType = 0;
- vrLen = 1072;
- vrLoc = 997;
- };
- 497A40F9124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 64";
- rLen = 0;
- rLoc = 1886;
- rType = 0;
- vrLen = 1454;
- vrLoc = 1134;
- };
- 497A40FC124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 87";
- rLen = 28;
- rLoc = 2256;
- rType = 0;
- vrLen = 1544;
- vrLoc = 2019;
- };
- 497A40FD124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A40FE124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A40FF124ED41C00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 22;
- rLoc = 111;
- rType = 0;
- vrLen = 1444;
- vrLoc = 8721;
- };
- 497A4100124ED42800FF7E76 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- };
- 497A4102124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 60";
- rLen = 0;
- rLoc = 1886;
- rType = 0;
- vrLen = 1495;
- vrLoc = 1137;
- };
- 497A4103124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 176";
- rLen = 0;
- rLoc = 5876;
- rType = 0;
- vrLen = 1288;
- vrLoc = 4356;
- };
- 497A4106124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 110";
- rLen = 0;
- rLoc = 3538;
- rType = 0;
- vrLen = 1372;
- vrLoc = 849;
- };
- 497A4107124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4108124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4109124ED4B200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 22;
- rLoc = 111;
- rType = 0;
- vrLen = 1444;
- vrLoc = 8721;
- };
- 497A410B124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 110";
- rLen = 0;
- rLoc = 3538;
- rType = 0;
- vrLen = 1372;
- vrLoc = 849;
- };
- 497A410C124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 23";
- rLen = 0;
- rLoc = 448;
- rType = 0;
- vrLen = 1201;
- vrLoc = 184;
- };
- 497A410D124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 176";
- rLen = 0;
- rLoc = 5876;
- rType = 0;
- vrLen = 1288;
- vrLoc = 4356;
- };
- 497A410E124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A410F124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4110124ED4E400FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 22;
- rLoc = 111;
- rType = 0;
- vrLen = 1444;
- vrLoc = 8721;
- };
- 497A4116124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 60";
- rLen = 0;
- rLoc = 1886;
- rType = 0;
- vrLen = 1506;
- vrLoc = 876;
- };
- 497A4117124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 64";
- rLen = 0;
- rLoc = 1886;
- rType = 0;
- vrLen = 1842;
- vrLoc = 876;
- };
- 497A4118124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 11";
- rLen = 0;
- rLoc = 279;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4119124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A411A124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 23";
- rLen = 0;
- rLoc = 449;
- rType = 0;
- vrLen = 1203;
- vrLoc = 184;
- };
- 497A411B124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A411C124ED5A900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A411D124ED5D700FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 64";
- rLen = 0;
- rLoc = 1886;
- rType = 0;
- vrLen = 1887;
- vrLoc = 876;
- };
- 497A411E124ED5D700FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A411F124ED5D700FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 23";
- rLen = 0;
- rLoc = 449;
- rType = 0;
- vrLen = 1203;
- vrLoc = 184;
- };
- 497A4120124ED5D700FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4121124ED5D700FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4122124ED66000FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 62";
- rLen = 0;
- rLoc = 1715;
- rType = 0;
- vrLen = 1270;
- vrLoc = 994;
- };
- 497A4123124ED66000FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4124124ED66000FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 23";
- rLen = 0;
- rLoc = 449;
- rType = 0;
- vrLen = 1203;
- vrLoc = 184;
- };
- 497A4125124ED66000FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4126124ED66000FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4127124ED69B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 63";
- rLen = 0;
- rLoc = 1812;
- rType = 0;
- vrLen = 1315;
- vrLoc = 994;
- };
- 497A4128124ED69B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4129124ED69B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 23";
- rLen = 0;
- rLoc = 449;
- rType = 0;
- vrLen = 1203;
- vrLoc = 184;
- };
- 497A412A124ED69B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A412B124ED69B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4135124ED8D100FF7E76 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- };
- 497A4136124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 66";
- rLen = 0;
- rLoc = 2035;
- rType = 0;
- vrLen = 1428;
- vrLoc = 1059;
- };
- 497A4137124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 67";
- rLen = 0;
- rLoc = 2061;
- rType = 0;
- vrLen = 2077;
- vrLoc = 999;
- };
- 497A413A124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 85";
- rLen = 38;
- rLoc = 2174;
- rType = 0;
- vrLen = 1544;
- vrLoc = 2019;
- };
- 497A413B124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 46";
- rLen = 0;
- rLoc = 1279;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A413C124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A413D124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A413E124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A413F124ED91900FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4140124ED96200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 67";
- rLen = 0;
- rLoc = 2061;
- rType = 0;
- vrLen = 1105;
- vrLoc = 3709;
- };
- 497A4141124ED96200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A4142124ED96200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4143124ED96200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4144124ED96200FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4145124ED99300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 71";
- rLen = 0;
- rLoc = 2675;
- rType = 0;
- vrLen = 2029;
- vrLoc = 1059;
- };
- 497A4146124ED99300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A4147124ED99300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4148124ED99300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4149124ED99300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A414A124EDA7B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 162";
- rLen = 0;
- rLoc = 5145;
- rType = 0;
- vrLen = 1276;
- vrLoc = 4478;
- };
- 497A414B124EDA7B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A414C124EDA7B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A414D124EDA7B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A414E124EDA7B00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A414F124EDB1D00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 231";
- rLen = 0;
- rLoc = 7267;
- rType = 0;
- vrLen = 1079;
- vrLoc = 6650;
- };
- 497A4150124EDB1D00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A4151124EDB1D00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4152124EDB1D00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4153124EDB1D00FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4154124EDB6800FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 296";
- rLen = 0;
- rLoc = 9062;
- rType = 0;
- vrLen = 1140;
- vrLoc = 7848;
- };
- 497A4155124EDB6800FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A4156124EDB6800FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A4157124EDB6800FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A4158124EDB6800FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4159124EDC0300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 166";
- rLen = 0;
- rLoc = 5173;
- rType = 0;
- vrLen = 1182;
- vrLoc = 4141;
- };
- 497A415A124EDC0300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A415B124EDC0300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A415C124EDC0300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
- };
- 497A415D124EDC0300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A415E124EDC7F00FF7E76 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- };
- 497A4161124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 166";
- rLen = 0;
- rLoc = 5173;
- rType = 0;
- vrLen = 1108;
- vrLoc = 299;
- };
- 497A4162124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 298";
- rLen = 0;
- rLoc = 9057;
- rType = 0;
- vrLen = 1158;
- vrLoc = 8279;
- };
- 497A4163124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 884;
- vrLoc = 0;
- };
- 497A4164124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 15";
- rLen = 0;
- rLoc = 284;
- rType = 0;
- vrLen = 1312;
- vrLoc = 919;
- };
- 497A4167124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- name = "qtmaterialinfowidget.h: 20";
- rLen = 0;
- rLoc = 400;
- rType = 0;
- vrLen = 874;
- vrLoc = 125;
- };
- 497A4168124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 42";
- rLen = 21;
- rLoc = 1082;
- rType = 0;
- vrLen = 1558;
- vrLoc = 585;
- };
- 497A4169124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 6";
- rLen = 41;
- rLoc = 92;
- rType = 0;
- vrLen = 1086;
- vrLoc = 0;
- };
- 497A416A124EDD5300FF7E76 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 92";
- rLen = 20;
- rLoc = 3236;
- rType = 0;
- vrLen = 1283;
- vrLoc = 165;
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/src/qt/qtmaterialeditor.cpp Sun Sep 26 11:43:10 2010
+++ /trunk/src/qt/qtmaterialeditor.cpp Mon Sep 27 09:06:10 2010
@@ -9,6 +9,7 @@
#include <QVBoxLayout>
#include <QHBoxLayout>
+#include <QGridLayout>
#include <QGroupBox>
#include "qt/qtmaterialeditor.h"
@@ -16,6 +17,9 @@
using namespace Shaderz;
+int qtMaterialEditor::m_PreviewWidgetMinSize = 150;
+int qtMaterialEditor::m_PreviewWidgetSpacing = 10;
+
qtMaterialEditor::qtMaterialEditor(QWidget* InParent)
: ParentClass(InParent)
{
@@ -23,23 +27,27 @@
// create the material preview container
m_pMaterialPreviewContainer = new QGroupBox("Material Preview", this);
+ m_pMaterialPreviewContainer->setMinimumSize(
m_PreviewWidgetMinSize+m_PreviewWidgetSpacing,
m_PreviewWidgetMinSize+m_PreviewWidgetSpacing );
vLayout->addWidget( m_pMaterialPreviewContainer );
- QHBoxLayout* containerLayout = new QHBoxLayout;
+ // create the initial lot of preview instances
+ QHBoxLayout* initialLayout = new QHBoxLayout;
int previewIndex;
- for( previewIndex=0; previewIndex < 10; ++previewIndex )
+ for( previewIndex=0; previewIndex < 6; ++previewIndex )
{
qtMaterialPreview* newPreviewWidget = new qtMaterialPreview(this);
- newPreviewWidget->setMaximumSize(50,50);
- containerLayout->addWidget( newPreviewWidget );
+ newPreviewWidget->setMaximumSize(m_PreviewWidgetMinSize,
m_PreviewWidgetMinSize);
+ m_vMaterialPreviewInstances.push_back(newPreviewWidget);
+
+ connect( newPreviewWidget, SIGNAL(selected(qtMaterialPreview*)), this,
SLOT(onSelectedPreviewMaterialChanged(qtMaterialPreview*)) );
+ initialLayout->addWidget(newPreviewWidget);
}
if( m_pMaterialPreviewContainer->layout() )
{
delete m_pMaterialPreviewContainer->layout();
}
- m_pMaterialPreviewContainer->setLayout(containerLayout);
-
-
+ m_pMaterialPreviewContainer->setLayout(initialLayout);
+
// set the new layout
if( layout() )
{
@@ -51,3 +59,51 @@
setGeometry(100, 100, 700, 500);
setWindowTitle("shaderz - Material Editor");
}
+
+void qtMaterialEditor::materialPreviewLayoutHepler()
+{
+ QGridLayout* containerLayout = new QGridLayout;
+ containerLayout->setSpacing(m_PreviewWidgetSpacing);
+
+ int nWidgetsPerRow = m_pMaterialPreviewContainer->width() /
(m_PreviewWidgetMinSize + containerLayout->spacing());
+ int currentRow;
+ int previewIndex;
+
+ // arrange the preview widgets in the grid layout so that no overflow
occurs
+ for( previewIndex=0, currentRow=0; previewIndex <
m_vMaterialPreviewInstances.size(); ++previewIndex )
+ {
+ containerLayout->addWidget( m_vMaterialPreviewInstances[previewIndex],
currentRow, previewIndex%nWidgetsPerRow );
+
+ if( (previewIndex+1) % nWidgetsPerRow == 0 )
+ {
+ currentRow++;
+ }
+ }
+
+ // set the new layout
+ if( m_pMaterialPreviewContainer->layout() )
+ {
+ delete m_pMaterialPreviewContainer->layout();
+ }
+ m_pMaterialPreviewContainer->setLayout(containerLayout);
+}
+
+void qtMaterialEditor::resizeEvent(QResizeEvent* InEventInfo)
+{
+ ParentClass::resizeEvent(InEventInfo);
+
+ materialPreviewLayoutHepler();
+}
+
+void qtMaterialEditor::onSelectedPreviewMaterialChanged(qtMaterialPreview*
newSelection)
+{
+ // make sure that all other widgets are unselected
+ int previewIndex;
+ for( previewIndex=0; previewIndex < m_vMaterialPreviewInstances.size();
++previewIndex )
+ {
+ if( m_vMaterialPreviewInstances[previewIndex] != newSelection )
+ {
+ m_vMaterialPreviewInstances[previewIndex]->setSelected(false);
+ }
+ }
+}
=======================================
--- /trunk/src/qt/qtmaterialpreview.cpp Sun Sep 26 11:43:10 2010
+++ /trunk/src/qt/qtmaterialpreview.cpp Mon Sep 27 09:06:10 2010
@@ -75,11 +75,19 @@
void qtMaterialPreview::mousePressEvent ( QMouseEvent * )
{
// not calling the parent class mouse event, as we do not want the
user to be able to manipulate the default view of the material
+
+ setSelected(true);
}
void qtMaterialPreview::setSelected(bool bIsSelected)
{
m_bIsSelected = bIsSelected;
+
+ // emit a signal if this preview widget is selected
+ if( bIsSelected )
+ {
+ emit selected(this);
+ }
}
void qtMaterialPreview::paintGL()