Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit 1ce9b1c4 authored by untereiner's avatar untereiner
Browse files

scale a boundingBox and some other things

parent e7e37ad9
......@@ -53,7 +53,9 @@ inline ExplodeVolumeRender::ExplodeVolumeRender()
// m_shader->setAmbiant(Geom::Vec4f(0.1f,0.1f,0.1f,0.0f));
// m_shader->setDiffuse(Geom::Vec4f(1.0f,1.0f,0.1f,0.0f));
m_shaderL->setColor(Geom::Vec4f(1.0f,1.0f,1.0f,0.0f));
//m_shaderL->setColor(Geom::Vec4f(1.0f,1.0f,1.0f,0.0f));
m_shaderL->setColor(Geom::Vec4f(0.113f,0.337f,0.0f,0.113f));
}
......
......@@ -95,6 +95,9 @@ class BoundingBox
//return true if the bounding box belongs strictly to a bounding box
bool contains(const BoundingBox<VEC> & bb);
//resize a bounding box
void scale(float size);
/**********************************************/
/* STREAM OPERATORS */
/**********************************************/
......
......@@ -220,6 +220,13 @@ bool BoundingBox<VEC>::contains(const BoundingBox<VEC>& bb)
return this->contains(bb.min()) && this->contains(bb.max());
}
template <typename VEC>
void BoundingBox<VEC>::scale(float size)
{
assert(m_initialized || !"Bounding box not initialized");
m_pMin *= size;
m_pMax *= size;
}
......
......@@ -98,7 +98,7 @@ public:
unsigned int addString(const std::string& str, const Geom::Vec3f& pos);
/**
* once all string are stored, we must send it to the gracphic card
* once all string are stored, we must send it to the graphic card
*/
void sendToVBO();
......
......@@ -503,7 +503,7 @@ void SimpleQT::cb_about_cgogn()
{
QString str("CGoGN:\nCombinatorial and Geometric modeling\n"
"with Generic N-dimensional Maps\n"
"Web site: https://cgogn.u-strasbg.fr \n"
"Web site: http://cgogn.unistra.fr \n"
"Contact information: cgogn@unistra.fr");
QMessageBox::about(this, tr("About CGoGN"), str);
}
......
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