Gestion du clipping 'inverse' par sphère avec rayon négatif.
Gestion du et/ou clipping, et ajout de l'option dans l'interface Qt de stage_shader.
Showing
| ... | ... | @@ -57,6 +57,7 @@ ClippingShader::ClippingShader() |
| // Initialize default global clipping variables | ||
| m_hasClippingCodeBeenInserted = false; | ||
| m_clipColorAttenuationFactor = 1.0; | ||
| m_clipMode = CLIPPING_MODE_AND; | ||
| } | ||
| ClippingShader::~ClippingShader() | ||
| ... | ... | @@ -77,63 +78,66 @@ ClippingShader::~ClippingShader() |
| void ClippingShader::setClipPlanesCount(int planesCount) | ||
| { | ||
| // Check if the clipping code has been inserted into shader | ||
| if (errorRaiseClippingCodeNotInserted(!m_hasClippingCodeBeenInserted, "ClippingShader::setClipPlanesCount")) | ||
| return; | ||
| if (planesCount != getClipPlanesCount()) | ||
| { | ||
| // Check if the clipping code has been inserted into shader | ||
| if (errorRaiseClippingCodeNotInserted(!m_hasClippingCodeBeenInserted, "ClippingShader::setClipPlanesCount")) | ||
| return; | ||
| // Check if the given clipping planes count is valid | ||
| if (errorRaiseParameterIsNotPositive((planesCount < 0), "ClippingShader::setClipPlanesCount", "planesCount")) | ||
| return; | ||
| // Check if the given clipping planes count is valid | ||
| if (errorRaiseParameterIsNotPositive((planesCount < 0), "ClippingShader::setClipPlanesCount", "planesCount")) | ||
| return; | ||
| // Shader name string | ||
| std::string shaderName = m_nameVS + "/" + m_nameFS + "/" + m_nameGS; | ||
| // Shader name string | ||
| std::string shaderName = m_nameVS + "/" + m_nameFS + "/" + m_nameGS; | ||
| // Use a shader mutator | ||
| ShaderMutator SM(shaderName, getVertexShaderSrc(), getFragmentShaderSrc()); | ||
| // Use a shader mutator | ||
| ShaderMutator SM(shaderName, getVertexShaderSrc(), getFragmentShaderSrc()); | ||
| // Modify the clip planes count constant in both shader | ||
| SM.changeIntConstantValue(ShaderMutator::VERTEX_SHADER, "CLIP_PLANES_COUNT", planesCount); | ||
| SM.changeIntConstantValue(ShaderMutator::FRAGMENT_SHADER, "CLIP_PLANES_COUNT", planesCount); | ||
| // Modify the clip planes count constant in both shader | ||
| SM.changeIntConstantValue(ShaderMutator::VERTEX_SHADER, "CLIP_PLANES_COUNT", planesCount); | ||
| SM.changeIntConstantValue(ShaderMutator::FRAGMENT_SHADER, "CLIP_PLANES_COUNT", planesCount); | ||
| // Reload both shaders | ||
| reloadVertexShaderFromMemory(SM.getModifiedVertexShaderSrc().c_str()); | ||
| reloadFragmentShaderFromMemory(SM.getModifiedFragmentShaderSrc().c_str()); | ||
| // Reload both shaders | ||
| reloadVertexShaderFromMemory(SM.getModifiedVertexShaderSrc().c_str()); | ||
| reloadFragmentShaderFromMemory(SM.getModifiedFragmentShaderSrc().c_str()); | ||
| // Previous planes count | ||
| int previousPlanesCount = getClipPlanesCount(); | ||
| // Previous planes count | ||
| int previousPlanesCount = getClipPlanesCount(); | ||
| // Resize the planes arrays to the right size | ||
| m_clipPlanes.resize((size_t)planesCount); | ||
| m_clipPlanesEquations.resize(4*(size_t)planesCount, 0.0); | ||
| // Resize the planes arrays to the right size | ||
| m_clipPlanes.resize((size_t)planesCount); | ||
| m_clipPlanesEquations.resize(4*(size_t)planesCount, 0.0); | ||
| // Resize the planes drawers array to the right size, and create/destroy objects | ||
| if (planesCount > previousPlanesCount) | ||
| { | ||
| m_clipPlanesDrawers.resize((size_t)planesCount, NULL); | ||
| for (int i = previousPlanesCount; i < planesCount; i++) | ||
| m_clipPlanesDrawers[i] = new Drawer; | ||
| } | ||
| else | ||
| { | ||
| //for (int i = planesCount; i < previousPlanesCount; i++) | ||
| //delete m_clipPlanesDrawers[i]; // TODO : Bug dans drawer, crash le prochain affichage | ||
| m_clipPlanesDrawers.resize((size_t)planesCount); | ||
| } | ||
| // Resize the planes drawers array to the right size, and create/destroy objects | ||
| if (planesCount > previousPlanesCount) | ||
| { | ||
| m_clipPlanesDrawers.resize((size_t)planesCount, NULL); | ||
| for (int i = previousPlanesCount; i < planesCount; i++) | ||
| m_clipPlanesDrawers[i] = new Drawer; | ||
| } | ||
| else | ||
| { | ||
| //for (int i = planesCount; i < previousPlanesCount; i++) | ||
| //delete m_clipPlanesDrawers[i]; // TODO : Bug dans drawer, crash le prochain affichage | ||
| m_clipPlanesDrawers.resize((size_t)planesCount); | ||
| } | ||
| // Set default parameters values for new planes | ||
| if (planesCount > previousPlanesCount) | ||
| { | ||
| Geom::Vec3f defaultFirstVec (1.0, 0.0, 0.0); | ||
| Geom::Vec3f defaultSecondVec (0.0, 1.0, 0.0); | ||
| Geom::Vec3f defaultOrigin (0.0, 0.0, 0.0); | ||
| // Set default parameters values for new planes | ||
| if (planesCount > previousPlanesCount) | ||
| { | ||
| Geom::Vec3f defaultFirstVec (1.0, 0.0, 0.0); | ||
| Geom::Vec3f defaultSecondVec (0.0, 1.0, 0.0); | ||
| Geom::Vec3f defaultOrigin (0.0, 0.0, 0.0); | ||
| for (int i = previousPlanesCount; i < planesCount; i++) | ||
| setClipPlaneParamsAll(defaultFirstVec, defaultSecondVec, defaultOrigin, i); | ||
| } | ||
| for (int i = previousPlanesCount; i < planesCount; i++) | ||
| setClipPlaneParamsAll(defaultFirstVec, defaultSecondVec, defaultOrigin, i); | ||
| } | ||
| // Recompile shaders (automatically calls updateClippingUniforms) | ||
| recompile(); | ||
| // Recompile shaders (automatically calls updateClippingUniforms) | ||
| recompile(); | ||
| } | ||
| } | ||
| int ClippingShader::getClipPlanesCount() | ||
| ... | ... | @@ -476,62 +480,65 @@ void ClippingShader::updateClipPlanesVBOs() |
| void ClippingShader::setClipSpheresCount(int spheresCount) | ||
| { | ||
| // Check if the clipping code has been inserted into shader | ||
| if (errorRaiseClippingCodeNotInserted(!m_hasClippingCodeBeenInserted, "ClippingShader::setClipSpheresCount")) | ||
| return; | ||
| if (spheresCount != getClipSpheresCount()) | ||
| { | ||
| // Check if the clipping code has been inserted into shader | ||
| if (errorRaiseClippingCodeNotInserted(!m_hasClippingCodeBeenInserted, "ClippingShader::setClipSpheresCount")) | ||
| return; | ||
| // Check if the given clipping spheres count is valid | ||
| if (errorRaiseParameterIsNotPositive((spheresCount < 0), "ClippingShader::setClipSpheresCount", "spheresCount")) | ||
| return; | ||
| // Check if the given clipping spheres count is valid | ||
| if (errorRaiseParameterIsNotPositive((spheresCount < 0), "ClippingShader::setClipSpheresCount", "spheresCount")) | ||
| return; | ||
| // Shader name string | ||
| std::string shaderName = m_nameVS + "/" + m_nameFS + "/" + m_nameGS; | ||
| // Shader name string | ||
| std::string shaderName = m_nameVS + "/" + m_nameFS + "/" + m_nameGS; | ||
| // Use a shader mutator | ||
| ShaderMutator SM(shaderName, getVertexShaderSrc(), getFragmentShaderSrc()); | ||
| // Use a shader mutator | ||
| ShaderMutator SM(shaderName, getVertexShaderSrc(), getFragmentShaderSrc()); | ||
| // Modify the clip spheres count constant in both shader | ||
| SM.changeIntConstantValue(ShaderMutator::VERTEX_SHADER, "CLIP_SPHERES_COUNT", spheresCount); | ||
| SM.changeIntConstantValue(ShaderMutator::FRAGMENT_SHADER, "CLIP_SPHERES_COUNT", spheresCount); | ||
| // Modify the clip spheres count constant in both shader | ||
| SM.changeIntConstantValue(ShaderMutator::VERTEX_SHADER, "CLIP_SPHERES_COUNT", spheresCount); | ||
| SM.changeIntConstantValue(ShaderMutator::FRAGMENT_SHADER, "CLIP_SPHERES_COUNT", spheresCount); | ||
| // Reload both shaders | ||
| reloadVertexShaderFromMemory(SM.getModifiedVertexShaderSrc().c_str()); | ||
| reloadFragmentShaderFromMemory(SM.getModifiedFragmentShaderSrc().c_str()); | ||
| // Reload both shaders | ||
| reloadVertexShaderFromMemory(SM.getModifiedVertexShaderSrc().c_str()); | ||
| reloadFragmentShaderFromMemory(SM.getModifiedFragmentShaderSrc().c_str()); | ||
| // Previous spheres count | ||
| int previousSpheresCount = getClipSpheresCount(); | ||
| // Previous spheres count | ||
| int previousSpheresCount = getClipSpheresCount(); | ||
| // Resize the spheres arrays to the right size | ||
| m_clipSpheres.resize((size_t)spheresCount); | ||
| m_clipSpheresCentersAndRadiuses.resize(4*(size_t)spheresCount, 0.0); | ||
| // Resize the spheres arrays to the right size | ||
| m_clipSpheres.resize((size_t)spheresCount); | ||
| m_clipSpheresCentersAndRadiuses.resize(4*(size_t)spheresCount, 0.0); | ||
| // Resize the spheres drawers array to the right size, and create/destroy objects | ||
| if (spheresCount > previousSpheresCount) | ||
| { | ||
| m_clipSpheresDrawers.resize((size_t)spheresCount, NULL); | ||
| for (int i = previousSpheresCount; i < spheresCount; i++) | ||
| m_clipSpheresDrawers[i] = new Drawer; | ||
| } | ||
| else | ||
| { | ||
| //for (int i = spheresCount; i < previousSpheresCount; i++) | ||
| //delete m_clipSpheresDrawers[i]; // TODO : Bug dans drawer, crash le prochain affichage | ||
| m_clipSpheresDrawers.resize((size_t)spheresCount); | ||
| } | ||
| // Resize the spheres drawers array to the right size, and create/destroy objects | ||
| if (spheresCount > previousSpheresCount) | ||
| { | ||
| m_clipSpheresDrawers.resize((size_t)spheresCount, NULL); | ||
| for (int i = previousSpheresCount; i < spheresCount; i++) | ||
| m_clipSpheresDrawers[i] = new Drawer; | ||
| } | ||
| else | ||
| { | ||
| //for (int i = spheresCount; i < previousSpheresCount; i++) | ||
| //delete m_clipSpheresDrawers[i]; // TODO : Bug dans drawer, crash le prochain affichage | ||
| m_clipSpheresDrawers.resize((size_t)spheresCount); | ||
| } | ||
| // Set default parameters values for new spheres | ||
| if (spheresCount > previousSpheresCount) | ||
| { | ||
| Geom::Vec3f defaultCenter (0.0, 0.0, 0.0); | ||
| float defaultRadius = 10.0; | ||
| // Set default parameters values for new spheres | ||
| if (spheresCount > previousSpheresCount) | ||
| { | ||
| Geom::Vec3f defaultCenter (0.0, 0.0, 0.0); | ||
| float defaultRadius = 10.0; | ||
| for (int i = previousSpheresCount; i < spheresCount; i++) | ||
| setClipSphereParamsAll(defaultCenter, defaultRadius, i); | ||
| } | ||
| for (int i = previousSpheresCount; i < spheresCount; i++) | ||
| setClipSphereParamsAll(defaultCenter, defaultRadius, i); | ||
| } | ||
| // Recompile shaders (automatically calls updateClippingUniforms) | ||
| recompile(); | ||
| // Recompile shaders (automatically calls updateClippingUniforms) | ||
| recompile(); | ||
| } | ||
| } | ||
| int ClippingShader::getClipSpheresCount() | ||
| ... | ... | @@ -711,54 +718,77 @@ void ClippingShader::updateClipSphereVBO(int sphereIndex) |
| m_clipSpheresDisplayColor[1], | ||
| m_clipSpheresDisplayColor[2]); | ||
| m_clipSpheresDrawers[sphereIndex]->begin(GL_LINES); | ||
| // Sphere segments and rings subdivisions | ||
| const int segSubdivs = 100; | ||
| const int ringsSubdivs = 100; | ||
| // Compute angle displacement steps | ||
| float dTheta = 0.0; | ||
| if (m_clipSpheresDisplayXRes != 0) | ||
| dTheta = 2 * M_PI / (float)m_clipSpheresDisplayXRes; | ||
| dTheta = 2.0 * M_PI / (float)m_clipSpheresDisplayXRes; | ||
| float dPhi = 0.0; | ||
| if (m_clipSpheresDisplayYRes != 0) | ||
| dPhi = M_PI / (float)m_clipSpheresDisplayYRes; | ||
| // Draw the sphere in wireframe | ||
| // Compute angle displacement steps for subdivisions | ||
| float dSegSubdiv = M_PI / (float)segSubdivs; | ||
| float dRingsSubdiv = 2.0 * M_PI / (float)ringsSubdivs; | ||
| // Draw the segments of the sphere | ||
| for (size_t i = 0; i < m_clipSpheresDisplayXRes; i++) | ||
| { | ||
| for (size_t j = 0; j < m_clipSpheresDisplayYRes; j++) | ||
| m_clipSpheresDrawers[sphereIndex]->begin(GL_LINE_STRIP); | ||
| for (size_t j = 0; j < segSubdivs + 1; j++) | ||
| { | ||
| // Compute 3 points according to the parametric equation of the sphere | ||
| Geom::Vec3f p1 ( | ||
| cos(i*dTheta) * sin(j*dPhi), | ||
| sin(i*dTheta) * sin(j*dPhi), | ||
| cos(j*dPhi)); | ||
| Geom::Vec3f p2 ( | ||
| cos((i+1)*dTheta) * sin(j*dPhi), | ||
| </ |