[shaderz] r30 committed - Parameter UI pass 1...
sha...@googlecode.com
Author: vijay.michaeljoseph
Date: Sat Sep 18 19:34:58 2010
Log: Parameter UI pass 1
* Added support for shader parameter widgets, including scalar, vector and
matrix types.
* Default dummy test widgets can be viewed on main dialog by clicking the
ShaderInfo button.
* Modified some cg parameter parsing code to include only global variables.
* Added parameter widgets to CMake Moc parsing list
http://code.google.com/p/shaderz/source/detail?r=30
Added:
/trunk/include/qt/qtshaderparameterwidget.h
/trunk/src/qt/qtshaderparameterwidget.cpp
Modified:
/trunk/CMakeLists.txt
/trunk/data/osgnvcg1.cg
/trunk/include/qt/qtmainwindow.h
/trunk/include/shmaterial.h
/trunk/shaderz.xcodeproj/project.pbxproj
/trunk/shaderz.xcodeproj/vijayjoseph.mode1v3
/trunk/shaderz.xcodeproj/vijayjoseph.pbxuser
/trunk/src/qt/qtmainwindow.cpp
/trunk/src/shmaterial.cpp
/trunk/src/shshaderinterface.cpp
=======================================
--- /dev/null
+++ /trunk/include/qt/qtshaderparameterwidget.h Sat Sep 18 19:34:58 2010
@@ -0,0 +1,101 @@
+/*
+ * qtshaderparameterwidget.h
+ * shaderz
+ *
+ * Base class for all shader parameter widgets
+ *
+ * Created by Vijay Michael Joseph on 9/15/10.
+ * EMail: shade...@googlegroups.com
+ *
+ */
+
+ #ifndef __QT_SHADERZ_PARAMETER_WIDGET_H__
+ #define __QT_SHADERZ_PARAMETER_WIDGET_H__
+
+ #include <QWidget>
+ #include <vector>
+ #include "shshaderinterface.h"
+
+ namespace Shaderz
+ {
+ // Base class for all shader parameter widgets
+ class qtShaderParameterWidget : public QWidget
+ {
+ public:
+ static qtShaderParameterWidget* create(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParameterInfo);
+ virtual void initializeWidget();
+
+ // getters
+ virtual std::vector<bool> getValueBool() const { return
std::vector<bool>(); }
+ virtual std::vector<float> getValueFloat() const { return
std::vector<float>(); }
+ virtual std::vector<int> getValueInt() const { return
std::vector<int>(); }
+
+ protected:
+ qtShaderParameterWidget(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParameter);
+ virtual QWidget* internalCreateWidget(){ return 0; }
+
+ protected:
+ shShaderInterface::shShaderParameter m_ParamInfo;
+ std::vector<QWidget*> m_vWidgets;
+
+ private:
+ typedef QWidget ParentClass;
+ };
+
+
+ ////////////////////////////////////
+ // Shader Parameter Widget - Boolean
+ class qtShaderParameterWidgetBool : public qtShaderParameterWidget
+ {
+ public:
+ qtShaderParameterWidgetBool(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParameter);
+
+ virtual std::vector<bool> getValueBool() const;
+
+ protected:
+ virtual QWidget* internalCreateWidget();
+
+ private:
+ typedef qtShaderParameterWidget ParentClass;
+ };
+
+ ////////////////////////////////////
+ // Shader Parameter Widget - Int
+ class qtShaderParameterWidgetInt : public qtShaderParameterWidget
+ {
+ public:
+ qtShaderParameterWidgetInt(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParameter);
+
+ virtual std::vector<int> getValueInt() const;
+
+ protected:
+ virtual QWidget* internalCreateWidget();
+
+ private:
+ typedef qtShaderParameterWidget ParentClass;
+ };
+
+ ////////////////////////////////////
+ // Shader Parameter Widget - Float
+ class qtShaderParameterWidgetFloat : public qtShaderParameterWidget
+ {
+ Q_OBJECT
+
+ public:
+ qtShaderParameterWidgetFloat(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParameter);
+
+ virtual std::vector<float> getValueFloat() const;
+
+ public slots:
+ virtual void OnClickedColor();
+
+ protected:
+ virtual QWidget* internalCreateWidget();
+
+ private:
+ typedef qtShaderParameterWidget ParentClass;
+ };
+
+ }
+
+#endif
=======================================
--- /dev/null
+++ /trunk/src/qt/qtshaderparameterwidget.cpp Sat Sep 18 19:34:58 2010
@@ -0,0 +1,188 @@
+/*
+ * qtshaderparameterwidget.cpp
+ * shaderz
+ *
+ * Created by Vijay Michael Joseph on 9/18/10.
+ * EMail: shade...@googlegroups.com
+ *
+ */
+
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QComboBox>
+#include <QPushButton>
+#include <QLineEdit>
+#include "qt/qtshaderparameterwidget.h"
+#include "shlogger.h"
+
+using namespace Shaderz;
+
+qtShaderParameterWidget* qtShaderParameterWidget::create(QWidget*
InParent, shShaderInterface::shShaderParameter InShaderParamInfo)
+{
+ qtShaderParameterWidget* newWidget = 0;
+
+ switch( InShaderParamInfo.paramType )
+ {
+ case SH_PARAMETERTYPE_BOOL:
+ newWidget = new qtShaderParameterWidgetBool( InParent, InShaderParamInfo
);
+ break;
+
+ case SH_PARAMETERTYPE_INT:
+ newWidget = new qtShaderParameterWidgetInt( InParent, InShaderParamInfo
);
+ break;
+
+ case SH_PARAMETERTYPE_FLOAT:
+ newWidget = new qtShaderParameterWidgetFloat( InParent,
InShaderParamInfo );
+ break;
+ }
+
+ // initialize widget so that it can create all ui elements
+ if( newWidget )
+ {
+ newWidget->initializeWidget();
+ }
+ return newWidget;
+}
+
+qtShaderParameterWidget::qtShaderParameterWidget( QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParamInfo)
+ : ParentClass(InParent)
+{
+ m_ParamInfo = InShaderParamInfo;
+}
+
+void qtShaderParameterWidget::initializeWidget()
+{
+ QGridLayout* pLayout = new QGridLayout;
+
+ switch(m_ParamInfo.paramClass)
+ {
+ case SH_PARAMETERCLASS_SCALAR:
+ {
+ QWidget* pBox = internalCreateWidget();
+ pLayout->addWidget(pBox, 0, 0);
+ m_vWidgets.push_back(pBox);
+ }
+ break;
+
+ case SH_PARAMETERCLASS_VECTOR:
+ {
+ int iRow;
+ for( iRow=0; iRow < m_ParamInfo.rows; ++iRow )
+ {
+ QWidget* pBox = internalCreateWidget();
+ pLayout->addWidget(pBox, 0, iRow);
+ m_vWidgets.push_back(pBox);
+ }
+ }
+ break;
+
+ case SH_PARAMETERCLASS_ARRAY:
+ // todo: implement me
+ LOG<<"Array not implemented yet...\n";
+ break;
+
+ case SH_PARAMETERCLASS_MATRIX:
+ {
+ int iRow, iCol;
+ for( iRow=0; iRow < m_ParamInfo.rows; ++iRow )
+ {
+ for( iCol=0; iCol < m_ParamInfo.columns; ++iCol )
+ {
+ QWidget* pBox = internalCreateWidget();
+ pLayout->addWidget(pBox, iRow, iCol);
+ m_vWidgets.push_back(pBox);
+ }
+ }
+ }
+ break;
+ }
+
+ if( !layout() )
+ {
+ setLayout(pLayout);
+ }
+ else
+ {
+ layout()->addItem(pLayout);
+ }
+}
+
+
+////////////////////////////////////
+// Shader Parameter Widget - Boolean
+qtShaderParameterWidgetBool::qtShaderParameterWidgetBool(QWidget*
InParent, shShaderInterface::shShaderParameter InShaderParamInfo)
+ : ParentClass(InParent, InShaderParamInfo)
+{
+}
+
+QWidget* qtShaderParameterWidgetBool::internalCreateWidget()
+{
+ QComboBox* pBox = new QComboBox(this);
+ pBox->addItem( QString("True") );
+ pBox->addItem( QString("False") );
+
+ return pBox;
+}
+
+std::vector<bool> qtShaderParameterWidgetBool::getValueBool() const
+{
+ // todo: implement me
+ return std::vector<bool>();
+}
+
+
+///////////////////////////////
+// Shader param widget - Int
+qtShaderParameterWidgetInt::qtShaderParameterWidgetInt(QWidget* InParent,
shShaderInterface::shShaderParameter InShaderParamInfo)
+ : ParentClass(InParent, InShaderParamInfo)
+{
+}
+
+QWidget* qtShaderParameterWidgetInt::internalCreateWidget()
+{
+ // todo: cater for Color widget also
+
+ QLineEdit* pBox = new QLineEdit(this);
+ return pBox;
+}
+
+std::vector<int> qtShaderParameterWidgetInt::getValueInt() const
+{
+ // todo: implement me
+ return std::vector<int>();
+}
+
+
+///////////////////////////////
+// Shader param widget - Float
+qtShaderParameterWidgetFloat::qtShaderParameterWidgetFloat(QWidget*
InParent, shShaderInterface::shShaderParameter InShaderParamInfo)
+ : ParentClass(InParent, InShaderParamInfo)
+{
+}
+
+QWidget* qtShaderParameterWidgetFloat::internalCreateWidget()
+{
+ QWidget* pUIElement = 0;
+ if( m_ParamInfo.semantic == SH_PARAMETERSEMANTIC_COLOR )
+ {
+ pUIElement = new QPushButton( QString("C"), this);
+ connect( pUIElement, SIGNAL(clicked()), this, SLOT(OnClickedColor()) );
+ }
+ else
+ {
+ pUIElement = new QLineEdit(this);
+ }
+
+ return pUIElement;
+}
+
+std::vector<float> qtShaderParameterWidgetFloat::getValueFloat() const
+{
+ // todo: implement me
+ return std::vector<float>();
+}
+
+void qtShaderParameterWidgetFloat::OnClickedColor()
+{
+ LOG<<"Clicked something..\n";
+}
=======================================
--- /trunk/CMakeLists.txt Sun Sep 5 01:15:27 2010
+++ /trunk/CMakeLists.txt Sat Sep 18 19:34:58 2010
@@ -83,6 +83,7 @@
set( MOCS
include/qt/qtmainwindow.h
+ include/qt/qtshaderparameterwidget.h
)
set( FORMS )
=======================================
--- /trunk/data/osgnvcg1.cg Sat Sep 11 19:27:35 2010
+++ /trunk/data/osgnvcg1.cg Sat Sep 18 19:34:58 2010
@@ -18,6 +18,7 @@
float3 testFloat3 : COLOR;
bool testBool;
float testFloat;
+ bool bArray[10];
float3 lightDir = {-1,-1,-1};
=======================================
--- /trunk/include/qt/qtmainwindow.h Sat Sep 11 19:27:35 2010
+++ /trunk/include/qt/qtmainwindow.h Sat Sep 18 19:34:58 2010
@@ -3,7 +3,7 @@
* shaderz
*
* Created by Vijay Michael Joseph on 9/5/10.
- * EMail: vijay.mic...@gmail.com
+ * EMail: shade...@googlegroups.com
*
*/
=======================================
--- /trunk/include/shmaterial.h Fri Sep 10 23:40:37 2010
+++ /trunk/include/shmaterial.h Sat Sep 18 19:34:58 2010
@@ -24,6 +24,7 @@
META_StateAttribute(shaderz, shMaterial, OSGNVCG_PROGRAM);
+ const shShaderInterface* getShaderInterface() const { return
m_pShaderInterface; }
virtual void loadMaterialFromFile( std::string sFileName );
virtual std::vector<shShaderInterface::shShaderParameter>
getUserEditableParameters() const;
=======================================
--- /trunk/shaderz.xcodeproj/project.pbxproj Fri Sep 10 23:40:37 2010
+++ /trunk/shaderz.xcodeproj/project.pbxproj Sat Sep 18 19:34:58 2010
@@ -7,11 +7,15 @@
objects = {
/* Begin PBXFileReference section */
+ 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = qtshaderparameterwidget.cpp; sourceTree = "<group>"; };
+ 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = qtshaderparameterwidget.h; sourceTree = "<group>"; };
4970EDF0123925BB0043F7B1 /* shmaterial.cpp */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path =
shmaterial.cpp; sourceTree = "<group>"; };
4970EDFD123925F60043F7B1 /* shmaterial.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shmaterial.h;
sourceTree = "<group>"; };
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>";
};
+ 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>"; };
49C7DC811232ACD900E24C8D /* CMakeLists.txt */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; path = CMakeLists.txt;
sourceTree = "<group>"; };
@@ -28,6 +32,16 @@
49C7DCE51232DB5D00E24C8D /* ReadMe.txt */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = text; path = ReadMe.txt; sourceTree
= "<group>"; };
/* End PBXFileReference section */
+/* Begin PBXFrameworksBuildPhase section */
+ 49880E5712459B5A00AC87B9 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
/* Begin PBXGroup section */
497754BD1234571600F4DCE4 /* data */ = {
isa = PBXGroup;
@@ -37,6 +51,14 @@
name = data;
sourceTree = "<group>";
};
+ 49880E5A12459B5A00AC87B9 /* Products */ = {
+ isa = PBXGroup;
+ children = (
+ 49880E5912459B5A00AC87B9 /* ShaderExec.app */,
+ );
+ name = Products;
+ sourceTree = "<group>";
+ };
49C7DC641232ABF100E24C8D = {
isa = PBXGroup;
children = (
@@ -45,6 +67,8 @@
49C7DC861232AFB600E24C8D /* include */,
49C7DC8C1232AFB600E24C8D /* src */,
49C7DCE51232DB5D00E24C8D /* ReadMe.txt */,
+ 49880E5A12459B5A00AC87B9 /* Products */,
+ 49880E5C12459B5A00AC87B9 /* ShaderExec-Info.plist */,
);
sourceTree = "<group>";
};
@@ -67,6 +91,7 @@
49C7DC891232AFB600E24C8D /* qtmainwindow.h */,
49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */,
4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */,
+ 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */,
);
path = qt;
sourceTree = "<group>";
@@ -90,12 +115,33 @@
49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */,
49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */,
4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */,
+ 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */,
);
path = qt;
sourceTree = "<group>";
};
/* End PBXGroup section */
+/* Begin PBXNativeTarget section */
+ 49880E5812459B5A00AC87B9 /* ShaderExec */ = {
+ isa = PBXNativeTarget;
+ buildConfigurationList = 49880E5F12459B5A00AC87B9 /* Build
configuration list for PBXNativeTarget "ShaderExec" */;
+ buildPhases = (
+ 49880E5512459B5A00AC87B9 /* Resources */,
+ 49880E5612459B5A00AC87B9 /* Sources */,
+ 49880E5712459B5A00AC87B9 /* Frameworks */,
+ );
+ buildRules = (
+ );
+ dependencies = (
+ );
+ name = ShaderExec;
+ productName = ShaderExec;
+ productReference = 49880E5912459B5A00AC87B9 /* ShaderExec.app */;
+ productType = "com.apple.product-type.application";
+ };
+/* End PBXNativeTarget section */
+
/* Begin PBXProject section */
49C7DC661232ABF100E24C8D /* Project object */ = {
isa = PBXProject;
@@ -103,14 +149,81 @@
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 0;
mainGroup = 49C7DC641232ABF100E24C8D;
+ productRefGroup = 49880E5A12459B5A00AC87B9 /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
+ 49880E5812459B5A00AC87B9 /* ShaderExec */,
);
};
/* End PBXProject section */
+/* Begin PBXResourcesBuildPhase section */
+ 49880E5512459B5A00AC87B9 /* Resources */ = {
+ isa = PBXResourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+ 49880E5612459B5A00AC87B9 /* Sources */ = {
+ isa = PBXSourcesBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXSourcesBuildPhase section */
+
/* Begin XCBuildConfiguration section */
+ 49880E5D12459B5A00AC87B9 /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = NO;
+ GCC_DYNAMIC_NO_PIC = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = YES;
+ GCC_MODEL_TUNING = G5;
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER
= "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+ INFOPLIST_FILE = "ShaderExec-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Carbon,
+ );
+ PREBINDING = NO;
+ PRODUCT_NAME = ShaderExec;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = YES;
+ };
+ name = Debug;
+ };
+ 49880E5E12459B5A00AC87B9 /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER
= "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h";
+ INFOPLIST_FILE = "ShaderExec-Info.plist";
+ INSTALL_PATH = "$(HOME)/Applications";
+ OTHER_LDFLAGS = (
+ "-framework",
+ Carbon,
+ );
+ PREBINDING = NO;
+ PRODUCT_NAME = ShaderExec;
+ WRAPPER_EXTENSION = app;
+ ZERO_LINK = NO;
+ };
+ name = Release;
+ };
49C7DC671232ABF100E24C8D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -128,6 +241,15 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
+ 49880E5F12459B5A00AC87B9 /* Build configuration list for
PBXNativeTarget "ShaderExec" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ 49880E5D12459B5A00AC87B9 /* Debug */,
+ 49880E5E12459B5A00AC87B9 /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
49C7DC691232ABF100E24C8D /* Build configuration list for
PBXProject "shaderz" */ = {
isa = XCConfigurationList;
buildConfigurations = (
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Sat Sep 11 19:27:35 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.mode1v3 Sat Sep 18 19:34:58 2010
@@ -197,528 +197,7 @@
<key>Notifications</key>
<array/>
<key>OpenEditors</key>
- <array>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE2B123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.h</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE2C123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.h</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B56F123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B56E123C712000CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE20123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE21123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmainwindow.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B570123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B55E123C711000CF35EA</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 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B54A123C707800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterialeditordialog.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B54B123C707800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterialeditordialog.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B571123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B54C123C707800CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE28123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterial.h</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE29123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterial.h</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B572123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B550123C707800CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B18D123B15E800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterial.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B18E123B15E800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shmaterial.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B573123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B533123C6E9300CF35EA</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>8 60 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B4EF123C6D6900CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shshaderprogram.h</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B4F0123C6D6900CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>shshaderprogram.h</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B574123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B4F1123C6D6900CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B4F5123C6D6900CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>Program</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B4F6123C6D6900CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>Program</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B575123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B4F7123C6D6900CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B233123B1B2000CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B234123B1B2000CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B576123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B4DA123C6BE700CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B293123B20FA00CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.h</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B294123B20FA00CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtshaderzviewwidget.h</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B577123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B4A9123C6B7400CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE24123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4970EE25123A9D0E0043F7B1</string>
- <key>PBXProjectModuleLabel</key>
- <string>shshaderinterface.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B578123C712000CF35EA</string>
- <key>history</key>
- <array>
- <string>4973B480123B59A700CF35EA</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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B16D123B12D800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.cpp</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>4973B16E123B12D800CF35EA</string>
- <key>PBXProjectModuleLabel</key>
- <string>qtmaterialinfowidget.cpp</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>4973B579123C712000CF35EA</string>
- <key>history</key>
- <array>
- <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>
- <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>15 55 802 718 0 0 1280 778 </string>
- </dict>
- </dict>
- </array>
+ <array/>
<key>PerspectiveWidths</key>
<array>
<integer>-1</integer>
@@ -795,14 +274,14 @@
<string>49C7DC871232AFB600E24C8D</string>
<string>49C7DC8C1232AFB600E24C8D</string>
<string>49C7DC8D1232AFB600E24C8D</string>
+ <string>1C37FBAC04509CD000000102</string>
+ <string>1C37FAAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>7</integer>
- <integer>5</integer>
- <integer>4</integer>
+ <integer>1</integer>
<integer>0</integer>
</array>
</array>
@@ -907,9 +386,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>4973B0FB123B060A00CF35EA</string>
+ <string>49880E6212459B8800AC87B9</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>4973B0FC123B060A00CF35EA</string>
+ <string>49880E6312459B8800AC87B9</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -1043,20 +522,10 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>4973B195123B15E800CF35EA</string>
- <string>4973B253123B1CAE00CF35EA</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>1C78EAAD065D492600B07095</string>
+ <string>1CD10A99069EF8BA00B06720</string>
+ <string>49880E7212459B8800AC87B9</string>
<string>/Users/vijayjoseph/projects/shaderz/shaderz.xcodeproj</string>
- <string>4970EE2B123A9D0E0043F7B1</string>
</array>
<key>WindowString</key>
<string>797 328 690 397 0 0 1280 778 </string>
@@ -1150,8 +619,12 @@
<string>192 257 500 500 0 0 1280 1002 </string>
</dict>
<dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
<key>Identifier</key>
<string>windowTool.debugger</string>
+ <key>IsVertical</key>
+ <true/>
<key>Layout</key>
<array>
<dict>
@@ -1174,8 +647,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {317, 164}}</string>
- <string>{{317, 0}, {377, 164}}</string>
+ <string>{{0, 0}, {316, 185}}</string>
+ <string>{{316, 0}, {378, 185}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@@ -1190,8 +663,8 @@
<string>yes</string>
<key>sizes</key>
<array>
- <string>{{0, 0}, {694, 164}}</string>
- <string>{{0, 164}, {694, 216}}</string>
+ <string>{{0, 0}, {694, 185}}</string>
+ <string>{{0, 185}, {694, 196}}</string>
</array>
</dict>
</dict>
@@ -1204,8 +677,6 @@
</dict>
<key>GeometryConfiguration</key>
<dict>
- <key>DebugConsoleDrawerSize</key>
- <string>{100, 120}</string>
<key>DebugConsoleVisible</key>
<string>None</string>
<key>DebugConsoleWindowFrame</key>
@@ -1213,18 +684,34 @@
<key>DebugSTDIOWindowFrame</key>
<string>{{200, 200}, {500, 300}}</string>
<key>Frame</key>
- <string>{{0, 0}, {694, 380}}</string>
+ <string>{{0, 0}, {694, 381}}</string>
+ <key>PBXDebugSessionStackFrameViewKey</key>
+ <dict>
+ <key>DebugVariablesTableConfiguration</key>
+ <array>
+ <string>Name</string>
+ <real>120</real>
+ <string>Value</string>
+ <real>85</real>
+ <string>Summary</string>
+ <real>148</real>
+ </array>
+ <key>Frame</key>
+ <string>{{316, 0}, {378, 185}}</string>
+ <key>RubberWindowFrame</key>
+ <string>31 280 694 422 0 0 1280 778 </string>
+ </dict>
<key>RubberWindowFrame</key>
- <string>321 238 694 422 0 0 1440 878 </string>
+ <string>31 280 694 422 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXDebugSessionModule</string>
<key>Proportion</key>
- <string>100%</string>
+ <string>381pt</string>
</dict>
</array>
<key>Proportion</key>
- <string>100%</string>
+ <string>381pt</string>
</dict>
</array>
<key>Name</key>
@@ -1234,22 +721,26 @@
<string>PBXDebugSessionModule</string>
</array>
<key>StatusbarIsVisible</key>
- <integer>1</integer>
+ <true/>
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>1C0AD2AB069F1E9B00FABCE6</string>
+ <string>49880E4C12459A2B00AC87B9</string>
<string>1C162984064C10D400B95A72</string>
- <string>1C0AD2AC069F1E9B00FABCE6</string>
+ <string>49880E4D12459A2B00AC87B9</string>
+ <string>49880E4E12459A2B00AC87B9</string>
+ <string>49880E4F12459A2B00AC87B9</string>
+ <string>49880E5012459A2B00AC87B9</string>
+ <string>49880E5112459A2B00AC87B9</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
<key>WindowString</key>
- <string>321 238 694 422 0 0 1440 878 </string>
+ <string>31 280 694 422 0 0 1280 778 </string>
<key>WindowToolGUID</key>
<string>1CD10A99069EF8BA00B06720</string>
<key>WindowToolIsVisible</key>
- <integer>0</integer>
+ <false/>
</dict>
<dict>
<key>FirstTimeWindowDisplayed</key>
@@ -1347,16 +838,18 @@
<string>MENUSEPARATOR</string>
</dict>
<dict>
+ <key>FirstTimeWindowDisplayed</key>
+ <false/>
<key>Identifier</key>
<string>windowTool.debuggerConsole</string>
+ <key>IsVertical</key>
+ <true/>
<key>Layout</key>
<array>
<dict>
<key>Dock</key>
<array>
<dict>
- <key>BecomeActive</key>
- <integer>1</integer>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -1367,9 +860,9 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {650, 250}}</string>
+ <string>{{0, 0}, {650, 209}}</string>
<key>RubberWindowFrame</key>
- <string>516 632 650 250 0 0 1680 1027 </string>
+ <string>52 429 650 250 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXDebugCLIModule</string>
@@ -1388,21 +881,21 @@
<string>PBXDebugCLIModule</string>
</array>
<key>StatusbarIsVisible</key>
- <integer>1</integer>
+ <true/>
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
- <string>1C78EAAE065D492600B07095</string>
+ <string>49880E6012459B7900AC87B9</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.consoleV3</string>
<key>WindowString</key>
- <string>650 41 650 250 0 0 1280 1002 </string>
+ <string>52 429 650 250 0 0 1280 778 </string>
<key>WindowToolGUID</key>
<string>1C78EAAD065D492600B07095</string>
<key>WindowToolIsVisible</key>
- <integer>0</integer>
+ <false/>
</dict>
<dict>
<key>Identifier</key>
=======================================
--- /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Sat Sep 11 19:27:35 2010
+++ /trunk/shaderz.xcodeproj/vijayjoseph.pbxuser Sat Sep 18 19:34:58 2010
@@ -1,4472 +1,4523 @@
// !$*UTF8*$!
{
- 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */ = {
+ 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */ = {
uiCtxt = {
- 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 = "{150, 0}";
- sepNavVisRange = "{0, 1034}";
+ sepNavIntBoundsRect = "{{0, 0}, {939, 3024}}";
+ sepNavSelRange = "{3893, 0}";
+ sepNavVisRange = "{3268, 938}";
sepNavWindowFrame = "{{15, -1}, {802, 774}}";
};
};
- 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {981, 768}}";
- sepNavSelRange = "{400, 0}";
- sepNavVisRange = "{24, 930}";
- 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;
};
- 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */ = {
- uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1072, 1296}}";
- sepNavSelRange = "{748, 0}";
- sepNavVisRange = "{573, 1227}";
- sepNavWindowFrame = "{{550, 4}, {802, 774}}";
- };
+ 490BCD241244A77100ED1410 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
+ name = "qtshaderparameterwidget.cpp: 51";
+ rLen = 0;
+ rLoc = 2546;
+ rType = 0;
+ vrLen = 1120;
+ vrLoc = 50;
};
- 4970EE1A1239D05B0043F7B1 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
+ 490BCD271244A77100ED1410 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
+ name = "qtshaderparameterwidget.h: 21";
+ rLen = 0;
+ rLoc = 378;
+ rType = 0;
+ vrLen = 1085;
+ vrLoc = 33;
};
- 4970EE22123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 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: 58";
+ name = "qtmainwindow.cpp: 102";
rLen = 0;
- rLoc = 1169;
+ rLoc = 3098;
rType = 0;
- vrLen = 1178;
- vrLoc = 847;
+ vrLen = 1204;
+ vrLoc = 1744;
};
- 4970EE23123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD2E1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 60";
+ name = "qtmainwindow.cpp: 103";
rLen = 0;
- rLoc = 1243;
+ rLoc = 3341;
rType = 0;
- vrLen = 1112;
- vrLoc = 1119;
+ vrLen = 1224;
+ vrLoc = 1747;
};
- 4970EE26123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD2F1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 11";
+ name = "shshaderinterface.cpp: 106";
rLen = 0;
- rLoc = 144;
+ rLoc = 2650;
rType = 0;
- vrLen = 1040;
- vrLoc = 0;
+ vrLen = 1225;
+ vrLoc = 2035;
};
- 4970EE27123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD301244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 16";
+ name = "shshaderinterface.cpp: 106";
rLen = 0;
- rLoc = 144;
+ rLoc = 2650;
rType = 0;
- vrLen = 1197;
- vrLoc = 5883;
+ vrLen = 1225;
+ vrLoc = 2035;
};
- 4970EE2A123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD311244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
+ name = "shmaterial.h: 10";
rLen = 0;
- rLoc = 333;
+ rLoc = 150;
rType = 0;
- vrLen = 760;
- vrLoc = 0;
+ vrLen = 1057;
+ vrLoc = 3;
};
- 4970EE2D123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD321244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
+ name = "shmaterial.h: 27";
+ rLen = 18;
+ rLoc = 536;
rType = 0;
- vrLen = 530;
+ vrLen = 1118;
vrLoc = 0;
};
- 4970EE2E123A9D0E0043F7B1 /* PBXTextBookmark */ = {
+ 490BCD331244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ name = "qtmainwindow.h: 19";
+ rLen = 0;
+ rLoc = 327;
rType = 0;
- vrLen = 530;
+ vrLen = 720;
vrLoc = 0;
};
- 4973B0FD123B060A00CF35EA /* PBXTextBookmark */ = {
+ 490BCD341244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 60";
- rLen = 0;
- rLoc = 1243;
+ fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
+ name = "qtmainwindow.h: 37";
+ rLen = 15;
+ rLoc = 656;
rType = 0;
- vrLen = 1108;
- vrLoc = 1123;
+ vrLen = 706;
+ vrLoc = 22;
};
- 4973B0FE123B060A00CF35EA /* PBXTextBookmark */ = {
+ 490BCD351244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 16";
+ fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
+ name = "shmaterial.cpp: 87";
rLen = 0;
- rLoc = 144;
+ rLoc = 2219;
rType = 0;
- vrLen = 1222;
- vrLoc = 5858;
+ vrLen = 1281;
+ vrLoc = 1525;
};
- 4973B0FF123B060A00CF35EA /* PBXTextBookmark */ = {
+ 490BCD361244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
+ fRef = 490BCD371244A77100ED1410 /* shshaderprogram.h */;
+ name = "shshaderprogram.h: 1";
rLen = 0;
- rLoc = 333;
+ rLoc = 0;
rType = 0;
- vrLen = 760;
- vrLoc = 0;
+ vrLen = 1394;
+ vrLoc = 356;
};
- 4973B100123B060A00CF35EA /* PBXTextBookmark */ = {
+ 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 = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ fRef = 490BCD391244A77100ED1410 /* Program */;
+ name = "Program: 1";
+ rLen = 0;
+ rLoc = 0;
rType = 0;
- vrLen = 530;
- vrLoc = 0;
+ vrLen = 1839;
+ vrLoc = 2558;
};
- 4973B101123B062C00CF35EA /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
+ 490BCD391244A77100ED1410 /* Program */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = text;
+ name = Program;
+ path =
/Users/vijayjoseph/projects/shaderz/external/build/osgnv/include/osgNVCg/Program;
+ sourceTree = "<absolute>";
};
- 4973B112123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 490BCD3A1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 13";
+ fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
+ name = "qtshaderzviewwidget.cpp: 5";
rLen = 0;
- rLoc = 80;
+ rLoc = 84;
rType = 0;
- vrLen = 822;
+ vrLen = 1034;
vrLoc = 0;
};
- 4973B113123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 490BCD3B1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 9";
+ fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
+ name = "qtshaderzviewwidget.h: 6";
rLen = 0;
- rLoc = 80;
+ rLoc = 104;
rType = 0;
- vrLen = 807;
+ vrLen = 854;
vrLoc = 0;
};
- 4973B116123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 490BCD3C1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 71";
+ fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
+ name = "qtmaterialinfowidget.cpp: 36";
rLen = 0;
- rLoc = 2656;
+ rLoc = 748;
rType = 0;
- vrLen = 2088;
- vrLoc = 1257;
+ vrLen = 1173;
+ vrLoc = 844;
};
- 4973B117123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 490BCD3D1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 72";
+ fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
+ name = "qtmaterialinfowidget.h: 20";
rLen = 0;
- rLoc = 2656;
+ rLoc = 400;
rType = 0;
- vrLen = 2056;
- vrLoc = 1257;
+ vrLen = 930;
+ vrLoc = 24;
};
- 4973B118123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 490BCD3E1244A77100ED1410 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ 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}}";
+ sepNavSelRange = "{1559, 43}";
+ sepNavVisRange = "{1664, 938}";
+ sepNavWindowFrame = "{{15, -1}, {802, 774}}";
+ };
+ };
+ 493DCC661242174100FCFD87 /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
+ name = "shmaterial.cpp: 87";
rLen = 0;
- rLoc = 2047;
+ rLoc = 2219;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 1282;
+ vrLoc = 1525;
};
- 4973B119123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 493DCC671242174100FCFD87 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ fRef = 493DCC681242174100FCFD87 /* shshaderprogram.h */;
+ name = "shshaderprogram.h: 1";
rLen = 0;
- rLoc = 2047;
+ rLoc = 0;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 1394;
+ vrLoc = 356;
};
- 4973B11C123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 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 = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 27";
+ fRef = 493DCC6A1242174100FCFD87 /* Program */;
+ name = "Program: 1";
rLen = 0;
- rLoc = 395;
+ rLoc = 0;
rType = 0;
- vrLen = 881;
- vrLoc = 3;
+ vrLen = 1839;
+ vrLoc = 2558;
};
- 4973B11D123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 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 = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
+ fRef = 49C7DC901232AFB600E24C8D /* qtshaderzviewwidget.cpp */;
+ name = "qtshaderzviewwidget.cpp: 5";
rLen = 0;
- rLoc = 333;
+ rLoc = 84;
rType = 0;
- vrLen = 760;
+ vrLen = 1034;
vrLoc = 0;
};
- 4973B11E123B0AD400CF35EA /* PBXTextBookmark */ = {
+ 493DCC6C1242174100FCFD87 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ fRef = 49C7DC8A1232AFB600E24C8D /* qtshaderzviewwidget.h */;
+ name = "qtshaderzviewwidget.h: 6";
+ rLen = 0;
+ rLoc = 104;
rType = 0;
- vrLen = 530;
+ vrLen = 854;
vrLoc = 0;
};
- 4973B11F123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 493DCC6E1242174100FCFD87 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 9";
+ fRef = 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */;
+ name = "qtmaterialinfowidget.cpp: 36";
rLen = 0;
- rLoc = 80;
+ rLoc = 748;
rType = 0;
- vrLen = 807;
- vrLoc = 0;
+ vrLen = 1174;
+ vrLoc = 844;
};
- 4973B120123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 493DCC701242174100FCFD87 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 72";
+ fRef = 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */;
+ name = "qtmaterialinfowidget.h: 20";
rLen = 0;
- rLoc = 2656;
+ rLoc = 400;
rType = 0;
- vrLen = 2056;
- vrLoc = 1257;
+ vrLen = 930;
+ vrLoc = 24;
};
- 4973B121123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 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}}";
+ sepNavSelRange = "{2219, 0}";
+ sepNavVisRange = "{1525, 1281}";
+ sepNavWindowFrame = "{{8, 4}, {802, 774}}";
+ };
+ };
+ 4970EDFD123925F60043F7B1 /* shmaterial.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1051, 688}}";
+ sepNavSelRange = "{536, 18}";
+ sepNavVisRange = "{0, 1118}";
+ sepNavWindowFrame = "{{15, -1}, {802, 774}}";
+ };
+ };
+ 4970EE0E1239CA840043F7B1 /* qtmaterialinfowidget.h */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {981, 752}}";
+ sepNavSelRange = "{400, 0}";
+ sepNavVisRange = "{24, 930}";
+ sepNavWindowFrame = "{{15, -1}, {802, 774}}";
+ };
+ };
+ 4970EE101239CD470043F7B1 /* qtmaterialinfowidget.cpp */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {1072, 1312}}";
+ sepNavSelRange = "{748, 0}";
+ sepNavVisRange = "{844, 1173}";
+ sepNavWindowFrame = "{{12, 4}, {802, 774}}";
+ };
+ };
+ 497754BC1234571000F4DCE4 /* osgnvcg1.cg */ = {
+ uiCtxt = {
+ sepNavIntBoundsRect = "{{0, 0}, {743, 1152}}";
+ sepNavSelRange = "{315, 0}";
+ sepNavVisRange = "{97, 937}";
+ sepNavWindowFrame = "{{15, -1}, {802, 774}}";
+ };
+ };
+ 49880E3D1245942400AC87B9 /* PBXBookmark */ = {
+ isa = PBXBookmark;
+ fRef = 497754BC1234571000F4DCE4 /* osgnvcg1.cg */;
+ };
+ 49880E5812459B5A00AC87B9 /* ShaderExec */ = {
+ activeExec = 0;
+ executables = (
+ 49880E5B12459B5A00AC87B9 /* ShaderExec */,
+ );
+ };
+ 49880E5B12459B5A00AC87B9 /* ShaderExec */ = {
+ isa = PBXExecutable;
+ activeArgIndices = (
+ );
+ argumentStrings = (
+ );
+ autoAttachOnCrash = 1;
+ breakpointsEnabled = 1;
+ configStateDict = {
+ };
+ customDataFormattersEnabled = 1;
+ debuggerPlugin = GDBDebugging;
+ disassemblyDisplayState = 0;
+ enableDebugStr = 1;
+ environmentEntries = (
+ );
+ executableSystemSymbolLevel = 0;
+ executableUserSymbolLevel = 0;
+ libgmallocEnabled = 0;
+ name = ShaderExec;
+ sourceDirectories = (
+ );
+ };
+ 49880E6412459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ name = "qtmainwindow.cpp: 102";
rLen = 0;
- rLoc = 2047;
+ rLoc = 3050;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 1260;
+ vrLoc = 1794;
};
- 4973B122123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 49880E6512459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 27";
+ fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
+ name = "qtmainwindow.cpp: 102";
rLen = 0;
- rLoc = 395;
+ rLoc = 3050;
rType = 0;
- vrLen = 881;
- vrLoc = 3;
+ vrLen = 1260;
+ vrLoc = 1794;
};
- 4973B123123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 49880E6812459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
+ fRef = 49880E6912459B8800AC87B9 /* flags.make */;
rLen = 0;
- rLoc = 333;
+ rLoc = 2147483650;
rType = 0;
- vrLen = 760;
- vrLoc = 0;
};
- 4973B124123B0ADA00CF35EA /* PBXTextBookmark */ = {
+ 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 = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ fRef = 49880E6B12459B8800AC87B9 /* flags.make */;
+ name = "flags.make: 5";
+ rLen = 0;
+ rLoc = 146;
rType = 0;
- vrLen = 530;
+ vrLen = 604;
vrLoc = 0;
};
- 4973B127123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 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 = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 27";
+ fRef = 49880E6F12459B8800AC87B9 /* build.make */;
rLen = 0;
- rLoc = 395;
+ rLoc = 2147483647;
rType = 0;
- vrLen = 881;
- vrLoc = 3;
};
- 4973B128123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 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 = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 22";
+ fRef = 49880E7112459B8800AC87B9 /* build.make */;
+ name = "build.make: 1";
rLen = 0;
- rLoc = 325;
+ rLoc = 0;
rType = 0;
- vrLen = 915;
- vrLoc = 0;
+ vrLen = 2428;
+ vrLoc = 955;
};
- 4973B129123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 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 = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 72";
+ fRef = 49880E7512459B8800AC87B9 /* Makefile */;
rLen = 0;
- rLoc = 2656;
+ rLoc = 2147483647;
rType = 0;
- vrLen = 2056;
- vrLoc = 1257;
};
- 4973B12A123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 49880E7512459B8800AC87B9 /* Makefile */ = {
+ isa = PBXFileReference;
+ lastKnownFileType = sourcecode.make;
+ name = Makefile;
+ path = /Users/vijayjoseph/projects/shaderz/Makefile;
+ sourceTree = "<absolute>";
+ };
+ 49880E7612459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 84";
+ fRef = 49880E7712459B8800AC87B9 /* Makefile */;
+ name = "Makefile: 1";
rLen = 0;
- rLoc = 3309;
+ rLoc = 0;
rType = 0;
- vrLen = 2110;
- vrLoc = 1275;
+ vrLen = 1384;
+ vrLoc = 6306;
};
- 4973B12B123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 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 = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 9";
+ fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
+ name = "qtshaderparameterwidget.cpp: 13";
rLen = 0;
- rLoc = 80;
+ rLoc = 318;
rType = 0;
- vrLen = 807;
+ vrLen = 1081;
vrLoc = 0;
};
- 4973B12C123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 49880E7912459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ fRef = 490BCCC91244538F00ED1410 /* qtshaderparameterwidget.cpp */;
+ name = "qtshaderparameterwidget.cpp: 44";
rLen = 0;
- rLoc = 2047;
+ rLoc = 2546;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 1091;
+ vrLoc = 619;
};
- 4973B12D123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 49880E7A12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
+ fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
+ name = "shshaderinterface.cpp: 106";
rLen = 0;
- rLoc = 333;
+ rLoc = 2650;
rType = 0;
- vrLen = 760;
- vrLoc = 0;
+ vrLen = 1295;
+ vrLoc = 529;
};
- 4973B12E123B0B3B00CF35EA /* PBXTextBookmark */ = {
+ 49880E7B12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
+ name = "shshaderinterface.cpp: 106";
+ rLen = 0;
+ rLoc = 2650;
rType = 0;
- vrLen = 530;
- vrLoc = 0;
+ vrLen = 1305;
+ vrLoc = 232;
};
- 4973B12F123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E7C12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 41";
- rLen = 0;
- rLoc = 730;
+ fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
+ name = "shshaderinterface.h: 21";
+ rLen = 24;
+ rLoc = 572;
rType = 0;
- vrLen = 944;
- vrLoc = 3;
+ vrLen = 1811;
+ vrLoc = 1554;
};
- 4973B130123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E7D12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C717A81233984000171C0E /* shshaderinterface.h */;
- name = "shshaderinterface.h: 84";
- rLen = 0;
- rLoc = 3309;
+ name = "shshaderinterface.h: 21";
+ rLen = 24;
+ rLoc = 572;
rType = 0;
- vrLen = 2110;
- vrLoc = 1275;
+ vrLen = 1811;
+ vrLoc = 1554;
};
- 4973B131123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E7E12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C717A91233986000171C0E /* shshaderinterface.cpp */;
- name = "shshaderinterface.cpp: 9";
+ fRef = 493DCC62124118A700FCFD87 /* qtshaderparameterwidget.h */;
+ name = "qtshaderparameterwidget.h: 36";
rLen = 0;
- rLoc = 80;
+ rLoc = 1062;
rType = 0;
- vrLen = 807;
- vrLoc = 0;
+ vrLen = 1233;
+ vrLoc = 239;
};
- 4973B132123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E7F12459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ 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 = 2047;
+ rLoc = 363;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 937;
+ vrLoc = 97;
};
- 4973B133123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E8312459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4970EDFD123925F60043F7B1 /* shmaterial.h */;
- name = "shmaterial.h: 22";
- rLen = 0;
- rLoc = 333;
+ name = "shmaterial.h: 27";
+ rLen = 18;
+ rLoc = 536;
rType = 0;
- vrLen = 760;
+ vrLen = 1118;
vrLoc = 0;
};
- 4973B134123B0B6900CF35EA /* PBXTextBookmark */ = {
+ 49880E8412459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 49C7DC891232AFB600E24C8D /* qtmainwindow.h */;
- name = "qtmainwindow.h: 30";
- rLen = 13;
- rLoc = 542;
+ name = "qtmainwindow.h: 37";
+ rLen = 15;
+ rLoc = 656;
rType = 0;
- vrLen = 530;
- vrLoc = 0;
+ vrLen = 706;
+ vrLoc = 22;
};
- 4973B13A123B0C0C00CF35EA /* PBXTextBookmark */ = {
+ 49880E8512459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 41";
+ name = "shmaterial.cpp: 87";
rLen = 0;
- rLoc = 730;
+ rLoc = 2219;
rType = 0;
- vrLen = 944;
- vrLoc = 3;
+ vrLen = 1281;
+ vrLoc = 1525;
};
- 4973B13B123B0C0C00CF35EA /* PBXTextBookmark */ = {
+ 49880E8612459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 4970EDF0123925BB0043F7B1 /* shmaterial.cpp */;
- name = "shmaterial.cpp: 41";
+ fRef = 493DCC681242174100FCFD87 /* shshaderprogram.h */;
+ name = "shshaderprogram.h: 1";
rLen = 0;
- rLoc = 707;
+ rLoc = 0;
rType = 0;
- vrLen = 922;
- vrLoc = 3;
+ vrLen = 1394;
+ vrLoc = 356;
};
- 4973B13C123B0C0C00CF35EA /* PBXTextBookmark */ = {
+ 49880E8712459B8800AC87B9 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 49C7DC8F1232AFB600E24C8D /* qtmainwindow.cpp */;
- name = "qtmainwindow.cpp: 109";
+ fRef = 493DCC6A1242174100FCFD87 /* Program */;
+ name = "Program: 1";
rLen = 0;
- rLoc = 2047;
+ rLoc = 0;
rType = 0;
- vrLen = 915;
- vrLoc = 2231;
+ vrLen = 1839;
***The diff for this file has been truncated for email.***
=======================================
--- /trunk/src/qt/qtmainwindow.cpp Sat Sep 11 19:27:35 2010
+++ /trunk/src/qt/qtmainwindow.cpp Sat Sep 18 19:34:58 2010
@@ -10,6 +10,7 @@
#include "qt/qtshaderzviewwidget.h"
#include "qt/qtmaterialinfowidget.h"
+#include "qt/qtshaderparameterwidget.h"
#include "shmaterial.h"
#include "shshaderinterface.h"
#include "shlogger.h"
@@ -93,6 +94,26 @@
// set the shader
osg::Node* viewRoot = m_pViewWidget->getRoot();
- osg::StateSet* ss = viewRoot->getOrCreateStateSet();
- ss->setAttributeAndModes(m_pTestMaterial);
-}
+ osg::StateSet* ss = viewRoot ? viewRoot->getOrCreateStateSet() : 0;
+ if( ss )
+ {
+ ss->setAttributeAndModes(m_pTestMaterial);
+ }
+ else
+ {
+ 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/shmaterial.cpp Sat Sep 11 19:27:35 2010
+++ /trunk/src/shmaterial.cpp Sat Sep 18 19:34:58 2010
@@ -84,8 +84,7 @@
return InParam.direction != SH_PARAMETERDIR_OUT
&& InParam.direction != SH_PARAMETERDIR_INOUT
&& InParam.semantic != SH_PARAMETERSEMANTIC_POSITION
- && InParam.semantic != SH_PARAMETERSEMANTIC_NORMAL
- && InParam.paramClass != SH_PARAMETERCLASS_MATRIX;
+ && InParam.semantic != SH_PARAMETERSEMANTIC_NORMAL;
}
shShaderInterface::shShaderParameter
shMaterial::filterStructEditableProperties(const
shShaderInterface::shShaderParameter& InStructParam) const
=======================================
--- /trunk/src/shshaderinterface.cpp Fri Sep 10 23:40:37 2010
+++ /trunk/src/shshaderinterface.cpp Sat Sep 18 19:34:58 2010
@@ -103,7 +103,7 @@
return false;
}
// search for Global and Program parameters
- CGenum query[] = { CG_GLOBAL /*, CG_PROGRAM*/ };
+ CGenum query[] = { CG_GLOBAL , CG_PROGRAM };
for( unsigned int i=0; i<sizeof(query)/sizeof(query[0]); ++i )
{
CGparameter pParam = cgGetFirstParameter( m_ShaderHandle, query[i] );