Commit 24a08d54 authored by BrutPitt's avatar BrutPitt
Browse files

ver. 1.3.1 - Added new rendering engine features also to WebGL version

parent 5f7d4a8e
......@@ -993,7 +993,6 @@ void postRenderingClass::bindRender()
#else
glActiveTexture(GL_TEXTURE0 + renderEngine->getAO()->getFBO().getTex(0));
glBindTexture(GL_TEXTURE_2D, renderEngine->getAO()->getFBO().getTex(0));
glUniform1i(getLocAOTex(), renderEngine->getAO()->getFBO().getTex(0));
// for Chrome76 message: "texture is not renderable" if only zBuffer... need ColorBuffer
// FireFox68 Works fine also only with zBuffer w/o ColorBuffer
......@@ -1004,7 +1003,6 @@ void postRenderingClass::bindRender()
#else
glActiveTexture(GL_TEXTURE0 + renderEngine->getShadow()->getFBO().getTex(0));
glBindTexture(GL_TEXTURE_2D, renderEngine->getShadow()->getFBO().getTex(0));
glUniform1i(getLocShadowTex(), renderEngine->getShadow()->getFBO().getTex(0));
#endif
#endif
......@@ -1113,6 +1111,9 @@ void ambientOcclusionClass::create() {
locKernelTexture = getUniformLocation("ssaoSample");
uniformBlocksClass::bindIndex(getProgram(), "_particlesData");
renderEngine->getTMat()->blockBinding(getProgram());
glUniform1i(locKernelTexture, ssaoKernelTex);
glUniform1i(locNoiseTexture, noiseTexture);
#endif
//setUniform3fv(getUniformLocation("ssaoSamples"), kernelSize, (const GLfloat*)ssaoKernel.data());
}
......@@ -1136,8 +1137,6 @@ void ambientOcclusionClass::bindRender()
glActiveTexture(GL_TEXTURE0 + ssaoKernelTex);
glBindTexture(GL_TEXTURE_2D, ssaoKernelTex);
glUniform1i(locKernelTexture, ssaoKernelTex);
glUniform1i(locNoiseTexture, noiseTexture);
#endif
}
......
......@@ -22,7 +22,7 @@
//#define APP_DEBUG_GUI_INTERFACE
//#define GLAPP_IMGUI_VIEWPORT
#define GLAPP_IMGUI_VIEWPORT
#ifdef __EMSCRIPTEN__
#define DOT_TEXT_SHFT 1
......
......@@ -422,7 +422,7 @@ void getRenderMode(Config &c, particlesBaseClass *ptr)
ptr->useShadow( c.get_or("ShadowEnabled" , false ));
ptr->setShadowBias( c.get_or("ShadowBias" , 0.0 ));
ptr->setShadowBias( c.get_or("ShadowBias" , 0.015 ));
ptr->setShadowDarkness( c.get_or("ShadowDarkness" , 0.0 ));
ptr->setShadowRadius( c.get_or("ShadowRadius" , 2.0 ));
ptr->setShadowGranularity( c.get_or("ShadowGranularity" , 1.0 ));
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -253,7 +253,11 @@ void attractorDlgClass::view()
const float border = DLG_BORDER_SIZE;
//const float oldWindowPadding = style.WindowPadding.x;
#if !defined(GLCHAOSP_LIGHTVER)
const int szX = 600, szY = 270;
#else
const int szX = 450, szY = 200;
#endif
ImGui::SetNextWindowSize(ImVec2(szX, szY), ImGuiCond_FirstUseEver);
{
int w,h; glfwGetWindowSize(theApp->getGLFWWnd(), &w, &h);
......
......@@ -1207,7 +1207,7 @@ void particlesDlgClass::view()
bool psSelected = theWnd->getParticlesSystem()->whichRenderMode==RENDER_USE_POINTS || theWnd->getParticlesSystem()->getRenderMode() == RENDER_USE_BOTH;
#if !defined(GLCHAOSP_LIGHTVER) || defined(GLCHAOSP_LIGHTVER_EXPERIMENTAL)
const int wSZ = 300, hSZ = 1020;
const int wSZ = 270, hSZ = 1020;
#else
const int wSZ = theApp->isTabletMode() ? 300 : 270, hSZ = theApp->isTabletMode() ? 900 : 820;
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment