SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@675 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-10 23:04:47 +00:00
parent 816d905446
commit be01546497
4 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qglengine/core/glshaders_headers.h
View File

@@ -22,7 +22,7 @@
namespace QGLEngineShaders { namespace QGLEngineShaders {
const int max_materials = 128; const int max_materials = 128;
const int max_lights = 64 ; const int max_lights = 256 ;
const char qgl_common_head[] = const char qgl_common_head[] =
"#version 400 core\n" "#version 400 core\n"
@@ -120,10 +120,10 @@ const char qgl_uniform[] =
" QGLMaterial qgl_material[128];\n" " QGLMaterial qgl_material[128];\n"
"};\n" "};\n"
"layout (std140) uniform QGLLightParameterData {\n" "layout (std140) uniform QGLLightParameterData {\n"
" QGLLightParameter qgl_light_parameter[64];\n" " QGLLightParameter qgl_light_parameter[256];\n"
"};\n" "};\n"
"layout (std140) uniform QGLLightPositionData {\n" "layout (std140) uniform QGLLightPositionData {\n"
" QGLLightPosition qgl_light_position[64];\n" " QGLLightPosition qgl_light_position[256];\n"
"};\n" "};\n"
"uniform sampler2DArray qgl_texture_array[2];\n" "uniform sampler2DArray qgl_texture_array[2];\n"
""; "";

3
qglengine/qglview.h
View File

@@ -141,6 +141,9 @@ public:
int renderMode() const {return (int)rmode;} int renderMode() const {return (int)rmode;}
void setRenderMode(int mode) {rmode = (ObjectBase::RenderMode)mode;} void setRenderMode(int mode) {rmode = (ObjectBase::RenderMode)mode;}
bool isServiceMode() const {return renderer_.edit_mode;}
void setServiceMode(bool yes) {renderer_.edit_mode = yes;}
// void addObject(GLObjectBase & o) {addObject(&o);} // void addObject(GLObjectBase & o) {addObject(&o);}
Scene::SelectionMode selectionMode() const {return scene_->selectionMode();} Scene::SelectionMode selectionMode() const {return scene_->selectionMode();}

1
qglengine/qglview_test/qglview_window.h
View File

@@ -77,6 +77,7 @@ private slots:
void on_colorAmbient_colorChanged(QColor color) {view->view()->setAmbientColor(color);} void on_colorAmbient_colorChanged(QColor color) {view->view()->setAmbientColor(color);}
void on_checkCameraOrbit_clicked(bool val) {view->view()->setCameraOrbit(val);} void on_checkCameraOrbit_clicked(bool val) {view->view()->setCameraOrbit(val);}
void on_checkCameraLight_clicked(bool val) {view->view()->setCameraLightOn(val);} void on_checkCameraLight_clicked(bool val) {view->view()->setCameraLightOn(val);}
void on_checkService_clicked(bool val) {view->view()->setServiceMode(val);}
void on_groupShadows_clicked(bool val) {view->view()->setFeature(QGLView::qglShadowsEnabled, val);} void on_groupShadows_clicked(bool val) {view->view()->setFeature(QGLView::qglShadowsEnabled, val);}
void on_groupEyeAccomodation_clicked(bool val) {view->view()->setFeature(QGLView::qglEyeAccomodationEnabled, val);} void on_groupEyeAccomodation_clicked(bool val) {view->view()->setFeature(QGLView::qglEyeAccomodationEnabled, val);}

56
qglengine/qglview_test/qglview_window.ui
View File

@@ -211,14 +211,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="9" column="0" colspan="2">
<widget class="QCheckBox" name="checkFXAA">
<property name="text">
<string>FXAA</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<widget class="QGroupBox" name="groupHoverHalo"> <widget class="QGroupBox" name="groupHoverHalo">
<property name="title"> <property name="title">
<string>Hover halo</string> <string>Hover halo</string>
@@ -273,7 +266,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<widget class="QGroupBox" name="groupSelectionHalo"> <widget class="QGroupBox" name="groupSelectionHalo">
<property name="title"> <property name="title">
<string>Selection halo</string> <string>Selection halo</string>
@@ -328,13 +321,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="10" column="0" colspan="2"> <item row="11" column="0" colspan="2">
<widget class="QGroupBox" name="groupCamera"> <widget class="QGroupBox" name="groupCamera">
<property name="title"> <property name="title">
<string>Camera</string> <string>Camera</string>
</property> </property>
<layout class="QFormLayout" name="formLayout_10"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2"> <item row="0" column="0">
<widget class="QCheckBox" name="checkCameraOrbit"> <widget class="QCheckBox" name="checkCameraOrbit">
<property name="text"> <property name="text">
<string>Orbit</string> <string>Orbit</string>
@@ -344,7 +337,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="0" column="1">
<widget class="QCheckBox" name="checkCameraLight"> <widget class="QCheckBox" name="checkCameraLight">
<property name="text"> <property name="text">
<string>Camera Light</string> <string>Camera Light</string>
@@ -358,14 +351,35 @@
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<widget class="QCheckBox" name="checkAutoExposure"> <layout class="QGridLayout" name="gridLayout_2">
<property name="text"> <item row="1" column="0">
<string>Auto exposure</string> <widget class="QCheckBox" name="checkFXAA">
</property> <property name="text">
<property name="checked"> <string>FXAA</string>
<bool>true</bool> </property>
</property> </widget>
</widget> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkAutoExposure">
<property name="text">
<string>Auto exposure</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkService">
<property name="text">
<string>Service mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>