[shaderz] r31 committed - Shader parameter pass2...
sha...@googlecode.com
Author: vijay.michaeljoseph
Date: Mon Sep 20 19:28:16 2010
Log: Shader parameter pass2
Crude UI elements filled in.
* Added functionality for displaying UI widgets corresponding to type of
shader parameter.
* Implemented the color button for selection of custom color.
http://code.google.com/p/shaderz/source/detail?r=31
Modified:
/trunk/include/qt/qtshaderparameterwidget.h
/trunk/shaderz.xcodeproj/project.pbxproj
/trunk/shaderz.xcodeproj/vijayjoseph.mode1v3
/trunk/shaderz.xcodeproj/vijayjoseph.pbxuser
/trunk/src/qt/qtmainwindow.cpp
/trunk/src/qt/qtmaterialinfowidget.cpp
/trunk/src/qt/qtshaderparameterwidget.cpp
=======================================
--- /trunk/include/qt/qtshaderparameterwidget.h Sat Sep 18 19:34:58 2010
+++ /trunk/include/qt/qtshaderparameterwidget.h Mon Sep 20 19:28:16 2010
@@ -2,7 +2,7 @@
* qtshaderparameterwidget.h
* shaderz
*
- * Base class for all shader parameter widgets
+ * Classes for all shader parameter widgets
*
* Created by Vijay Michael Joseph on 9/15/10.
* EMail: shade...@googlegroups.com
@@ -13,6 +13,7 @@
#define __QT_SHADERZ_PARAMETER_WIDGET_H__
#include <QWidget>
+ #include <QPushButton>
#include <vector>
#include "shshaderinterface.h"
@@ -86,9 +87,6 @@
virtual std::vector<float> getValueFloat() const;
- public slots:
- virtual void OnClickedColor();
-
protected:
virtual QWidget* internalCreateWidget();
@@ -96,6 +94,22 @@
typedef qtShaderParameterWidget ParentClass;
};
+
+ ///////////////////////////////////////
+ // Push button for inputting color
+ class qtShaderParamColorButton : public QPushButton
+ {
+ Q_OBJECT
+
+ public:
+ qtShaderParamColorButton( QString InCaption, QWidget* InParent);
+
+ public slots:
+ virtual void onClicked();
+
+ private:
+ typedef QPushButton ParentClass;
+ };
}
#endif
=======================================
--- /trunk/shaderz.xcodeproj/project.pbxproj Sat Sep 18 19:34:58 2010
+++ /trunk/shaderz.xcodeproj/project.pbxproj Mon Sep 20 19:28:16 2010
@@ -14,7 +14,7 @@
4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = qtmaterialinfowidget.h; sourceTree = "<group>"; };
4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = qtmaterialinfowidget.cpp; sourceTree = "<group>"; };
497754BC1234571000F4DCE4 /* osgnvcg1.cg */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; name = osgnvcg1.cg; path =
data/osgnvcg1.cg; sourceTree = "<group>"; };
- 49880E5912459B5A00AC87B9 /* ShaderExec.app */ = {isa = PBXFileReference;
explicitFileType = wrapper.application; includeInIndex = 0; name =
ShaderExec.app; path = build/Debug/ShaderExec.app; sourceTree = "<group>";
};
+ 49880E5912459B5A00AC87B9 /* ShaderExec.app */ = {isa = PBXFileReference;
explicitFileType = wrapper.application; includeInIndex = 0; path =
ShaderExec.app; sourceTree = BUILT_PRODUCTS_DIR; };
49880E5C12459B5A00AC87B9 /* ShaderExec-Info.plist */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.xml; path
= "ShaderExec-Info.plist"; sourceTree = "<group>"; };
49C717A81233984000171C0E /* shshaderinterface.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = shshaderinterface.h; sourceTree = "<group>"; };
49C717A91233986000171C0E /* shshaderinterface.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = shshaderinterface.cpp; sourceTree = "<group>"; };
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Sat Sep 18 19:34:58 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Mon Sep 20 19:28:16 2010
@@ -281,12 +281,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>1</integer>
+ <integer>9</integer>
+ <integer>5</integer>
+ <integer>4</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 0}, {186, 338}}</string>
+ <string>{{0, 65}, {186, 338}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -386,9 +388,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>49880E6212459B8800AC87B9</string>
+ <string>4940D6AD1246319E0025E262</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>49880E6312459B8800AC87B9</string>
+ <string>4940D6AE1246319E0025E262</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -522,9 +524,7 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>1C78EAAD065D492600B07095</string>
- <string>1CD10A99069EF8BA00B06720</string>
- <string>49880E7212459B8800AC87B9</string>
+ <string>4940D6B112463F640025E262</string>
<string>/Users/vijayjoseph/projects/shaderz/shaderz.xcodeproj</string>
</array>
<key>WindowString</key>
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Sat Sep 18 19:34:58 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Mon Sep 20 19:28:16 2010
@@ -8,247 +8,6 @@
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
- 490BCD231244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 51";
- rLen = 0;
- rLoc = 2546;
- rType = 0;
- vrLen = 1061;
- vrLoc = 0;
- };
- 490BCD241244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 51";
- rLen = 0;
- rLoc = 2546;
- rType = 0;
- vrLen = 1120;
- vrLoc = 50;
- };
- 490BCD271244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 21";
- rLen = 0;
- rLoc = 378;
- rType = 0;
- vrLen = 1085;
- vrLoc = 33;
- };
- 490BCD281244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 22";
- rLen = 0;
- rLoc = 378;
- rType = 0;
- vrLen = 1116;
- vrLoc = 3;
- };
- 490BCD2B1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 80";
- rLen = 4;
- rLoc = 2273;
- rType = 0;
- vrLen = 1524;
- vrLoc = 1398;
- };
- 490BCD2C1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 20";
- rLen = 24;
- rLoc = 540;
- rType = 0;
- vrLen = 1147;
- vrLoc = 117;
- };
- 490BCD2D1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 102";
- rLen = 0;
- rLoc = 3098;
- rType = 0;
- vrLen = 1204;
- vrLoc = 1744;
- };
- 490BCD2E1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 103";
- rLen = 0;
- rLoc = 3341;
- rType = 0;
- vrLen = 1224;
- vrLoc = 1747;
- };
- 490BCD2F1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 106";
- rLen = 0;
- rLoc = 2650;
- rType = 0;
- vrLen = 1225;
- vrLoc = 2035;
- };
- 490BCD301244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 106";
- rLen = 0;
- rLoc = 2650;
- rType = 0;
- vrLen = 1225;
- vrLoc = 2035;
- };
- 490BCD311244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 10";
- rLen = 0;
- rLoc = 150;
- rType = 0;
- vrLen = 1057;
- vrLoc = 3;
- };
- 490BCD321244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 27";
- rLen = 18;
- rLoc = 536;
- rType = 0;
- vrLen = 1118;
- vrLoc = 0;
- };
- 490BCD331244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 19";
- rLen = 0;
- rLoc = 327;
- rType = 0;
- vrLen = 720;
- vrLoc = 0;
- };
- 490BCD341244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 37";
- rLen = 15;
- rLoc = 656;
- rType = 0;
- vrLen = 706;
- vrLoc = 22;
- };
- 490BCD351244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 87";
- rLen = 0;
- rLoc = 2219;
- rType = 0;
- vrLen = 1281;
- vrLoc = 1525;
- };
- 490BCD361244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCD371244A77100ED1410 /* shshaderprogram.h */;
- name = "shshaderprogram.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1394;
- vrLoc = 356;
- };
- 490BCD371244A77100ED1410 /* shshaderprogram.h */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- name = shshaderprogram.h;
- path = /Users/vijayjoseph/projects/shaderz/old/inc/shshaderprogram.h;
- sourceTree = "<absolute>";
- };
- 490BCD381244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCD391244A77100ED1410 /* Program */;
- name = "Program: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1839;
- vrLoc = 2558;
- };
- 490BCD391244A77100ED1410 /* Program */ = {
- isa = PBXFileReference;
- lastKnownFileType = text;
- name = Program;
- path =
/Users/vijayjoseph/projects/shaderz/external/build/osgnv/include/osgNVCg/Program;
- sourceTree = "<absolute>";
- };
- 490BCD3A1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
- name = "qtshaderzviewwidget.cpp: 5";
- rLen = 0;
- rLoc = 84;
- rType = 0;
- vrLen = 1034;
- vrLoc = 0;
- };
- 490BCD3B1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
- name = "qtshaderzviewwidget.h: 6";
- rLen = 0;
- rLoc = 104;
- rType = 0;
- vrLen = 854;
- vrLoc = 0;
- };
- 490BCD3C1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 36";
- rLen = 0;
- rLoc = 748;
- rType = 0;
- vrLen = 1173;
- vrLoc = 844;
- };
- 490BCD3D1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- name = "qtmaterialinfowidget.h: 20";
- rLen = 0;
- rLoc = 400;
- rType = 0;
- vrLen = 930;
- vrLoc = 24;
- };
- 490BCD3E1244A77100ED1410 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCD3F1244A77100ED1410 /* shmaterialeditordialog.cpp */;
- name = "shmaterialeditordialog.cpp: 32";
- rLen = 326;
- rLoc = 792;
- rType = 0;
- vrLen = 1357;
- vrLoc = 184;
- };
- 490BCD3F1244A77100ED1410 /* shmaterialeditordialog.cpp */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.cpp;
- name = shmaterialeditordialog.cpp;
- path =
/Users/vijayjoseph/projects/shaderz/old/src/shmaterialeditordialog.cpp;
- sourceTree = "<absolute>";
- };
493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {890, 1616}}";
@@ -257,125 +16,6 @@
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
- 493DCC661242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 87";
- rLen = 0;
- rLoc = 2219;
- rType = 0;
- vrLen = 1282;
- vrLoc = 1525;
- };
- 493DCC671242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC681242174100FCFD87 /* shshaderprogram.h */;
- name = "shshaderprogram.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1394;
- vrLoc = 356;
- };
- 493DCC681242174100FCFD87 /* shshaderprogram.h */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.h;
- name = shshaderprogram.h;
- path = /Users/vijayjoseph/projects/shaderz/old/inc/shshaderprogram.h;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {918, 832}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{356, 1394}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
- 493DCC691242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC6A1242174100FCFD87 /* Program */;
- name = "Program: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1839;
- vrLoc = 2558;
- };
- 493DCC6A1242174100FCFD87 /* Program */ = {
- isa = PBXFileReference;
- lastKnownFileType = text;
- name = Program;
- path =
/Users/vijayjoseph/projects/shaderz/external/build/osgnv/include/osgNVCg/Program;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {743, 5152}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{2558, 1839}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
- 493DCC6B1242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
- name = "qtshaderzviewwidget.cpp: 5";
- rLen = 0;
- rLoc = 84;
- rType = 0;
- vrLen = 1034;
- vrLoc = 0;
- };
- 493DCC6C1242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
- name = "qtshaderzviewwidget.h: 6";
- rLen = 0;
- rLoc = 104;
- rType = 0;
- vrLen = 854;
- vrLoc = 0;
- };
- 493DCC6E1242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 36";
- rLen = 0;
- rLoc = 748;
- rType = 0;
- vrLen = 1174;
- vrLoc = 844;
- };
- 493DCC701242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- name = "qtmaterialinfowidget.h: 20";
- rLen = 0;
- rLoc = 400;
- rType = 0;
- vrLen = 930;
- vrLoc = 24;
- };
- 493DCC721242174100FCFD87 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC731242174100FCFD87 /* shmaterialeditordialog.cpp */;
- name = "shmaterialeditordialog.cpp: 32";
- rLen = 326;
- rLoc = 792;
- rType = 0;
- vrLen = 1357;
- vrLoc = 184;
- };
- 493DCC731242174100FCFD87 /* shmaterialeditordialog.cpp */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.cpp.cpp;
- name = shmaterialeditordialog.cpp;
- path =
/Users/vijayjoseph/projects/shaderz/old/src/shmaterialeditordialog.cpp;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1058, 768}}";
- sepNavSelRange = "{792, 326}";
- sepNavVisRange = "{184, 1357}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
4970EDF0123925BB0043F7B1 /* shmaterial.cpp */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1016, 1696}}";
@@ -394,9 +34,9 @@
};
4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {981, 752}}";
+ sepNavIntBoundsRect = "{{0, 0}, {981, 736}}";
sepNavSelRange = "{400, 0}";
- sepNavVisRange = "{24, 930}";
+ sepNavVisRange = "{36, 920}";
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
@@ -416,10 +56,6 @@
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
- 49880E3D1245942400AC87B9 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
- };
49880E5812459B5A00AC87B9 /* ShaderExec */ = {
activeExec = 0;
executables = (
@@ -433,7 +69,7 @@
argumentStrings = (
);
autoAttachOnCrash = 1;
- breakpointsEnabled = 1;
+ breakpointsEnabled = 0;
configStateDict = {
};
customDataFormattersEnabled = 1;
@@ -449,8558 +85,6 @@
sourceDirectories = (
);
};
- 49880E6412459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 102";
- rLen = 0;
- rLoc = 3050;
- rType = 0;
- vrLen = 1260;
- vrLoc = 1794;
- };
- 49880E6512459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 102";
- rLen = 0;
- rLoc = 3050;
- rType = 0;
- vrLen = 1260;
- vrLoc = 1794;
- };
- 49880E6812459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E6912459B8800AC87B9 /* flags.make */;
- rLen = 0;
- rLoc = 2147483650;
- rType = 0;
- };
- 49880E6912459B8800AC87B9 /* flags.make */ = {
- isa = PBXFileReference;
- lastKnownFileType = text;
- name = flags.make;
- path =
/Users/vijayjoseph/projects/shaderz/build/CMakeFiles/shaderz.dir/flags.make;
- sourceTree = "<absolute>";
- };
- 49880E6A12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E6B12459B8800AC87B9 /* flags.make */;
- name = "flags.make: 5";
- rLen = 0;
- rLoc = 146;
- rType = 0;
- vrLen = 604;
- vrLoc = 0;
- };
- 49880E6B12459B8800AC87B9 /* flags.make */ = {
- isa = PBXFileReference;
- name = flags.make;
- path =
/Users/vijayjoseph/projects/shaderz/build/CMakeFiles/shaderz.dir/flags.make;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {2878, 646}}";
- sepNavSelRange = "{601, 0}";
- sepNavVisRange = "{0, 601}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
- 49880E6E12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E6F12459B8800AC87B9 /* build.make */;
- rLen = 0;
- rLoc = 2147483647;
- rType = 0;
- };
- 49880E6F12459B8800AC87B9 /* build.make */ = {
- isa = PBXFileReference;
- lastKnownFileType = text;
- name = build.make;
- path =
/Users/vijayjoseph/projects/shaderz/build/CMakeFiles/shaderz.dir/build.make;
- sourceTree = "<absolute>";
- };
- 49880E7012459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7112459B8800AC87B9 /* build.make */;
- name = "build.make: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 2428;
- vrLoc = 955;
- };
- 49880E7112459B8800AC87B9 /* build.make */ = {
- isa = PBXFileReference;
- name = build.make;
- path =
/Users/vijayjoseph/projects/shaderz/build/CMakeFiles/shaderz.dir/build.make;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1065, 6912}}";
- sepNavSelRange = "{29409, 0}";
- sepNavVisRange = "{2419, 2992}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
- 49880E7412459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7512459B8800AC87B9 /* Makefile */;
- rLen = 0;
- rLoc = 2147483647;
- rType = 0;
- };
- 49880E7512459B8800AC87B9 /* Makefile */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.make;
- name = Makefile;
- path = /Users/vijayjoseph/projects/shaderz/Makefile;
- sourceTree = "<absolute>";
- };
- 49880E7612459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7712459B8800AC87B9 /* Makefile */;
- name = "Makefile: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1384;
- vrLoc = 6306;
- };
- 49880E7712459B8800AC87B9 /* Makefile */ = {
- isa = PBXFileReference;
- name = Makefile;
- path = /Users/vijayjoseph/projects/shaderz/Makefile;
- sourceTree = "<absolute>";
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1079, 4768}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{6306, 1384}";
- sepNavWindowFrame = "{{15, -1}, {802, 774}}";
- };
- };
- 49880E7812459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 13";
- rLen = 0;
- rLoc = 318;
- rType = 0;
- vrLen = 1081;
- vrLoc = 0;
- };
- 49880E7912459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 44";
- rLen = 0;
- rLoc = 2546;
- rType = 0;
- vrLen = 1091;
- vrLoc = 619;
- };
- 49880E7A12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 106";
- rLen = 0;
- rLoc = 2650;
- rType = 0;
- vrLen = 1295;
- vrLoc = 529;
- };
- 49880E7B12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 106";
- rLen = 0;
- rLoc = 2650;
- rType = 0;
- vrLen = 1305;
- vrLoc = 232;
- };
- 49880E7C12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 21";
- rLen = 24;
- rLoc = 572;
- rType = 0;
- vrLen = 1811;
- vrLoc = 1554;
- };
- 49880E7D12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 21";
- rLen = 24;
- rLoc = 572;
- rType = 0;
- vrLen = 1811;
- vrLoc = 1554;
- };
- 49880E7E12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 36";
- rLen = 0;
- rLoc = 1062;
- rType = 0;
- vrLen = 1233;
- vrLoc = 239;
- };
- 49880E7F12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 56";
- rLen = 20;
- rLoc = 1578;
- rType = 0;
- vrLen = 1261;
- vrLoc = 400;
- };
- 49880E8212459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
- name = "osgnvcg1.cg: 22";
- rLen = 0;
- rLoc = 363;
- rType = 0;
- vrLen = 937;
- vrLoc = 97;
- };
- 49880E8312459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 27";
- rLen = 18;
- rLoc = 536;
- rType = 0;
- vrLen = 1118;
- vrLoc = 0;
- };
- 49880E8412459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 37";
- rLen = 15;
- rLoc = 656;
- rType = 0;
- vrLen = 706;
- vrLoc = 22;
- };
- 49880E8512459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 87";
- rLen = 0;
- rLoc = 2219;
- rType = 0;
- vrLen = 1281;
- vrLoc = 1525;
- };
- 49880E8612459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC681242174100FCFD87 /* shshaderprogram.h */;
- name = "shshaderprogram.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1394;
- vrLoc = 356;
- };
- 49880E8712459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC6A1242174100FCFD87 /* Program */;
- name = "Program: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1839;
- vrLoc = 2558;
- };
- 49880E8812459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
- name = "qtshaderzviewwidget.cpp: 5";
- rLen = 0;
- rLoc = 84;
- rType = 0;
- vrLen = 1034;
- vrLoc = 0;
- };
- 49880E8912459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
- name = "qtshaderzviewwidget.h: 6";
- rLen = 0;
- rLoc = 104;
- rType = 0;
- vrLen = 854;
- vrLoc = 0;
- };
- 49880E8A12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 36";
- rLen = 0;
- rLoc = 748;
- rType = 0;
- vrLen = 1173;
- vrLoc = 844;
- };
- 49880E8B12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- name = "qtmaterialinfowidget.h: 20";
- rLen = 0;
- rLoc = 400;
- rType = 0;
- vrLen = 930;
- vrLoc = 24;
- };
- 49880E8C12459B8800AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC731242174100FCFD87 /* shmaterialeditordialog.cpp */;
- name = "shmaterialeditordialog.cpp: 32";
- rLen = 326;
- rLoc = 792;
- rType = 0;
- vrLen = 1357;
- vrLoc = 184;
- };
- 49880E8E12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
- name = "osgnvcg1.cg: 22";
- rLen = 0;
- rLoc = 363;
- rType = 0;
- vrLen = 937;
- vrLoc = 97;
- };
- 49880E8F12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
- name = "osgnvcg1.cg: 19";
- rLen = 0;
- rLoc = 315;
- rType = 0;
- vrLen = 938;
- vrLoc = 97;
- };
- 49880E9012459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 102";
- rLen = 0;
- rLoc = 3050;
- rType = 0;
- vrLen = 1260;
- vrLoc = 1794;
- };
- 49880E9112459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E6B12459B8800AC87B9 /* flags.make */;
- name = "flags.make: 5";
- rLen = 0;
- rLoc = 146;
- rType = 0;
- vrLen = 604;
- vrLoc = 0;
- };
- 49880E9212459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7112459B8800AC87B9 /* build.make */;
- name = "build.make: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 2428;
- vrLoc = 955;
- };
- 49880E9312459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7712459B8800AC87B9 /* Makefile */;
- name = "Makefile: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1384;
- vrLoc = 6306;
- };
- 49880E9412459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 44";
- rLen = 0;
- rLoc = 2546;
- rType = 0;
- vrLen = 1091;
- vrLoc = 619;
- };
- 49880E9512459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 106";
- rLen = 0;
- rLoc = 2650;
- rType = 0;
- vrLen = 1305;
- vrLoc = 232;
- };
- 49880E9612459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 21";
- rLen = 24;
- rLoc = 572;
- rType = 0;
- vrLen = 1811;
- vrLoc = 1554;
- };
- 49880E9712459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
- name = "qtshaderparameterwidget.h: 56";
- rLen = 20;
- rLoc = 1578;
- rType = 0;
- vrLen = 1261;
- vrLoc = 400;
- };
- 49880E9812459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 27";
- rLen = 18;
- rLoc = 536;
- rType = 0;
- vrLen = 1118;
- vrLoc = 0;
- };
- 49880E9912459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 37";
- rLen = 15;
- rLoc = 656;
- rType = 0;
- vrLen = 706;
- vrLoc = 22;
- };
- 49880E9A12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 87";
- rLen = 0;
- rLoc = 2219;
- rType = 0;
- vrLen = 1281;
- vrLoc = 1525;
- };
- 49880E9B12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC681242174100FCFD87 /* shshaderprogram.h */;
- name = "shshaderprogram.h: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1394;
- vrLoc = 356;
- };
- 49880E9C12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC6A1242174100FCFD87 /* Program */;
- name = "Program: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1839;
- vrLoc = 2558;
- };
- 49880E9D12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
- name = "qtshaderzviewwidget.cpp: 5";
- rLen = 0;
- rLoc = 84;
- rType = 0;
- vrLen = 1034;
- vrLoc = 0;
- };
- 49880E9E12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
- name = "qtshaderzviewwidget.h: 6";
- rLen = 0;
- rLoc = 104;
- rType = 0;
- vrLen = 854;
- vrLoc = 0;
- };
- 49880E9F12459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
- name = "qtmaterialinfowidget.cpp: 36";
- rLen = 0;
- rLoc = 748;
- rType = 0;
- vrLen = 1173;
- vrLoc = 844;
- };
- 49880EA012459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
- name = "qtmaterialinfowidget.h: 20";
- rLen = 0;
- rLoc = 400;
- rType = 0;
- vrLen = 930;
- vrLoc = 24;
- };
- 49880EA112459E0D00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 493DCC731242174100FCFD87 /* shmaterialeditordialog.cpp */;
- name = "shmaterialeditordialog.cpp: 32";
- rLen = 326;
- rLoc = 792;
- rType = 0;
- vrLen = 1357;
- vrLoc = 184;
- };
- 49880EA312459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 102";
- rLen = 0;
- rLoc = 3050;
- rType = 0;
- vrLen = 1260;
- vrLoc = 1794;
- };
- 49880EA412459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 104";
- rLen = 0;
- rLoc = 3183;
- rType = 0;
- vrLen = 1260;
- vrLoc = 1794;
- };
- 49880EA512459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
- name = "osgnvcg1.cg: 19";
- rLen = 0;
- rLoc = 315;
- rType = 0;
- vrLen = 937;
- vrLoc = 97;
- };
- 49880EA612459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E6B12459B8800AC87B9 /* flags.make */;
- name = "flags.make: 5";
- rLen = 0;
- rLoc = 146;
- rType = 0;
- vrLen = 604;
- vrLoc = 0;
- };
- 49880EA712459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7112459B8800AC87B9 /* build.make */;
- name = "build.make: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 2428;
- vrLoc = 955;
- };
- 49880EA812459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 49880E7712459B8800AC87B9 /* Makefile */;
- name = "Makefile: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1384;
- vrLoc = 6306;
- };
- 49880EA912459E5B00AC87B9 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
- name = "qtshaderparameterwidget.cpp: 44";
- rLen = 0;
- rLoc = 2546;
- rType = 0;
- vrLen = 1091;
- vrLoc = 619;
- };
- 49880EAA12459E5B00AC87B9 /* PBXTextBookmark */ = {
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/src/qt/qtmainwindow.cpp Sat Sep 18 19:34:58 2010
+++ /trunk/src/qt/qtmainwindow.cpp Mon Sep 20 19:28:16 2010
@@ -103,17 +103,4 @@
{
LOG<<"Failed to set shader on model. Check to see if OSG_FILE_PATH is
set and the default model is located at that location.\n";
}
-
- // test parameter
- shShaderInterface::shShaderParameter dummy;
- dummy.paramClass = SH_PARAMETERCLASS_MATRIX;
- dummy.paramType = SH_PARAMETERTYPE_FLOAT;
- dummy.semantic = SH_PARAMETERSEMANTIC_COLOR;
- dummy.rows = 5;
- dummy.columns = 3;
- qtShaderParameterWidget* newWidget =
qtShaderParameterWidget::create(this, dummy);
- if( newWidget )
- {
- layout()->addWidget( newWidget );
- }
-}
+}
=======================================
--- /trunk/src/qt/qtmaterialinfowidget.cpp Fri Sep 10 23:40:37 2010
+++ /trunk/src/qt/qtmaterialinfowidget.cpp Mon Sep 20 19:28:16 2010
@@ -7,14 +7,15 @@
*
*/
-#include "qt/qtmaterialinfowidget.h"
-#include "shmaterial.h"
-#include "shlogger.h"
-
#include <QVBoxLayout>
#include <QLabel>
#include <QTreeWidget>
+#include "qt/qtmaterialinfowidget.h"
+#include "qt/qtshaderparameterwidget.h"
+#include "shmaterial.h"
+#include "shlogger.h"
+
using namespace Shaderz;
qtMaterialInfoWidget::qtMaterialInfoWidget( QWidget* pParent, shMaterial*
pMaterial )
@@ -58,6 +59,12 @@
}
m_pParamWidget->addTopLevelItem(paramItem);
+
+ qtShaderParameterWidget* paramUIElement =
qtShaderParameterWidget::create(m_pParamWidget, paramList[index]);
+ if( paramUIElement )
+ {
+ m_pParamWidget->setItemWidget( paramItem, 1, paramUIElement );
+ }
}
}
}
=======================================
--- /trunk/src/qt/qtshaderparameterwidget.cpp Sat Sep 18 19:34:58 2010
+++ /trunk/src/qt/qtshaderparameterwidget.cpp Mon Sep 20 19:28:16 2010
@@ -9,9 +9,10 @@
#include <QHBoxLayout>
#include <QGridLayout>
-#include <QComboBox>
#include <QPushButton>
#include <QLineEdit>
+#include <QColorDialog>
+#include <QCheckbox>
#include "qt/qtshaderparameterwidget.h"
#include "shlogger.h"
@@ -72,6 +73,12 @@
QWidget* pBox = internalCreateWidget();
pLayout->addWidget(pBox, 0, iRow);
m_vWidgets.push_back(pBox);
+
+ // if the param is a color, then do not create more widgets
+ if( m_ParamInfo.semantic == SH_PARAMETERSEMANTIC_COLOR )
+ {
+ break;
+ }
}
}
break;
@@ -117,10 +124,7 @@
QWidget* qtShaderParameterWidgetBool::internalCreateWidget()
{
- QComboBox* pBox = new QComboBox(this);
- pBox->addItem( QString("True") );
- pBox->addItem( QString("False") );
-
+ QCheckBox* pBox = new QCheckBox(this);
return pBox;
}
@@ -165,8 +169,7 @@
QWidget* pUIElement = 0;
if( m_ParamInfo.semantic == SH_PARAMETERSEMANTIC_COLOR )
{
- pUIElement = new QPushButton( QString("C"), this);
- connect( pUIElement, SIGNAL(clicked()), this, SLOT(OnClickedColor()) );
+ pUIElement = new qtShaderParamColorButton( QString("C"), this);
}
else
{
@@ -182,7 +185,26 @@
return std::vector<float>();
}
-void qtShaderParameterWidgetFloat::OnClickedColor()
-{
- LOG<<"Clicked something..\n";
-}
+////////////////////////////////
+// qtShaderParamColorButton
+qtShaderParamColorButton::qtShaderParamColorButton( QString InCaption,
QWidget* InParent )
+ : ParentClass( InCaption, InParent )
+{
+ setStyleSheet("* { background-color: rgb(255,255,255) }");
+ connect(this, SIGNAL(clicked()), this, SLOT(onClicked()) );
+}
+
+void qtShaderParamColorButton::onClicked()
+{
+ QColor selectedColor = QColorDialog::getColor(palette().button().color(),
this, QString("Parameter Color"));
+ if( selectedColor.isValid() )
+ {
+ QString red, green, blue;
+ red.setNum(selectedColor.red());
+ green.setNum(selectedColor.green());
+ blue.setNum(selectedColor.blue());
+ red.append(",");
+ green.append(",");
+ setStyleSheet(QString("* { background-color: rgb(") + red + green + blue
+ QString(") }") );
+ }
+}