SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-11 20:18:55 +00:00
parent d7dc7d16a6
commit 11853c0fed
10 changed files with 515 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qglengine/qglview.cpp
View File

@@ -44,8 +44,10 @@ QGLView::QGLView(): OpenGLWindow(), renderer_(this), mouse(this) {
shaders_supported = false; shaders_supported = false;
fps_cnt = 0; fps_cnt = 0;
fps_tm = fps_ = 0.; fps_tm = fps_ = 0.;
fogDensity_ = fogEnd_ = 1.; fogColor_ = Qt::darkGray;
fogStart_ = 0.; fogDensity_ = 0.;
fogDecay_1 = 0.1;
fogDecay_0 = fogDecay_2 = 0.;
hoverHaloFill_ = selectionHaloFill_ = 0.15f; hoverHaloFill_ = selectionHaloFill_ = 0.15f;
//lmode = Simple; //lmode = Simple;
setFeature(qglFXAA, false); setFeature(qglFXAA, false);

18
qglengine/qglview.h
View File

@@ -55,8 +55,9 @@ class QGLView: public OpenGLWindow
Q_PROPERTY (QColor fogColor READ fogColor WRITE setFogColor) Q_PROPERTY (QColor fogColor READ fogColor WRITE setFogColor)
Q_PROPERTY (bool fogEnabled READ isFogEnabled WRITE setFogEnabled) Q_PROPERTY (bool fogEnabled READ isFogEnabled WRITE setFogEnabled)
Q_PROPERTY (float fogDensity READ fogDensity WRITE setFogDensity) Q_PROPERTY (float fogDensity READ fogDensity WRITE setFogDensity)
Q_PROPERTY (float fogStart READ fogStart WRITE setFogStart) Q_PROPERTY (float fogDecayConst READ fogDecayConst WRITE setFogDecayConst)
Q_PROPERTY (float fogEnd READ fogEnd WRITE setFogEnd) Q_PROPERTY (float fogDecayLinear READ fogDecayLinear WRITE setFogDecayLinear)
Q_PROPERTY (float fogDecayQuadratic READ fogDecayQuadratic WRITE setFogDecayQuadratic)
Q_PROPERTY (int renderMode READ renderMode WRITE setRenderMode) Q_PROPERTY (int renderMode READ renderMode WRITE setRenderMode)
Q_PROPERTY (bool grabMouse READ isGrabMouseEnabled WRITE setGrabMouseEnabled) Q_PROPERTY (bool grabMouse READ isGrabMouseEnabled WRITE setGrabMouseEnabled)
Q_PROPERTY (bool mouseRotate READ isMouseRotateEnabled WRITE setMouseRotateEnabled) Q_PROPERTY (bool mouseRotate READ isMouseRotateEnabled WRITE setMouseRotateEnabled)
@@ -119,8 +120,9 @@ public:
QColor ambientColor() const {return ambientColor_;} QColor ambientColor() const {return ambientColor_;}
QColor fogColor() const {return fogColor_;} QColor fogColor() const {return fogColor_;}
float fogDensity() const {return fogDensity_;} float fogDensity() const {return fogDensity_;}
float fogStart() const {return fogStart_;} float fogDecayConst() const {return fogDecay_0;}
float fogEnd() const {return fogEnd_;} float fogDecayLinear() const {return fogDecay_1;}
float fogDecayQuadratic() const {return fogDecay_2;}
bool isFogEnabled() const {return fogEnabled_;} bool isFogEnabled() const {return fogEnabled_;}
bool isLightEnabled() const {return lightEnabled_;} bool isLightEnabled() const {return lightEnabled_;}
bool isGrabMouseEnabled() const {return mouse.isGrabMouseEnabled();} bool isGrabMouseEnabled() const {return mouse.isGrabMouseEnabled();}
@@ -222,7 +224,8 @@ private:
QHash<int, QVariant> features_; QHash<int, QVariant> features_;
QSize prev_size; QSize prev_size;
float lineWidth_; float lineWidth_;
float fogDensity_, fogStart_, fogEnd_, fps_, fps_tm, hoverHaloFill_, selectionHaloFill_, m_motionBlurFactor; float fogDensity_, fps_, fps_tm, fogDecay_0, fogDecay_1, fogDecay_2;
float hoverHaloFill_, selectionHaloFill_, m_motionBlurFactor;
int timer, fps_cnt, sh_id_loc, deleting_; int timer, fps_cnt, sh_id_loc, deleting_;
bool is_first_draw, is_init, fogEnabled_, lightEnabled_; bool is_first_draw, is_init, fogEnabled_, lightEnabled_;
bool shaders_supported, changed_, need_init_; bool shaders_supported, changed_, need_init_;
@@ -241,8 +244,9 @@ public slots:
void setAmbientColor(const QColor & arg) {ambientColor_ = arg;} void setAmbientColor(const QColor & arg) {ambientColor_ = arg;}
void setFogColor(const QColor & arg) {fogColor_ = arg;} void setFogColor(const QColor & arg) {fogColor_ = arg;}
void setFogDensity(const float & arg) {fogDensity_ = arg;} void setFogDensity(const float & arg) {fogDensity_ = arg;}
void setFogStart(const float & arg) {fogStart_ = arg;} void setFogDecayConst(const float & arg) {fogDecay_0 = arg;}
void setFogEnd(const float & arg) {fogEnd_ = arg;} void setFogDecayLinear(const float & arg) {fogDecay_1 = arg;}
void setFogDecayQuadratic(const float & arg) {fogDecay_2 = arg;}
void setFogEnabled(const bool & arg) {fogEnabled_ = arg;} void setFogEnabled(const bool & arg) {fogEnabled_ = arg;}
void setLightEnabled(const bool & arg) {lightEnabled_ = arg;} void setLightEnabled(const bool & arg) {lightEnabled_ = arg;}
void setGrabMouseEnabled(const bool & arg) {mouse.setGrabMouseEnabled(arg);} void setGrabMouseEnabled(const bool & arg) {mouse.setGrabMouseEnabled(arg);}

35
qglengine/qglview_test/qglview_window.cpp
View File

@@ -152,23 +152,6 @@ void QGLViewWindow::loadFile(const QString & path, bool import) {
} }
void QGLViewWindow::selectionChanged() {
ObjectBase * sel_obj = view->view()->selectedObject();
labelName->setText(sel_obj ? sel_obj->name() : "");
/**if (cur == 0) box->hide();
else {
box->setScale(cur->boundingBox().size());
box->setPos(cur->boundingBox().pos());
Box3D b = cur->boundingBox().movedTo(-cur->boundingBox().center());
b.z = -b.z - b.height;
ps->setEmitterRect(b);
cur->addChild(box);
box->show();
}*/
//qDebug() << sel_obj->boundingBox();
}
void QGLViewWindow::on_actionReset_triggered() { void QGLViewWindow::on_actionReset_triggered() {
///view->view()->removeObject(axis, false); ///view->view()->removeObject(axis, false);
view->view()->scene()->destroy(); view->view()->scene()->destroy();
@@ -242,24 +225,6 @@ void QGLViewWindow::view_keyEvent(Qt::Key k, Qt::KeyboardModifiers m) {
default: break; default: break;
} }
} }
\
void QGLViewWindow::on_pushButton_clicked() {
//view->view()->removeLight(view->view()->lightsCount() - 1);
//setWindowTitle(QString::number(view->view()->lightsCount()));
//QVector3D wp = view->view()->light(0)->worldPos();
//view->view()->camera()->setPos(wp);
//view->view()->camera()->setAim(wp + (view->view()->light(0)->worldTransform() * QVector4D(view->view()->light(0)->direction)).toVector3D()*100);
}
void QGLViewWindow::on_pushButton_3_clicked() {
/*ObjectBaseList ol = view->view()->objects(true);
qDebug() << ol.size();
foreach (ObjectBase * i, ol) {
//i->VBO().rebuffer();
}*/
}
void QGLViewWindow::on_actionAdd_plane_triggered() { void QGLViewWindow::on_actionAdd_plane_triggered() {

9
qglengine/qglview_test/qglview_window.h
View File

@@ -109,12 +109,9 @@ private slots:
void on_actionSaveSelected_triggered(); void on_actionSaveSelected_triggered();
void on_actionOpen_triggered(); void on_actionOpen_triggered();
void selectionChanged();
void view_keyEvent(Qt::Key k, Qt::KeyboardModifiers m); void view_keyEvent(Qt::Key k, Qt::KeyboardModifiers m);
void on_pushButton_clicked();
void on_pushButton_2_clicked() {view->view()->reloadShaders();} void on_pushButton_2_clicked() {view->view()->reloadShaders();}
void on_pushButton_3_clicked();
void on_actionAdd_plane_triggered(); void on_actionAdd_plane_triggered();
void on_actionAdd_cube_triggered(); void on_actionAdd_cube_triggered();
@@ -125,6 +122,12 @@ private slots:
void on_actionRotate_triggered(bool on); void on_actionRotate_triggered(bool on);
void on_actionScale_triggered(bool on); void on_actionScale_triggered(bool on);
void on_colorFogBack_colorChanged(const QColor & v) {view->view()->setFogColor(v);}
void on_spinFogDensity_valueChanged(double v) {view->view()->setFogDensity(v);}
void on_spinFogDecayConst_valueChanged(double v) {view->view()->setFogDecayConst(v);}
void on_spinFogDecayLinear_valueChanged(double v) {view->view()->setFogDecayLinear(v);}
void on_spinFogDecayQuadratic_valueChanged(double v) {view->view()->setFogDecayQuadratic(v);}
public slots: public slots:
signals: signals:

291
qglengine/qglview_test/qglview_window.ui
View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1125</width> <width>1107</width>
<height>1032</height> <height>878</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -37,23 +37,6 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QLabel" name="labelName">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
@@ -73,6 +56,9 @@
<attribute name="title"> <attribute name="title">
<string>Common</string> <string>Common</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QFormLayout" name="formLayout_9"> <layout class="QFormLayout" name="formLayout_9">
<property name="fieldGrowthPolicy"> <property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
@@ -80,6 +66,18 @@
<property name="labelAlignment"> <property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
@@ -103,7 +101,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Depth</string> <string>Depth start</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -211,7 +209,12 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0" colspan="2"> </layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QGroupBox" name="groupHoverHalo"> <widget class="QGroupBox" name="groupHoverHalo">
<property name="title"> <property name="title">
<string>Hover halo</string> <string>Hover halo</string>
@@ -266,7 +269,34 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="10" column="0" colspan="2"> <item row="1" column="0">
<widget class="QCheckBox" name="checkFXAA">
<property name="text">
<string>FXAA</string>
</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>
<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="2" column="1">
<widget class="QGroupBox" name="groupSelectionHalo"> <widget class="QGroupBox" name="groupSelectionHalo">
<property name="title"> <property name="title">
<string>Selection halo</string> <string>Selection halo</string>
@@ -321,13 +351,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="11" column="0" colspan="2"> <item row="2" column="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="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_13">
<item row="0" column="0"> <item>
<widget class="QCheckBox" name="checkCameraOrbit"> <widget class="QCheckBox" name="checkCameraOrbit">
<property name="text"> <property name="text">
<string>Orbit</string> <string>Orbit</string>
@@ -337,7 +367,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QCheckBox" name="checkCameraLight"> <widget class="QCheckBox" name="checkCameraLight">
<property name="text"> <property name="text">
<string>Camera Light</string> <string>Camera Light</string>
@@ -350,35 +380,176 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> </layout>
<layout class="QGridLayout" name="gridLayout_2"> </item>
<item row="1" column="0"> <item>
<widget class="QCheckBox" name="checkFXAA"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Fog</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>FXAA</string> <string>Density:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item>
<widget class="QCheckBox" name="checkAutoExposure"> <widget class="SpinSlider" name="spinFogDensity">
<property name="text"> <property name="minimum">
<string>Auto exposure</string> <double>0.000000000000000</double>
</property> </property>
<property name="checked"> <property name="maximum">
<bool>true</bool> <double>10.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
<property name="decimals">
<number>3</number>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="pageStep">
<double>0.100000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QCheckBox" name="checkService"> <widget class="ColorButton" name="colorFogBack">
<property name="color">
<color>
<red>128</red>
<green>128</green>
<blue>128</blue>
</color>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_25">
<property name="text"> <property name="text">
<string>Service mode</string> <string>Decay:</string>
</property> </property>
<property name="checked"> </widget>
<bool>true</bool> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_26">
<property name="text">
<string>^0:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="SpinSlider" name="spinFogDecayConst">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>1.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
<property name="decimals">
<number>3</number>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="pageStep">
<double>0.100000000000000</double>
</property>
<property name="spinMaximum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_24">
<property name="text">
<string>^1:</string>
</property>
</widget>
</item>
<item>
<widget class="SpinSlider" name="spinFogDecayLinear">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>1.000000000000000</double>
</property>
<property name="value">
<double>0.100000000000000</double>
</property>
<property name="decimals">
<number>3</number>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="pageStep">
<double>0.100000000000000</double>
</property>
<property name="spinMaximum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_23">
<property name="text">
<string>^2:</string>
</property>
</widget>
</item>
<item>
<widget class="SpinSlider" name="spinFogDecayQuadratic">
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>1.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
<property name="decimals">
<number>3</number>
</property>
<property name="singleStep">
<double>0.050000000000000</double>
</property>
<property name="pageStep">
<double>0.100000000000000</double>
</property>
<property name="spinMaximum">
<double>1.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>
@@ -401,7 +572,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>951</width> <width>934</width>
<height>737</height> <height>737</height>
</rect> </rect>
</property> </property>
@@ -949,13 +1120,6 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton">
<property name="text">
<string>remove light</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="pushButton_2">
<property name="text"> <property name="text">
@@ -963,27 +1127,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButton_3">
<property name="text">
<string>rebuff all</string>
</property>
</widget>
</item>
<item>
<widget class="ColorButton" name="colorMouse">
<property name="color">
<color>
<red>10</red>
<green>10</green>
<blue>10</blue>
</color>
</property>
<property name="useAlphaChannel">
<bool>false</bool>
</property>
</widget>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@@ -1040,8 +1183,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>990</width> <width>973</width>
<height>853</height> <height>719</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
@@ -1123,7 +1266,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1125</width> <width>1107</width>
<height>24</height> <height>24</height>
</rect> </rect>
</property> </property>

21
qglengine/renderer.cpp
View File

@@ -157,10 +157,11 @@ void Renderer::initShaders() {
prog->setUniformValue(QString("tex_%1").arg(i).toLatin1().constData(), i); prog->setUniformValue(QString("tex_%1").arg(i).toLatin1().constData(), i);
} }
if (bindShader(srFinalPass, &prog)) { if (bindShader(srFinalPass, &prog)) {
prog->setUniformValue("tex_s_0", 0); prog->setUniformValue("tex_g1" , 0);
prog->setUniformValue("tex_s_1", 1); prog->setUniformValue("tex_s_0", 1);
prog->setUniformValue("tex_t_0", 2); prog->setUniformValue("tex_s_1", 2);
prog->setUniformValue("tex_t_1", 3); prog->setUniformValue("tex_t_0", 3);
prog->setUniformValue("tex_t_1", 4);
} }
if (bindShader(srGeometryPass, &prog)) { if (bindShader(srGeometryPass, &prog)) {
setUniformMaps(prog); setUniformMaps(prog);
@@ -240,6 +241,9 @@ void Renderer::renderLight(int first_wr_buff) {
setUniformViewCorners(prog, cam); setUniformViewCorners(prog, cam);
prog->setUniformValue("lights_start", lights_start[pass.second]); prog->setUniformValue("lights_start", lights_start[pass.second]);
prog->setUniformValue("lights_count", cur_lights[pass.second].size()); prog->setUniformValue("lights_count", cur_lights[pass.second].size());
prog->setUniformValue("fog_color", view->fogColor_);
prog->setUniformValue("fog_decay", QVector3D(view->fogDecay_0, view->fogDecay_1, view->fogDecay_2));
prog->setUniformValue("fog_density", view->fogDensity_);
fbo_out.setWriteBuffer(first_wr_buff + pass.second); fbo_out.setWriteBuffer(first_wr_buff + pass.second);
glClearFramebuffer(Qt::black, false); glClearFramebuffer(Qt::black, false);
renderQuad(prog, quad, cam); renderQuad(prog, quad, cam);
@@ -319,10 +323,11 @@ void Renderer::renderScene() {
/// blending layers /// blending layers
if (bindShader(srFinalPass, &prog)) { if (bindShader(srFinalPass, &prog)) {
fbo_out.bindColorTexture(obrSolidOmni , 0); //fbo_ds .bindColorTexture(dbrNormalZ , 0);
fbo_out.bindColorTexture(obrSolidSpot , 1); fbo_out.bindColorTexture(obrSolidOmni , 1);
fbo_out.bindColorTexture(obrTransparentOmni, 2); fbo_out.bindColorTexture(obrSolidSpot , 2);
fbo_out.bindColorTexture(obrTransparentSpot, 3); fbo_out.bindColorTexture(obrTransparentOmni, 3);
fbo_out.bindColorTexture(obrTransparentSpot, 4);
fbo_out.setWriteBuffer(obrSum); fbo_out.setWriteBuffer(obrSum);
renderQuad(prog, quad); renderQuad(prog, quad);
} }

10
qglengine/renderer.h
View File

@@ -54,11 +54,11 @@ class Renderer: public RendererBase {
srTonemapPass, srTonemapPass,
}; };
enum DeferredBufferRole { enum DeferredBufferRole {
dbrDiffuseRough, dbrDiffuse,
dbrNormalReflect, dbrNormalZ,
dbrSpecularHeight, dbrSpecularReflect,
dbrEmissionBitangX, dbrEmissionRough,
dbrSpeedBitangXY, //dbrSpeedBitangXY,
}; };
enum OutBufferRole { enum OutBufferRole {
obrTonemap, obrTonemap,

2
qglengine/shaders/ds_final.glsl
View File

@@ -7,7 +7,7 @@ void main(void) {
// frag // // frag //
uniform sampler2D tex_s_0, tex_s_1, tex_t_0, tex_t_1; uniform sampler2D tex_g1, tex_s_0, tex_s_1, tex_t_0, tex_t_1;
void main(void) { void main(void) {
ivec2 tc = ivec2(gl_FragCoord.xy); ivec2 tc = ivec2(gl_FragCoord.xy);

15
qglengine/shaders/ds_light.glsl
View File

@@ -19,6 +19,10 @@ uniform float z_near;
uniform sampler2D tex_0, tex_1, tex_2, tex_3, tex_4; uniform sampler2D tex_0, tex_1, tex_2, tex_3, tex_4;
uniform int lights_start, lights_count; uniform int lights_start, lights_count;
uniform vec4 fog_color = vec4(0.5, 0.5, 0.5, 1);
uniform vec3 fog_decay = vec3(0, 0.1, 0); // [^0, ^1, ^2]
uniform float fog_density = 0;
const vec3 luma = vec3(0.299, 0.587, 0.114); const vec3 luma = vec3(0.299, 0.587, 0.114);
const float _pe = 2.4e-7; const float _pe = 2.4e-7;
@@ -93,7 +97,7 @@ void main(void) {
vec4 v1 = texelFetch(tex_1, tc, 0); vec4 v1 = texelFetch(tex_1, tc, 0);
float z = v1.w; float z = v1.w;
if (z == 1.) { if (z == 1.) {
qgl_FragColor = vec4(0); qgl_FragColor = vec4(fog_color.rgb, 0);
return; return;
} }
vec4 v0 = texelFetch(tex_0, tc, 0), vec4 v0 = texelFetch(tex_0, tc, 0),
@@ -124,7 +128,12 @@ void main(void) {
si = vec3(0.); si = vec3(0.);
for (int i = 0; i < lights_count; ++i) for (int i = 0; i < lights_count; ++i)
calcLight(lights_start + i, normal, v); calcLight(lights_start + i, normal, v);
vec3 res_col = max(vec3(0), li * diffuse + si * specular + emission);
qgl_FragColor = vec4(max(vec3(0), li * diffuse + si * specular + emission), alpha); float plen = length(pos.xyz);
//qgl_FragColor. = vec3(alpha); float fog = clamp(dot(fog_decay, vec3(1, plen, plen*plen)) * fog_color.a * fog_density, 0, 1);
res_col = mix(res_col, fog_color.rgb, fog);
qgl_FragColor = vec4(res_col, alpha);
//qgl_FragColor.rgb = vec3(z);
} }

3
qglengine/shaders/ds_tonemap.glsl
View File

@@ -20,5 +20,6 @@ void main(void) {
float g = gamma / frame_max; float g = gamma / frame_max;
res /= l; res /= l;
l = 1 - exp(-l*g); l = 1 - exp(-l*g);
qgl_FragColor.rgb = res * l; res *= l;
qgl_FragColor = vec4(res, dot(res, luma));
} }