[shaderz] r29 committed - * Hooked up the ShaderInfo button to apply the default shader to the m...
sha...@googlecode.com
Author: vijay.michaeljoseph
Date: Sat Sep 11 19:27:35 2010
Log: * Hooked up the ShaderInfo button to apply the default shader to the
model loaded in the view widget.
* Also moved the view widget to Shaderz namespace.
Now working on getting proper UI to display for the different shader
parameters.
http://code.google.com/p/shaderz/source/detail?r=29
Modified:
/trunk/data/osgnvcg1.cg
/trunk/include/qt/qtmainwindow.h
/trunk/include/qt/qtshaderzviewwidget.h
/trunk/shaderz.xcodeproj/vijayjoseph.mode1v3
/trunk/shaderz.xcodeproj/vijayjoseph.pbxuser
/trunk/src/qt/qtmainwindow.cpp
/trunk/src/qt/qtshaderzviewwidget.cpp
/trunk/src/shmaterial.cpp
=======================================
--- /trunk/data/osgnvcg1.cg Fri Sep 10 23:40:37 2010
+++ /trunk/data/osgnvcg1.cg Sat Sep 11 19:27:35 2010
@@ -14,18 +14,15 @@
float4 HPosition : POSITION;
float4 Color : COLOR;
};
-
-float3 foo(int index)
-{
- float3 ret;
- return ret;
-}
float3 testFloat3 : COLOR;
bool testBool;
float testFloat;
+
+ float3 lightDir = {-1,-1,-1};
+
vertout main(appin IN,
- uniform float4x4 ModelViewProj,
+ uniform float4x4 ModelViewProj,
uniform float4x4 ModelViewIT,
uniform float4 LightVec)
{
=======================================
--- /trunk/include/qt/qtmainwindow.h Fri Sep 10 23:40:37 2010
+++ /trunk/include/qt/qtmainwindow.h Sat Sep 11 19:27:35 2010
@@ -15,6 +15,8 @@
namespace Shaderz
{
class qtMaterialInfoWidget;
+ class qtShaderzViewWidget;
+ class shMaterial;
class qtMainWindow : public QDialog
{
@@ -31,6 +33,8 @@
protected:
QLayout* mShaderLayout;
qtMaterialInfoWidget* mMaterialInfoWidget;
+ qtShaderzViewWidget* m_pViewWidget;
+ shMaterial* m_pTestMaterial;
private:
typedef QDialog ParentClass;
=======================================
--- /trunk/include/qt/qtshaderzviewwidget.h Sun Sep 5 01:15:27 2010
+++ /trunk/include/qt/qtshaderzviewwidget.h Sat Sep 11 19:27:35 2010
@@ -3,26 +3,30 @@
#include "osgadapterwidget.h"
-/**
- * Shaderz qt widget for displaying any scenegraph data.
- */
-class qtShaderzViewWidget : public osg::ViewerQT
-{
- public:
- qtShaderzViewWidget( QWidget * pParent = 0,
- const char * pName = 0,
- const QGLWidget * pShareWidget = 0,
- WindowFlags f = 0,
- std::string sSceneFilePath = "" // the path
of the scene data to be displayed in the view window
- );
-
- virtual void loadScene(std::string sModelFilePath);
- virtual void resizeGL(int w, int h);
-
- virtual QSize sizeHint () const { return QSize(100,100); }
- protected:
- // root node for the viewer
- osg::ref_ptr<osg::Node> m_pRoot;
-};
-
+namespace Shaderz
+{
+ /**
+ * Shaderz qt widget for displaying any scenegraph data.
+ */
+ class qtShaderzViewWidget : public osg::ViewerQT
+ {
+ public:
+ qtShaderzViewWidget( QWidget * pParent = 0,
+ const char * pName = 0,
+ const QGLWidget * pShareWidget = 0,
+ WindowFlags f = 0,
+ std::string sSceneFilePath = "" // the path of the scene data to
be displayed in the view window
+ );
+
+ virtual void loadScene(std::string sModelFilePath);
+ virtual void resizeGL(int w, int h);
+
+ osg::Node* getRoot() const { return m_pRoot; }
+ virtual QSize sizeHint () const { return QSize(100,100); }
+
+ protected:
+ // root node for the viewer
+ osg::ref_ptr<osg::Node> m_pRoot;
+ };
+}
#endif // SHADERZ_QTVIEWWIDGET_H
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Fri Sep 10 23:40:37 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Sat Sep 11 19:27:35 2010
@@ -202,24 +202,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE24123A9D0E0043F7B1</string>
+ <string>4970EE2B123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.cpp</string>
+ <string>qtmainwindow.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE25123A9D0E0043F7B1</string>
+ <string>4970EE2C123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.cpp</string>
+ <string>qtmainwindow.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B481123B59A700CF35EA</string>
+ <string>4973B56F123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B480123B59A700CF35EA</string>
+ <string>4973B56E123C712000CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -242,24 +242,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B18D123B15E800CF35EA</string>
+ <string>4970EE20123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>shmaterial.cpp</string>
+ <string>qtmainwindow.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B18E123B15E800CF35EA</string>
+ <string>4970EE21123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>shmaterial.cpp</string>
+ <string>qtmainwindow.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B483123B59A700CF35EA</string>
+ <string>4973B570123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B482123B59A700CF35EA</string>
+ <string>4973B55E123C711000CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -275,31 +275,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>8 60 802 718 0 0 1280 778 </string>
+ <string>12 55 802 718 0 0 1280 778 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B16D123B12D800CF35EA</string>
+ <string>4973B54A123C707800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.cpp</string>
+ <string>shmaterialeditordialog.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B16E123B12D800CF35EA</string>
+ <string>4973B54B123C707800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.cpp</string>
+ <string>shmaterialeditordialog.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B485123B59A700CF35EA</string>
+ <string>4973B571123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B484123B59A700CF35EA</string>
+ <string>4973B54C123C707800CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -315,31 +315,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>12 60 802 718 0 0 1280 778 </string>
+ <string>15 55 802 718 0 0 1280 778 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B293123B20FA00CF35EA</string>
+ <string>4970EE28123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.h</string>
+ <string>shmaterial.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B294123B20FA00CF35EA</string>
+ <string>4970EE29123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.h</string>
+ <string>shmaterial.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B487123B59A700CF35EA</string>
+ <string>4973B572123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B486123B59A700CF35EA</string>
+ <string>4973B550123C707800CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -362,24 +362,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B3B3123B4EFD00CF35EA</string>
+ <string>4973B18D123B15E800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>osgnvcg1.cg</string>
+ <string>shmaterial.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B3B4123B4EFD00CF35EA</string>
+ <string>4973B18E123B15E800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>osgnvcg1.cg</string>
+ <string>shmaterial.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B488123B59A700CF35EA</string>
+ <string>4973B573123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B470123B592A00CF35EA</string>
+ <string>4973B533123C6E9300CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -395,31 +395,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>15 55 802 718 0 0 1280 778 </string>
+ <string>8 60 802 718 0 0 1280 778 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE20123A9D0E0043F7B1</string>
+ <string>4973B4EF123C6D6900CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.cpp</string>
+ <string>shshaderprogram.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE21123A9D0E0043F7B1</string>
+ <string>4973B4F0123C6D6900CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.cpp</string>
+ <string>shshaderprogram.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B489123B59A700CF35EA</string>
+ <string>4973B574123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B458123B587400CF35EA</string>
+ <string>4973B4F1123C6D6900CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -435,31 +435,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>12 55 802 718 0 0 1280 778 </string>
+ <string>15 55 802 718 0 0 1280 778 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B253123B1CAE00CF35EA</string>
+ <string>4973B4F5123C6D6900CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.h</string>
+ <string>Program</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B254123B1CAE00CF35EA</string>
+ <string>4973B4F6123C6D6900CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.h</string>
+ <string>Program</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B48A123B59A700CF35EA</string>
+ <string>4973B575123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B41A123B56EE00CF35EA</string>
+ <string>4973B4F7123C6D6900CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -475,31 +475,31 @@
<key>PBXModuleWindowStatusBarHidden2</key>
<false/>
<key>RubberWindowFrame</key>
- <string>14 60 802 718 0 0 1280 778 </string>
+ <string>15 55 802 718 0 0 1280 778 </string>
</dict>
</dict>
<dict>
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE28123A9D0E0043F7B1</string>
+ <string>4973B233123B1B2000CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>shmaterial.h</string>
+ <string>qtshaderzviewwidget.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE29123A9D0E0043F7B1</string>
+ <string>4973B234123B1B2000CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>shmaterial.h</string>
+ <string>qtshaderzviewwidget.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B48B123B59A700CF35EA</string>
+ <string>4973B576123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B3B1123B4EFD00CF35EA</string>
+ <string>4973B4DA123C6BE700CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -522,24 +522,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B195123B15E800CF35EA</string>
+ <string>4973B293123B20FA00CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.h</string>
+ <string>qtshaderzviewwidget.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B196123B15E800CF35EA</string>
+ <string>4973B294123B20FA00CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.h</string>
+ <string>qtshaderzviewwidget.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B48C123B59A700CF35EA</string>
+ <string>4973B577123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B38B123B4B1B00CF35EA</string>
+ <string>4973B4A9123C6B7400CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -562,24 +562,24 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B233123B1B2000CF35EA</string>
+ <string>4970EE24123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.cpp</string>
+ <string>shshaderinterface.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4973B234123B1B2000CF35EA</string>
+ <string>4970EE25123A9D0E0043F7B1</string>
<key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.cpp</string>
+ <string>shshaderinterface.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B48D123B59A700CF35EA</string>
+ <string>4973B578123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B347123B473F00CF35EA</string>
+ <string>4973B480123B59A700CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -602,24 +602,104 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE2B123A9D0E0043F7B1</string>
+ <string>4973B16D123B12D800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.h</string>
+ <string>qtmaterialinfowidget.cpp</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>4970EE2C123A9D0E0043F7B1</string>
+ <string>4973B16E123B12D800CF35EA</string>
<key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.h</string>
+ <string>qtmaterialinfowidget.cpp</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>4973B48E123B59A700CF35EA</string>
+ <string>4973B579123C712000CF35EA</string>
<key>history</key>
<array>
- <string>4973B17D123B136100CF35EA</string>
+ <string>4973B484123B59A700CF35EA</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {802, 677}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>12 60 802 718 0 0 1280 778 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>4973B253123B1CAE00CF35EA</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>shshaderinterface.h</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>4973B254123B1CAE00CF35EA</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>shshaderinterface.h</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>4973B57A123C712000CF35EA</string>
+ <key>history</key>
+ <array>
+ <string>4973B41A123B56EE00CF35EA</string>
+ </array>
+ </dict>
+ <key>SplitCount</key>
+ <string>1</string>
+ </dict>
+ <key>StatusBarVisibility</key>
+ <true/>
+ </dict>
+ <key>Geometry</key>
+ <dict>
+ <key>Frame</key>
+ <string>{{0, 20}, {802, 677}}</string>
+ <key>PBXModuleWindowStatusBarHidden2</key>
+ <false/>
+ <key>RubberWindowFrame</key>
+ <string>14 60 802 718 0 0 1280 778 </string>
+ </dict>
+ </dict>
+ <dict>
+ <key>Content</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>4973B195123B15E800CF35EA</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>qtmaterialinfowidget.h</string>
+ <key>PBXSplitModuleInNavigatorKey</key>
+ <dict>
+ <key>Split0</key>
+ <dict>
+ <key>PBXProjectModuleGUID</key>
+ <string>4973B196123B15E800CF35EA</string>
+ <key>PBXProjectModuleLabel</key>
+ <string>qtmaterialinfowidget.h</string>
+ <key>_historyCapacity</key>
+ <integer>0</integer>
+ <key>bookmark</key>
+ <string>4973B57B123C712000CF35EA</string>
+ <key>history</key>
+ <array>
+ <string>4973B38B123B4B1B00CF35EA</string>
</array>
</dict>
<key>SplitCount</key>
@@ -720,13 +800,14 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>21</integer>
- <integer>14</integer>
+ <integer>7</integer>
+ <integer>5</integer>
+ <integer>4</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
- <string>{{0, 143}, {186, 338}}</string>
+ <string>{{0, 0}, {186, 338}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@@ -962,18 +1043,20 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>4970EE2B123A9D0E0043F7B1</string>
- <string>4973B233123B1B2000CF35EA</string>
<string>4973B195123B15E800CF35EA</string>
- <string>4970EE28123A9D0E0043F7B1</string>
<string>4973B253123B1CAE00CF35EA</string>
- <string>4970EE20123A9D0E0043F7B1</string>
- <string>4973B3B3123B4EFD00CF35EA</string>
- <string>4973B293123B20FA00CF35EA</string>
<string>4973B16D123B12D800CF35EA</string>
+ <string>4970EE24123A9D0E0043F7B1</string>
+ <string>4973B293123B20FA00CF35EA</string>
+ <string>4973B233123B1B2000CF35EA</string>
+ <string>4973B4F5123C6D6900CF35EA</string>
+ <string>4973B4EF123C6D6900CF35EA</string>
<string>4973B18D123B15E800CF35EA</string>
+ <string>4970EE28123A9D0E0043F7B1</string>
+ <string>4973B54A123C707800CF35EA</string>
+ <string>4970EE20123A9D0E0043F7B1</string>
<string>/Users/vijayjoseph/projects/shaderz/shaderz.xcodeproj</string>
- <string>4970EE24123A9D0E0043F7B1</string>
+ <string>4970EE2B123A9D0E0043F7B1</string>
</array>
<key>WindowString</key>
<string>797 328 690 397 0 0 1280 778 </string>
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Fri Sep 10 23:40:37 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Sat Sep 11 19:27:35 2010
@@ -2,23 +2,23 @@
{
4970EDF0123925BB0043F7B1 /* shmaterial.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1016, 1680}}";
- sepNavSelRange = "{2186, 0}";
- sepNavVisRange = "{1420, 1299}";
+ sepNavIntBoundsRect = "{{0, 0}, {1016, 1664}}";
+ sepNavSelRange = "{743, 0}";
+ sepNavVisRange = "{418, 1104}";
sepNavWindowFrame = "{{8, 4}, {802, 774}}";
};
};
4970EDFD123925F60043F7B1 /* shmaterial.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1051, 672}}";
- sepNavSelRange = "{922, 0}";
+ sepNavSelRange = "{150, 0}";
sepNavVisRange = "{0, 1034}";
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {981, 736}}";
+ sepNavIntBoundsRect = "{{0, 0}, {981, 768}}";
sepNavSelRange = "{400, 0}";
sepNavVisRange = "{24, 930}";
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
@@ -26,7 +26,7 @@
};
4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1072, 1280}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1072, 1296}}";
sepNavSelRange = "{748, 0}";
sepNavVisRange = "{573, 1227}";
sepNavWindowFrame = "{{550, 4}, {802, 774}}";
@@ -41,7 +41,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 58";
rLen = 0;
- rLoc = 1199;
+ rLoc = 1169;
rType = 0;
vrLen = 1178;
vrLoc = 847;
@@ -51,7 +51,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 60";
rLen = 0;
- rLoc = 1271;
+ rLoc = 1243;
rType = 0;
vrLen = 1112;
vrLoc = 1119;
@@ -91,7 +91,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -101,7 +101,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -111,7 +111,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 60";
rLen = 0;
- rLoc = 1271;
+ rLoc = 1243;
rType = 0;
vrLen = 1108;
vrLoc = 1123;
@@ -141,7 +141,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -195,7 +195,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -205,7 +205,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -235,7 +235,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -265,7 +265,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -295,7 +295,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -355,7 +355,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -375,7 +375,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -385,7 +385,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 41";
rLen = 0;
- rLoc = 690;
+ rLoc = 730;
rType = 0;
vrLen = 944;
vrLoc = 3;
@@ -415,7 +415,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -435,7 +435,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -445,7 +445,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 41";
rLen = 0;
- rLoc = 690;
+ rLoc = 730;
rType = 0;
vrLen = 944;
vrLoc = 3;
@@ -455,7 +455,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 41";
rLen = 0;
- rLoc = 667;
+ rLoc = 707;
rType = 0;
vrLen = 922;
vrLoc = 3;
@@ -465,7 +465,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 915;
vrLoc = 2231;
@@ -475,7 +475,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 938;
vrLoc = 2231;
@@ -535,7 +535,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -545,7 +545,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 109";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 938;
vrLoc = 2231;
@@ -555,7 +555,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 110";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 941;
vrLoc = 2231;
@@ -575,7 +575,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 43";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 924;
vrLoc = 22;
@@ -635,7 +635,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -665,7 +665,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 110";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 941;
vrLoc = 2231;
@@ -675,7 +675,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 43";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 924;
vrLoc = 22;
@@ -705,7 +705,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -735,7 +735,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 110";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 941;
vrLoc = 2231;
@@ -745,7 +745,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 110";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 939;
vrLoc = 2234;
@@ -765,7 +765,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 43";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 924;
vrLoc = 22;
@@ -785,7 +785,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -799,7 +799,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 60";
rLen = 0;
- rLoc = 1271;
+ rLoc = 1243;
rType = 0;
vrLen = 1007;
vrLoc = 1222;
@@ -809,7 +809,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 60";
rLen = 0;
- rLoc = 1312;
+ rLoc = 1284;
rType = 0;
vrLen = 939;
vrLoc = 2012;
@@ -819,7 +819,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 30";
rLen = 13;
- rLoc = 495;
+ rLoc = 542;
rType = 0;
vrLen = 530;
vrLoc = 0;
@@ -829,7 +829,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 18";
rLen = 0;
- rLoc = 283;
+ rLoc = 330;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -879,7 +879,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 111";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 1056;
vrLoc = 2045;
@@ -889,7 +889,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 18";
rLen = 0;
- rLoc = 283;
+ rLoc = 330;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -939,7 +939,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 111";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 1056;
vrLoc = 2045;
@@ -949,7 +949,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 102";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 1022;
vrLoc = 2081;
@@ -959,7 +959,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 18";
rLen = 0;
- rLoc = 283;
+ rLoc = 330;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -969,7 +969,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1019,7 +1019,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 49";
rLen = 0;
- rLoc = 1154;
+ rLoc = 1194;
rType = 0;
vrLen = 1030;
vrLoc = 132;
@@ -1029,7 +1029,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 25;
- rLoc = 863;
+ rLoc = 903;
rType = 0;
vrLen = 1050;
vrLoc = 677;
@@ -1099,7 +1099,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1109,7 +1109,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1139,7 +1139,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 61";
rLen = 0;
- rLoc = 1313;
+ rLoc = 1353;
rType = 0;
vrLen = 1107;
vrLoc = 678;
@@ -1179,7 +1179,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1189,7 +1189,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1239,7 +1239,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 61";
rLen = 0;
- rLoc = 1313;
+ rLoc = 1353;
rType = 0;
vrLen = 1173;
vrLoc = 534;
@@ -1259,7 +1259,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1269,7 +1269,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1299,7 +1299,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 61";
rLen = 0;
- rLoc = 1313;
+ rLoc = 1353;
rType = 0;
vrLen = 1173;
vrLoc = 534;
@@ -1309,7 +1309,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 0;
- rLoc = 832;
+ rLoc = 872;
rType = 0;
vrLen = 1126;
vrLoc = 678;
@@ -1339,7 +1339,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1349,7 +1349,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1379,7 +1379,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 50";
rLen = 0;
- rLoc = 969;
+ rLoc = 1009;
rType = 0;
vrLen = 1162;
vrLoc = 630;
@@ -1409,7 +1409,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1419,7 +1419,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1469,7 +1469,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1479,7 +1479,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1489,7 +1489,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 25;
- rLoc = 863;
+ rLoc = 903;
rType = 0;
vrLen = 1162;
vrLoc = 630;
@@ -1519,7 +1519,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1549,7 +1549,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1559,7 +1559,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 25;
- rLoc = 863;
+ rLoc = 903;
rType = 0;
vrLen = 1162;
vrLoc = 630;
@@ -1589,7 +1589,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1619,7 +1619,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1629,7 +1629,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 25;
- rLoc = 863;
+ rLoc = 903;
rType = 0;
vrLen = 1162;
vrLoc = 630;
@@ -1659,7 +1659,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1679,7 +1679,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 47";
rLen = 25;
- rLoc = 863;
+ rLoc = 903;
rType = 0;
vrLen = 1162;
vrLoc = 630;
@@ -1689,7 +1689,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 44";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 1248;
vrLoc = 535;
@@ -1709,7 +1709,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1739,7 +1739,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1763,7 +1763,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 44";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 1251;
vrLoc = 535;
@@ -1793,7 +1793,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1823,7 +1823,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1873,7 +1873,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1903,7 +1903,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -1933,7 +1933,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 42";
rLen = 0;
- rLoc = 690;
+ rLoc = 730;
rType = 0;
vrLen = 1110;
vrLoc = 298;
@@ -1943,7 +1943,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 970;
vrLoc = 2045;
@@ -1953,7 +1953,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -1993,7 +1993,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2013,7 +2013,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 41";
rLen = 0;
- rLoc = 617;
+ rLoc = 657;
rType = 0;
vrLen = 1157;
vrLoc = 298;
@@ -2023,7 +2023,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -2063,7 +2063,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2093,7 +2093,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -2133,7 +2133,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2183,7 +2183,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -2223,7 +2223,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2253,7 +2253,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -2293,7 +2293,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2303,7 +2303,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 90";
rLen = 0;
- rLoc = 1937;
+ rLoc = 1897;
rType = 0;
vrLen = 1221;
vrLoc = 884;
@@ -2313,7 +2313,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 114";
rLen = 0;
- rLoc = 2230;
+ rLoc = 2751;
rType = 0;
vrLen = 1064;
vrLoc = 1799;
@@ -2393,7 +2393,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2447,7 +2447,7 @@
fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
name = "qtshaderzviewwidget.cpp: 43";
rLen = 0;
- rLoc = 1163;
+ rLoc = 1189;
rType = 0;
vrLen = 970;
vrLoc = 256;
@@ -2457,7 +2457,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 114";
rLen = 0;
- rLoc = 2230;
+ rLoc = 2751;
rType = 0;
vrLen = 1064;
vrLoc = 1799;
@@ -2497,7 +2497,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2507,7 +2507,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 114";
rLen = 0;
- rLoc = 2230;
+ rLoc = 2751;
rType = 0;
vrLen = 1064;
vrLoc = 1799;
@@ -2517,7 +2517,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 104";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 1024;
vrLoc = 2005;
@@ -2547,7 +2547,7 @@
fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
name = "qtshaderzviewwidget.cpp: 43";
rLen = 0;
- rLoc = 1163;
+ rLoc = 1189;
rType = 0;
vrLen = 970;
vrLoc = 256;
@@ -2587,7 +2587,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2597,7 +2597,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 38";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 1146;
vrLoc = 468;
@@ -2607,7 +2607,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 38";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
vrLen = 1147;
vrLoc = 467;
@@ -2697,7 +2697,7 @@
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
name = "qtmainwindow.cpp: 112";
rLen = 0;
- rLoc = 2087;
+ rLoc = 2047;
rType = 0;
vrLen = 1014;
vrLoc = 2005;
@@ -2707,7 +2707,7 @@
fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
name = "qtshaderzviewwidget.cpp: 43";
rLen = 0;
- rLoc = 1163;
+ rLoc = 1189;
rType = 0;
vrLen = 970;
vrLoc = 256;
@@ -2727,7 +2727,7 @@
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
name = "qtmainwindow.h: 33";
rLen = 19;
- rLoc = 534;
+ rLoc = 581;
rType = 0;
vrLen = 609;
vrLoc = 0;
@@ -2737,7 +2737,7 @@
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
name = "shmaterial.cpp: 38";
rLen = 0;
- rLoc = 738;
+ rLoc = 778;
rType = 0;
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/src/qt/qtmainwindow.cpp Fri Sep 10 23:40:37 2010
+++ /trunk/src/qt/qtmainwindow.cpp Sat Sep 11 19:27:35 2010
@@ -14,8 +14,6 @@
#include "shshaderinterface.h"
#include "shlogger.h"
-shMaterial* dummyMaterial = 0;
-
qtMainWindow::qtMainWindow()
: ParentClass(0)
{
@@ -40,8 +38,8 @@
vLayout->addWidget(shaderInfoBtn);
// add the material widget
- dummyMaterial = new shMaterial();
- mMaterialInfoWidget = new qtMaterialInfoWidget(this, dummyMaterial);
+ m_pTestMaterial = new shMaterial();
+ mMaterialInfoWidget = new qtMaterialInfoWidget(this, m_pTestMaterial);
vLayout->addWidget(mMaterialInfoWidget);
}
hLayout->addItem(vLayout);
@@ -50,12 +48,12 @@
hLayout->addSpacing(10);
// create the main view widget
- qtShaderzViewWidget* viewWidget = new qtShaderzViewWidget(this);
- hLayout->addWidget(viewWidget);
+ m_pViewWidget = new qtShaderzViewWidget(this);
+ hLayout->addWidget(m_pViewWidget);
// set size proportions
hLayout->setStretchFactor(vLayout, 2);
- hLayout->setStretchFactor(viewWidget, 3);
+ hLayout->setStretchFactor(m_pViewWidget, 3);
}
mainLayout->addItem(hLayout);
@@ -85,6 +83,16 @@
{
LOG<<"Clicked shader info button.\n";
-
dummyMaterial->loadMaterialFromFile("/Users/vijayjoseph/projects/shaderz/data/osgnvcg1.cg");
+
m_pTestMaterial->loadMaterialFromFile("/Users/vijayjoseph/projects/shaderz/data/osgnvcg1.cg");
mMaterialInfoWidget->populateMaterialParams();
-}
+
+ // set some parameters
+ m_pTestMaterial->addVectorParameter("LightVec")->set(osg::Vec4(0, 0, 1,
0));
+
m_pTestMaterial->addStateMatrixParameter("ModelViewProj")->set(osgNV::StateMatrixParameterValue::MODELVIEW_PROJECTION);
+
m_pTestMaterial->addStateMatrixParameter("ModelViewIT")->set(osgNV::StateMatrixParameterValue::MODELVIEW,
osgNV::StateMatrixParameterValue::INVERSE_TRANSPOSE);
+
+ // set the shader
+ osg::Node* viewRoot = m_pViewWidget->getRoot();
+ osg::StateSet* ss = viewRoot->getOrCreateStateSet();
+ ss->setAttributeAndModes(m_pTestMaterial);
+}
=======================================
--- /trunk/src/qt/qtshaderzviewwidget.cpp Sun Sep 5 01:15:27 2010
+++ /trunk/src/qt/qtshaderzviewwidget.cpp Sat Sep 11 19:27:35 2010
@@ -1,6 +1,8 @@
#include "qt/qtshaderzviewwidget.h"
#include "shlogger.h"
+using namespace Shaderz;
+
qtShaderzViewWidget::qtShaderzViewWidget( QWidget * pParent,
const char * pName,
const QGLWidget * pShareWidget,
=======================================
--- /trunk/src/shmaterial.cpp Fri Sep 10 23:40:37 2010
+++ /trunk/src/shmaterial.cpp Sat Sep 11 19:27:35 2010
@@ -32,6 +32,8 @@
void shMaterial::loadMaterialFromFile( std::string sFileName )
{
+ ParentClass::setFileName(sFileName);
+
delete m_pShaderInterface;
m_pShaderInterface = new shShaderInterfaceCG(sFileName);
m_pShaderInterface->initialize();