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

relief map support, small refactoring, shadow bias now based on geometry normal

Browse Source
This commit is contained in:
Пелипенко Иван
2023-03-02 11:46:52 +03:00
parent adf8c4d7f0
commit 64eee9e607
26 changed files with 465 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/CMakeLists.txt
View File

@@ -22,7 +22,8 @@ set_deploy_property(${PROJECT_NAME} ${QGLEngine_LIB_TYPE}
COMPANY "${QGLEngine_COMPANY}"
INFO "QGLEngine core library")
make_rc(${PROJECT_NAME} _RC)
qad_add_library(${PROJECT_NAME} ${QGLEngine_LIB_TYPE} out_CPP ${_RC})
pip_code_model(CCM "render/renderer.h" OPTIONS "-DQGLENGINE_CORE_EXPORT" "-Es")
qad_add_library(${PROJECT_NAME} ${QGLEngine_LIB_TYPE} out_CPP ${_RC} ${CCM})
qad_generate_export_header(${PROJECT_NAME})
list(APPEND out_HDR "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_export.h")
qad_target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" ${_includes})

8
src/core/core/glframebuffer.cpp
View File

@@ -297,6 +297,14 @@ void Framebuffer::bindColorTexture(int index, int channel) {
}
void Framebuffer::bindColorTextures(const QVector<int> & indeces) {
for (int i = indeces.size() - 1; i >= 0; --i) {
f->glActiveTexture(GL_TEXTURE0 + i);
f->glBindTexture(GL_TEXTURE_2D, colors[indeces[i]]);
}
}
void Framebuffer::bindColorTextures() {
for (int i = colors.size() - 1; i >= 0; --i) {
f->glActiveTexture(GL_TEXTURE0 + i);

1
src/core/core/glframebuffer.h
View File

@@ -77,6 +77,7 @@ public:
void copyDepthFrom(GLuint tex) { ; }
void bindColorTexture(int index, int channel = 0);
void bindColorTextures(const QVector<int> & indeces);
void bindColorTextures();
void bindDepthTexture(int channel);

12
src/core/core/glmaterial.cpp
View File

@@ -64,11 +64,21 @@ void Map::copyToQGLMap(QGLMap & m) const {
m.map_index = _layer;
} else {
m.array_index = 0;
m.map_index = (_type == mtNormal ? emrBlue : emrWhite);
m.map_index = emptyMapIndex(_type);
}
}
GLuint Map::emptyMapIndex(int type) {
switch (type) {
case mtNormal: return emrBlue;
case mtRelief: return emrBlack;
default: return emrWhite;
}
return 0;
}
Material::Material(const QString _name) {
setTypes();
name = _name;

1
src/core/core/glmaterial.h
View File

@@ -42,6 +42,7 @@ public:
void load(TextureManager * tm);
void setMapLayer(TextureManager * tm);
void copyToQGLMap(QGLEngineShaders::QGLMap & m) const;
static GLuint emptyMapIndex(int type);
QString bitmap_path;
GLuint bitmap_id;
QPointF bitmap_offset;

24
src/core/core/glprimitives.cpp
View File

@@ -21,23 +21,33 @@
#include "glmesh.h"
Mesh * Primitive::plane(float width, float length) {
Mesh * Primitive::plane(float width, float length, int width_segments, int length_segments) {
Mesh * ret = new Mesh();
QVector<QVector3D> & v(ret->vertices());
QVector<QVector3D> & n(ret->normals());
QVector<QVector2D> & t(ret->texcoords());
QVector<Vector3i> & i(ret->indicesTriangles());
float hw = width / 2.f, hl = length / 2.f;
for (int j = 0; j < 4; ++j)
n << QVector3D(0., 0., 1.);
t << QVector2D(0., 0.) << QVector2D(0., 1.) << QVector2D(1., 1.) << QVector2D(1., 0.);
v << QVector3D(-hw, -hl, 0.) << QVector3D(-hw, hl, 0.) << QVector3D(hw, hl, 0.) << QVector3D(hw, -hl, 0.);
i << Vector3i(0, 2, 1) << Vector3i(0, 3, 2);
float w1 = 1.f / width_segments, l1 = 1.f / length_segments;
int sind = 0;
for (int wi = 0; wi < width_segments; ++wi) {
for (int li = 0; li < length_segments; ++li) {
for (int j = 0; j < 4; ++j)
n << QVector3D(0., 0., 1.);
float ws = (float)wi / width_segments;
float ls = (float)li / length_segments;
t << QVector2D(ws, ls) << QVector2D(ws, ls + l1) << QVector2D(ws + w1, ls + l1) << QVector2D(ws + w1, ls);
v << QVector3D(ws * width - hw, ls * length - hl, 0.) << QVector3D(ws * width - hw, (ls + l1) * length - hl, 0.)
<< QVector3D((ws + w1) * width - hw, (ls + l1) * length - hl, 0.) << QVector3D((ws + w1) * width - hw, ls * length - hl, 0.);
i << Vector3i(sind + 0, sind + 2, sind + 1) << Vector3i(sind + 0, sind + 3, sind + 2);
sind += 4;
}
}
return ret;
}
Mesh * Primitive::cube(float width, float length, float height) {
Mesh * Primitive::cube(float width, float length, float height, int width_segments, int length_segments, int height_segments) {
Mesh * ret = new Mesh();
QVector3D scale(width, length, height);
QVector<QVector3D> & v(ret->vertices());

5
src/core/core/glprimitives.h
View File

@@ -25,9 +25,10 @@
namespace Primitive {
QGLENGINE_CORE_EXPORT Mesh * plane(float width = 1., float length = 1.);
QGLENGINE_CORE_EXPORT Mesh * plane(float width = 1., float length = 1., int width_segments = 1, int length_segments = 1);
QGLENGINE_CORE_EXPORT Mesh * cube(float width = 1., float length = 1., float height = 1.);
QGLENGINE_CORE_EXPORT Mesh *
cube(float width = 1., float length = 1., float height = 1., int width_segments = 1, int length_segments = 1, int height_segments = 1);
QGLENGINE_CORE_EXPORT Mesh * ellipsoid(int segments_wl, int segments_h, float radius = 1., float end_angle = 360.);

27
src/core/core/glshaders.cpp
View File

@@ -39,11 +39,18 @@ bool addShader(QOpenGLShaderProgram * prog,
if (add_qgl) {
switch (type) {
case QOpenGLShader::Fragment:
content.prepend(qgl_material_head);
content.prepend(qgl_fragment_head);
content.prepend(qgl_uniform);
content.prepend(qgl_uniform_light);
content.prepend(qgl_uniform_material);
content.prepend(qgl_structs);
break;
case QOpenGLShader::Vertex:
content.prepend(qgl_material_head);
content.prepend(qgl_vertex_head);
content.prepend(qgl_uniform_material);
content.prepend(qgl_structs);
break;
case QOpenGLShader::Vertex: content.prepend(qgl_vertex_head); break;
case QOpenGLShader::Geometry: content.prepend(qgl_geometry_head); break;
}
}
@@ -65,7 +72,11 @@ QString prepareDefines(const QStringList & defines) {
}
bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog, const QString & file, bool add_qgl, const QStringList & defines) {
bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog,
const QString & file,
bool add_qgl,
const QStringList & defines,
const QString & custom_header) {
if (!prog) prog = new QOpenGLShaderProgram();
prog->removeAllShaders();
QFile f(file);
@@ -74,7 +85,7 @@ bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog, const QStr
return false;
}
QTextStream ts(&f);
QString cur_shader, line, pl, defs = prepareDefines(defines);
QString cur_shader, line, pl, defs = prepareDefines(defines) + "\n" + custom_header;
QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();
while (!ts.atEnd()) {
line = ts.readLine();
@@ -118,10 +129,14 @@ bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog, const QStr
}
bool QGLEngineShaders::loadShaders(QOpenGLShaderProgram *& prog, const QStringList & files, bool add_qgl, const QStringList & defines) {
bool QGLEngineShaders::loadShaders(QOpenGLShaderProgram *& prog,
const QStringList & files,
bool add_qgl,
const QStringList & defines,
const QString & custom_header) {
if (!prog) prog = new QOpenGLShaderProgram();
prog->removeAllShaders();
QString cur_shader, defs = prepareDefines(defines);
QString cur_shader, defs = prepareDefines(defines) + "\n" + custom_header;
foreach(QString f, files) {
QFileInfo fi(f);
QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();

14
src/core/core/glshaders.h
View File

@@ -23,10 +23,16 @@
namespace QGLEngineShaders {
QGLENGINE_CORE_EXPORT bool
loadShadersMulti(QOpenGLShaderProgram *& prog, const QString & file, bool add_qgl = true, const QStringList & defines = QStringList());
QGLENGINE_CORE_EXPORT bool
loadShaders(QOpenGLShaderProgram *& prog, const QStringList & files, bool add_qgl = true, const QStringList & defines = QStringList());
QGLENGINE_CORE_EXPORT bool loadShadersMulti(QOpenGLShaderProgram *& prog,
const QString & file,
bool add_qgl = true,
const QStringList & defines = QStringList(),
const QString & custom_header = QString());
QGLENGINE_CORE_EXPORT bool loadShaders(QOpenGLShaderProgram *& prog,
const QStringList & files,
bool add_qgl = true,
const QStringList & defines = QStringList(),
const QString & custom_header = QString());
} // namespace QGLEngineShaders

118
src/core/core/glshaders_headers.h
View File

@@ -50,11 +50,7 @@ const char qgl_vertex_head[] = "layout(location = 1 ) in vec3 qgl_Vertex
"#define qgl_ObjectFlags qgl_ObjectIntegers[2]\n"
"";
const char qgl_fragment_head[] =
"in vec2 qgl_FragTexture;\n"
"flat in uint qgl_MaterialIndex;\n"
"out vec4 qgl_FragData[gl_MaxDrawBuffers];\n"
"uniform vec2 qgl_ViewSize;\n"
const char qgl_material_head[] =
"vec4 qgl_materialTexture(uint type, vec2 coord, vec4 tex_shift) {\n"
" coord *= qgl_material[qgl_MaterialIndex].map[type].scale;\n"
" vec4 t = texture(qgl_texture_array[qgl_material[qgl_MaterialIndex].map[type].array_index],\n"
@@ -63,62 +59,70 @@ const char qgl_fragment_head[] =
" t.rgb = t.rgb * qgl_material[qgl_MaterialIndex].map[type].amount + qgl_material[qgl_MaterialIndex].map[type].offset;\n"
" return t;\n"
"}\n"
"#define qgl_FragColor qgl_FragData[0]\n"
"";
const char qgl_geometry_head[] = "";
const char qgl_fragment_head[] = "in vec2 qgl_FragTexture;\n"
"flat in uint qgl_MaterialIndex;\n"
"out vec4 qgl_FragData[gl_MaxDrawBuffers];\n"
"uniform vec2 qgl_ViewSize;\n"
"#define qgl_FragColor qgl_FragData[0]\n"
"";
const char qgl_structs[] = "#define QGL_MAPS_COUNT 6\n"
"#define QGL_MAP_DIFFUSE 0\n"
"#define QGL_MAP_NORMAL 1\n"
"#define QGL_MAP_METALNESS 2\n"
"#define QGL_MAP_ROUGHNESS 3\n"
"#define QGL_MAP_EMISSION 4\n"
"#define QGL_MAP_RELIEF 5\n"
"#define QGL_TEXTURE_ARRAY_EMPTY 0\n"
"#define QGL_TEXTURE_ARRAY_MAPS 1\n"
"struct QGLMap {\n"
" float offset;\n"
" float amount;\n"
" vec2 scale;\n"
" uint array_index;\n"
" uint map_index;\n"
"};\n"
"struct QGLMaterial {\n"
" vec4 color_diffuse;\n"
" vec4 color_emission;\n"
" float transparency;\n"
" float reflectivity;\n"
" float iof;\n"
" float dispersion;\n"
" QGLMap map[QGL_MAPS_COUNT];\n"
"};\n"
"struct QGLLightParameter {\n"
" vec4 color;\n"
" vec4 decay_intensity;\n"
" vec4 angles;\n"
" float size;\n"
" float flags;\n"
" QGLMap map;\n"
"};\n"
"struct QGLLightPosition {\n"
" vec4 position;\n"
" vec4 direction;\n"
" mat4 shadow_matrix;\n"
"};\n"
"";
const char qgl_geometry_head[] = "";
const char qgl_uniform[] = "layout (std140) uniform QGLMaterialData {\n"
" QGLMaterial qgl_material[128];\n"
"};\n"
"layout (std140) uniform QGLLightParameterData {\n"
" QGLLightParameter qgl_light_parameter[256];\n"
"};\n"
"layout (std140) uniform QGLLightPositionData {\n"
" QGLLightPosition qgl_light_position[256];\n"
"};\n"
"uniform sampler2DArray qgl_texture_array[2];\n"
"";
const char qgl_structs[] = "#define QGL_MAPS_COUNT 6\n"
"#define QGL_MAP_DIFFUSE 0\n"
"#define QGL_MAP_NORMAL 1\n"
"#define QGL_MAP_METALNESS 2\n"
"#define QGL_MAP_ROUGHNESS 3\n"
"#define QGL_MAP_EMISSION 4\n"
"#define QGL_MAP_RELIEF 5\n"
"#define QGL_TEXTURE_ARRAY_EMPTY 0\n"
"#define QGL_TEXTURE_ARRAY_MAPS 1\n"
"struct QGLMap {\n"
" float offset;\n"
" float amount;\n"
" vec2 scale;\n"
" uint array_index;\n"
" uint map_index;\n"
"};\n"
"struct QGLMaterial {\n"
" vec4 color_diffuse;\n"
" vec4 color_emission;\n"
" float transparency;\n"
" float reflectivity;\n"
" float iof;\n"
" float dispersion;\n"
" QGLMap map[QGL_MAPS_COUNT];\n"
"};\n"
"struct QGLLightParameter {\n"
" vec4 color;\n"
" vec4 decay_intensity;\n"
" vec4 angles;\n"
" float size;\n"
" float flags;\n"
" QGLMap map;\n"
"};\n"
"struct QGLLightPosition {\n"
" vec4 position;\n"
" vec4 direction;\n"
" mat4 shadow_matrix;\n"
"};\n"
"";
const char qgl_uniform_material[] = "layout (std140) uniform QGLMaterialData {\n"
" QGLMaterial qgl_material[128];\n"
"};\n"
"uniform sampler2DArray qgl_texture_array[2];\n"
"";
const char qgl_uniform_light[] = "layout (std140) uniform QGLLightParameterData {\n"
" QGLLightParameter qgl_light_parameter[256];\n"
"};\n"
"layout (std140) uniform QGLLightPositionData {\n"
" QGLLightPosition qgl_light_position[256];\n"
"};\n"
"";
} // namespace QGLEngineShaders

1
src/core/core/glshaders_types.cpp
View File

@@ -35,6 +35,7 @@ QGLEngineShaders::QGLMaterial::QGLMaterial() {
iof = 0.;
dispersion = 0.;
map[mtNormal].map_index = emrBlue;
map[mtRelief].map_index = emrBlack;
map[mtRoughness].amount = 0.75;
map[mtMetalness].amount = 0.25;
}

14
src/core/core/glshaders_types.h
View File

@@ -104,17 +104,23 @@ enum MapType {
mtEmission = 4,
mtRelief = 5,
};
enum TextureRole {
trCoeffBRDF = 10,
trEnvironment = 11,
};
enum TextureArrayRole {
tarEmpty = 10,
tarMaps = 11,
tarEmpty = 12,
tarMaps = 13,
tarShadowsCone = 16,
tarShadowsOmni = 17,
tarDepthsCone = 18,
tarDepthsOmni = 19,
};
enum EmptyMapRole {
emrWhite = 0,
emrBlue = 1,
emrWhite,
emrBlue,
emrBlack,
emrCount,
};
#define QGL_MAPS_COUNT 6
#pragma pack(push, 1)

44
src/core/render/renderer.cpp
View File

@@ -19,12 +19,16 @@
#define GL_GLEXT_PROTOTYPES
#include "renderer.h"
#include "ccm_qglengine_core.h"
#include "glmesh.h"
#include "glshaders.h"
#include "gltexture_manager.h"
#include "qglview.h"
#include <QOpenGLExtraFunctions>
#include <picodeinfo.h>
#include <piiostream.h>
#include <piqt.h>
#include <qad_types.h>
@@ -33,7 +37,9 @@ using namespace QGLEngineShaders;
Renderer::Renderer(QGLView * view_)
: RendererBase(view_)
, fbo_ds(view_, QVector<GLenum>() << GL_RGBA16F << GL_RGBA32F << GL_RGBA16F << GL_RGBA16F << GL_RGBA16F << GL_RGBA32F << GL_RGBA16F)
, fbo_ds(view_,
QVector<GLenum>() << GL_RGBA16F << GL_RGBA32F << GL_RGBA16F << GL_RGBA16F << GL_RGBA16F << GL_RGBA16F << GL_RGBA32F
<< GL_RGBA16F)
, fbo_out(view_, obrBuffersCount, false, GL_RGBA16F)
, rend_mat(this)
, rend_service(this)
@@ -94,6 +100,13 @@ Renderer::Renderer(QGLView * view_)
shader_defines[srLightSpotPass] << "SPOT";
shader_defines[srShadowOmniPass] << "OMNI";
PICodeInfo::EnumInfo * obre = PICodeInfo::enumsInfo->value("Renderer::DeferredBufferRole");
if (obre) {
for (auto e: obre->members) {
obr_defines += "#define " + PI2QString(e.name) + " " + QString::number(e.value) + "\n";
}
}
edit_mode = need_init_shaders = true;
camera_light_mode = QGLView::clmAuto;
}
@@ -157,7 +170,7 @@ void Renderer::reloadShaders() {
QString dir = ":/shaders/";
while (it.hasNext()) {
it.next();
loadShadersMulti(shaders[it.key()], dir + it.value(), true, shader_defines.value(it.key()));
loadShadersMulti(shaders[it.key()], dir + it.value(), true, shader_defines.value(it.key()), obr_defines);
}
loadShadersMulti(tone_proc.shader_sum, dir + "sum.glsl", false);
QStringList fxaa_defs;
@@ -203,11 +216,10 @@ void Renderer::initShaders() {
initUniformBuffer(prog, &buffer_materials, bpMaterials, "QGLMaterialData");
initUniformBuffer(prog, &buffer_lights, bpLightParameters, "QGLLightParameterData");
initUniformBuffer(prog, &buffer_lights_pos, bpLightPositions, "QGLLightPositionData");
for (int i = 0; i < 5; ++i)
for (int i = 0; i <= 5; ++i)
prog->setUniformValue(QString("tex_%1").arg(i).toLatin1().constData(), i);
prog->setUniformValue("tex_coeffs[0]", (int)Renderer::dbrBuffersCount);
prog->setUniformValue("tex_env", (int)Renderer::dbrBuffersCount + 1);
prog->setUniformValue("tex_noise", (int)Renderer::dbrBuffersCount + 2);
prog->setUniformValue("tex_coeff_brdf", trCoeffBRDF);
prog->setUniformValue("tex_env", trEnvironment);
setUniformMaps(prog);
}
if (bindShader(srFinalPass, &prog)) {
@@ -311,12 +323,8 @@ void Renderer::renderObjects(Scene & scene, RenderPass pass) {
void Renderer::renderLight(int first_wr_buff, bool clear_only) {
QOpenGLShaderProgram * prog = 0;
Camera * cam = view->camera();
for (int i = 0; i < 3; ++i) {
view->glActiveTexture(GL_TEXTURE0 + Renderer::dbrBuffersCount + i);
view->glBindTexture(GL_TEXTURE_2D, tex_coeff[i]);
}
fbo_ds.bindColorTextures();
fbo_out.bind();
view->glActiveTexture(GL_TEXTURE0 + trCoeffBRDF);
view->glBindTexture(GL_TEXTURE_2D, tex_coeff[0]);
// tex_env.bind((int)Renderer::dbrBuffersCount + 1);
typedef QPair<Renderer::ShaderRole, Light::Type> PassPair;
QVector<PassPair> passes;
@@ -558,17 +566,21 @@ void Renderer::renderScene() {
setUniformCamera(prog, cam);
textures_empty.bind(f, tarEmpty);
textures_maps.bind(f, tarMaps);
prog->setUniformValue("out_index_normal", dbrNormalZSolid);
prog->setUniformValue("out_index_metal", dbrMetalRoughReflectFlagsSolid);
glPolygonMode(GL_FRONT_AND_BACK, view->renderMode());
renderObjects(scene, rpSolid);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
}
fbo_ds.blit(dbrNormalZ, fbo_ds.id(), dbrNormalZSolid, fbo_ds.rect(), fbo_ds.rect());
fbo_ds.blit(dbrMetalRoughReflectFlags, fbo_ds.id(), dbrMetalRoughReflectFlagsSolid, fbo_ds.rect(), fbo_ds.rect());
// fbo_ds.blit(dbrNormalZ, fbo_ds.id(), dbrNormalZSolid, fbo_ds.rect(), fbo_ds.rect());
// fbo_ds.blit(dbrMetalRoughReflectFlags, fbo_ds.id(), dbrMetalRoughReflectFlagsSolid, fbo_ds.rect(), fbo_ds.rect());
fbo_ds.release();
phase.end();
/// lighting passes
phase.begin("... light");
fbo_out.bind();
fbo_ds.bindColorTextures({dbrDiffuse, dbrNormalZSolid, dbrMetalRoughReflectFlagsSolid, dbrEmission, dbrSpeedBitangXY, dbrGeoNormal});
renderLight(obrSolidOmni, scene.geometries_used[rpSolid].isEmpty());
phase.end();
@@ -583,6 +595,8 @@ void Renderer::renderScene() {
setUniformCamera(prog, cam);
textures_empty.bind(f, tarEmpty);
textures_maps.bind(f, tarMaps);
prog->setUniformValue("out_index_normal", dbrNormalZ);
prog->setUniformValue("out_index_metal", dbrMetalRoughReflectFlags);
glPolygonMode(GL_FRONT_AND_BACK, view->renderMode());
renderObjects(scene, rpTransparent);
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
@@ -592,6 +606,8 @@ void Renderer::renderScene() {
/// lighting passes
phase.begin("... light");
fbo_out.bind();
fbo_ds.bindColorTextures({dbrDiffuse, dbrNormalZ, dbrMetalRoughReflectFlags, dbrEmission, dbrSpeedBitangXY, dbrGeoNormal});
renderLight(obrTransparentOmni, scene.geometries_used[rpTransparent].isEmpty());
phase.end();

3
src/core/render/renderer.h
View File

@@ -85,6 +85,7 @@ public:
dbrMetalRoughReflectFlags,
dbrEmission,
dbrSpeedBitangXY,
dbrGeoNormal,
dbrNormalZSolid,
dbrMetalRoughReflectFlagsSolid,
@@ -155,7 +156,7 @@ private:
QMap<int, QList<Light *>> cur_lights;
QVector<FramebufferEffectBase *> fb_effects;
QImage last_img;
QString timings;
QString obr_defines, timings;
bool is_grabbing = false;
};

6
src/core/render/renderer_base.cpp
View File

@@ -57,13 +57,15 @@ void RendererBase::initTextureArrays() {
QOpenGLExtraFunctions * f = view;
textures_maps.init(f);
textures_empty.init(f);
textures_empty.resize(f, QSize(1, 1), 2);
textures_empty.resize(f, QSize(1, 1), emrCount);
textures_empty.bind(f, tarEmpty);
QImage im(1, 1, QImage::Format_RGBA8888);
im.fill(0xFFFFFFFF);
textures_empty.load(f, im, emrWhite);
im.fill(0xFF8080);
textures_empty.load(f, im, emrBlue);
im.fill(0x000000);
textures_empty.load(f, im, emrBlack);
shadow_maps_cone.init(f);
shadow_maps_omni.init(f);
depth_maps_cone.init(f);
@@ -402,7 +404,7 @@ void RendererBase::initCoeffTextures() {
}
}
createCoeffTexture(tex_coeff[0], data.constData(), size, 2);
createNoiseTexture(tex_coeff[2]);
// createNoiseTexture(tex_coeff[2]);
}

20
src/core/render/renderer_material.cpp
View File

@@ -30,7 +30,7 @@
using namespace QGLEngineShaders;
RendererMaterial::RendererMaterial(Renderer * r_): r(r_), fbo_mat_thumb(r->view, 6, true, GL_RGBA16F) {
RendererMaterial::RendererMaterial(Renderer * r_): r(r_), fbo_mat_thumb(r->view, 7, true, GL_RGBA16F) {
mat_sphere = Primitive::ellipsoid(16, 16);
mat_camera = new Camera();
mat_camera->setPos(QVector3D(2, 2, 2));
@@ -38,6 +38,7 @@ RendererMaterial::RendererMaterial(Renderer * r_): r(r_), fbo_mat_thumb(r->view,
mat_camera->setFOV(45.);
mat_light = new Light();
mat_light->setPos(QVector3D(50, 100, 25));
mat_light->setCastShadows(false);
last_thumb_material = 0;
}
@@ -74,6 +75,8 @@ void RendererMaterial::renderMaterial(Material * m) {
if (r->bindShader(role, &prog)) {
r->setUniformMaps(prog);
r->setUniformCamera(prog, mat_camera, true, fbo_mat_thumb.size());
prog->setUniformValue("out_index_normal", Renderer::dbrNormalZ);
prog->setUniformValue("out_index_metal", Renderer::dbrMetalRoughReflectFlags);
// qDebug() << mat_camera->viewMatrix();
r->textures_empty.bind(f, tarEmpty);
r->textures_maps.bind(f, tarMaps);
@@ -83,15 +86,18 @@ void RendererMaterial::renderMaterial(Material * m) {
mat_sphere->loadObject(f, o);
mat_sphere->draw(f, 1);
}
fbo_mat_thumb.bindColorTextures();
fbo_mat_thumb.bindDepthTexture(5);
fbo_mat_thumb.setWriteBuffer(5);
fbo_mat_thumb.bindColorTextures({Renderer::dbrDiffuse,
Renderer::dbrNormalZ,
Renderer::dbrMetalRoughReflectFlags,
Renderer::dbrEmission,
Renderer::dbrSpeedBitangXY,
Renderer::dbrGeoNormal});
fbo_mat_thumb.setWriteBuffer(6);
if (r->bindShader(Renderer::srLightOmniPass, &prog)) {
r->setUniformCamera(prog, mat_camera, true, fbo_mat_thumb.size());
r->setUniformViewCorners(prog, mat_camera, fbo_mat_thumb.size());
for (int i = 0; i < 5; ++i)
for (int i = 0; i <= 5; ++i)
prog->setUniformValue(QString("tex_%1").arg(i).toLatin1().constData(), i);
prog->setUniformValue("tex_d", 5);
prog->setUniformValue("lights_start", 0);
prog->setUniformValue("lights_count", 1);
QMap<int, QList<Light *>> mat_l;
@@ -102,7 +108,7 @@ void RendererMaterial::renderMaterial(Material * m) {
r->renderQuad(prog, r->quad, mat_camera);
r->view->scene()->setLightsChanged();
}
fbo_mat_thumb.queryImage(5);
fbo_mat_thumb.queryImage(6);
fbo_mat_thumb.release();
}

2
src/core/view/openglwindow.cpp
View File

@@ -15,7 +15,7 @@ OpenGLWindow::OpenGLWindow(QWindow * parent): QWindow(parent) {
format.setRenderableType(QSurfaceFormat::OpenGLES);
#else
if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) {
format.setVersion(4, 0);
format.setVersion(4, 3);
format.setProfile(QSurfaceFormat::CoreProfile);
}
#endif

6
src/core/view/qglview.cpp
View File

@@ -91,12 +91,12 @@ QGLView::QGLView(): OpenGLWindow(), renderer_(this), mouse(this) {
default_camera->setName("Camera");
emit cameraPosChanged(default_camera->pos());
Mesh * m = Primitive::cube(10, 10, 10);
m->flipNormals();
/*Mesh * m = Primitive::plane(10, 10, 10);
// m->flipNormals();
ObjectBase * o = new ObjectBase(m);
o->setColor(Qt::cyan);
scene()->addObject(o);
delete m;
delete m;*/
}

4
src/qglview_test/qglview_window.cpp
View File

@@ -137,6 +137,10 @@ QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLView
viewEditor->assignQGLView(view->view());
widgetTextures->assignQGLView(view->view());
auto * o = primitiveEditor->createCurrent();
o->calculateBoundingBox();
view->view()->focusOn(o->boundingBox());
session.load();

56
src/widgets/primitiveeditor.cpp
View File

@@ -36,9 +36,14 @@ PrimitiveEditor::PrimitiveEditor(QWidget * parent): QWidget(parent), ui(new Ui::
#endif
editors[Plane] << ui->widgetWidth;
editors[Plane] << ui->widgetLength;
editors[Plane] << ui->widgetSegmentsW;
editors[Plane] << ui->widgetSegmentsL;
editors[Cube] << ui->widgetWidth;
editors[Cube] << ui->widgetLength;
editors[Cube] << ui->widgetHeight;
editors[Cube] << ui->widgetSegmentsW;
editors[Cube] << ui->widgetSegmentsL;
editors[Cube] << ui->widgetSegmentsH;
editors[Ellipsoid] << ui->widgetRadius1;
editors[Ellipsoid] << ui->widgetSegments;
editors[Ellipsoid] << ui->widgetSegments2;
@@ -86,18 +91,40 @@ void PrimitiveEditor::assignQGLView(QGLView * v) {
}
ObjectBase * PrimitiveEditor::createCurrent() {
if (!view) return nullptr;
QVariantList params;
Mesh * m = createMesh(params);
if (!m) return nullptr;
ObjectBase * o = new ObjectBase(m);
o->setColor(ui->colorButton->color());
o->setName(ui->comboPrimitives->currentText());
o->setProperty("primitive", params);
view->scene()->addObject(o);
view->scene()->selectObject(o);
delete m;
return o;
}
Mesh * PrimitiveEditor::createMesh(QVariantList & params) {
Mesh * m = 0;
PrimitiveType pt = (PrimitiveType)ui->comboPrimitives->currentIndex();
params << pt;
switch (pt) {
case Plane:
m = Primitive::plane(ui->spinWidth->value(), ui->spinLength->value());
params << ui->spinWidth->value() << ui->spinLength->value();
m = Primitive::plane(ui->spinWidth->value(), ui->spinLength->value(), ui->spinSegmentsW->value(), ui->spinSegmentsL->value());
params << ui->spinWidth->value() << ui->spinLength->value() << ui->spinSegmentsW->value() << ui->spinSegmentsL->value();
break;
case Cube:
m = Primitive::cube(ui->spinWidth->value(), ui->spinLength->value(), ui->spinHeight->value());
params << ui->spinWidth->value() << ui->spinLength->value() << ui->spinHeight->value();
m = Primitive::cube(ui->spinWidth->value(),
ui->spinLength->value(),
ui->spinHeight->value(),
ui->spinSegmentsW->value(),
ui->spinSegmentsL->value(),
ui->spinSegmentsH->value());
params << ui->spinWidth->value() << ui->spinLength->value() << ui->spinHeight->value() << ui->spinSegmentsW->value()
<< ui->spinSegmentsL->value() << ui->spinSegmentsH->value();
break;
case Ellipsoid:
m = Primitive::ellipsoid(ui->spinSegments->value(), ui->spinSegments2->value(), ui->spinRadius->value(), ui->spinAngle->value());
@@ -155,11 +182,16 @@ void PrimitiveEditor::selectionChanged() {
case Plane:
ui->spinWidth->setValue(vl.takeFirst().toDouble());
ui->spinLength->setValue(vl.takeFirst().toDouble());
if (!vl.isEmpty()) ui->spinSegmentsW->setValue(vl.takeFirst().toInt());
if (!vl.isEmpty()) ui->spinSegmentsL->setValue(vl.takeFirst().toInt());
break;
case Cube:
ui->spinWidth->setValue(vl.takeFirst().toDouble());
ui->spinLength->setValue(vl.takeFirst().toDouble());
ui->spinHeight->setValue(vl.takeFirst().toDouble());
if (!vl.isEmpty()) ui->spinSegmentsW->setValue(vl.takeFirst().toInt());
if (!vl.isEmpty()) ui->spinSegmentsL->setValue(vl.takeFirst().toInt());
if (!vl.isEmpty()) ui->spinSegmentsH->setValue(vl.takeFirst().toInt());
break;
case Ellipsoid:
ui->spinSegments->setValue(vl.takeFirst().toDouble());
@@ -191,8 +223,8 @@ void PrimitiveEditor::selectionChanged() {
ui->spinAngle->setValue(vl.takeFirst().toDouble());
break;
}
ui->flipNormals->setChecked(vl.takeFirst().toBool());
ui->colorButton->setColor(vl.takeFirst().value<QColor>());
if (!vl.isEmpty()) ui->flipNormals->setChecked(vl.takeFirst().toBool());
if (!vl.isEmpty()) ui->colorButton->setColor(vl.takeFirst().value<QColor>());
}
}
}
@@ -215,17 +247,7 @@ void PrimitiveEditor::replaceMesh() {
void PrimitiveEditor::on_buttonAdd_clicked() {
if (!view) return;
QVariantList params;
Mesh * m = createMesh(params);
if (!m) return;
ObjectBase * o = new ObjectBase(m);
o->setColor(ui->colorButton->color());
o->setName(ui->comboPrimitives->currentText());
o->setProperty("primitive", params);
view->scene()->addObject(o);
view->scene()->selectObject(o);
delete m;
createCurrent();
}

2
src/widgets/primitiveeditor.h
View File

@@ -49,6 +49,8 @@ public:
void assignQGLView(QGLView * v);
ObjectBase * createCurrent();
protected:
Mesh * createMesh(QVariantList & params);
void showEditors();

200
src/widgets/primitiveeditor.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>360</width>
<height>536</height>
<width>499</width>
<height>697</height>
</rect>
</property>
<property name="windowTitle">
@@ -134,6 +134,120 @@
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widgetSegmentsW" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string>Segments W:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinSegmentsW">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widgetSegmentsL" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_11">
<property name="text">
<string>Segments L:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinSegmentsL">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widgetSegmentsH" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_12">
<property name="text">
<string>Segments H:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinSegmentsH">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>1000</number>
</property>
<property name="singleStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="widgetRadius1" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -437,8 +551,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>330</x>
<y>84</y>
<x>498</x>
<y>109</y>
</hint>
<hint type="destinationlabel">
<x>369</x>
@@ -453,8 +567,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>334</x>
<y>116</y>
<x>498</x>
<y>147</y>
</hint>
<hint type="destinationlabel">
<x>366</x>
@@ -469,8 +583,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>332</x>
<y>144</y>
<x>498</x>
<y>299</y>
</hint>
<hint type="destinationlabel">
<x>370</x>
@@ -485,8 +599,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>334</x>
<y>186</y>
<x>498</x>
<y>337</y>
</hint>
<hint type="destinationlabel">
<x>371</x>
@@ -501,8 +615,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>335</x>
<y>210</y>
<x>391</x>
<y>377</y>
</hint>
<hint type="destinationlabel">
<x>372</x>
@@ -517,8 +631,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>329</x>
<y>246</y>
<x>498</x>
<y>415</y>
</hint>
<hint type="destinationlabel">
<x>370</x>
@@ -533,8 +647,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>336</x>
<y>284</y>
<x>498</x>
<y>453</y>
</hint>
<hint type="destinationlabel">
<x>372</x>
@@ -550,7 +664,7 @@
<hints>
<hint type="sourcelabel">
<x>70</x>
<y>344</y>
<y>532</y>
</hint>
<hint type="destinationlabel">
<x>370</x>
@@ -581,8 +695,8 @@
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>271</x>
<y>285</y>
<x>498</x>
<y>500</y>
</hint>
<hint type="destinationlabel">
<x>179</x>
@@ -590,6 +704,54 @@
</hint>
</hints>
</connection>
<connection>
<sender>spinSegmentsW</sender>
<signal>valueChanged(int)</signal>
<receiver>PrimitiveEditor</receiver>
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>465</x>
<y>173</y>
</hint>
<hint type="destinationlabel">
<x>511</x>
<y>164</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinSegmentsL</sender>
<signal>valueChanged(int)</signal>
<receiver>PrimitiveEditor</receiver>
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>462</x>
<y>208</y>
</hint>
<hint type="destinationlabel">
<x>520</x>
<y>206</y>
</hint>
</hints>
</connection>
<connection>
<sender>spinSegmentsH</sender>
<signal>valueChanged(int)</signal>
<receiver>PrimitiveEditor</receiver>
<slot>replaceMesh()</slot>
<hints>
<hint type="sourcelabel">
<x>468</x>
<y>251</y>
</hint>
<hint type="destinationlabel">
<x>563</x>
<y>251</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>replaceMesh()</slot>