Commit 1b4debb2 authored by Thomas Pitiot 's avatar Thomas Pitiot

ça marche

parent 08833c9c
......@@ -5,15 +5,15 @@
<backgroundColor red="51" blue="51" green="51"/>
</State>
<Display axisIsDrawn="false" gridIsDrawn="false" FPSIsDisplayed="false" cameraIsEdited="false"/>
<Geometry fullScreen="false" width="1200" posX="-83" height="701" posY="533"/>
<Geometry fullScreen="false" width="1200" posX="0" height="701" posY="0"/>
<Camera>
<Parameters fieldOfView="0.785398" sceneRadius="8.66025" Type="PERSPECTIVE" zNearCoefficient="0.005" orthoCoef="0.414214" zClippingCoefficient="1.73205">
<SceneCenter x="0" y="0" z="0"/>
</Parameters>
<Stereo focusDistance="20.9077" physScreenWidth="0.5" IODist="0.062"/>
<ManipulatedCameraFrame>
<position x="4.74424" y="-4.86234" z="1.60241"/>
<orientation q0="0.118155" q1="0.590838" q2="0.182477" q3="0.77695"/>
<position x="2.30521" y="8.11195" z="6.35901"/>
<orientation q0="-0.373252" q1="-0.244231" q2="-0.676103" q3="0.586446"/>
<ManipulatedParameters transSens="1" zoomSens="1" rotSens="1" wheelSens="1" spinSens="0.3"/>
<ManipulatedCameraParameters zoomsOnPivotPoint="false" flySpeed="0.0866025" rotatesAroundUpVector="false">
<sceneUpVector x="0" y="1" z="0"/>
......
......@@ -279,7 +279,7 @@ void Volusion::cb_initGL()
m_agentSprite = new Utils::PointSprite();
m_agentSprite->setAttributePosition(m_agentsPosVBO);
m_agentSprite->setAttributeColor(m_agentsColorVBO);
m_agentSprite->setSize(2.0f);
m_agentSprite->setSize(0.05f);
registerShader(m_agentSprite);
......@@ -966,12 +966,15 @@ void setupQtWidgets(char **argv, int argc,Volusion& sqt)
sqt.dock.spinBox_dart->setRange(0, sqt.simul.envMap_.map.end().index) ;
sqt.dock.comboBoxEdge->addItem("Aiguille entiere",2);
for(unsigned int i = 0; i< sqt.simul.aiguille->nbEdges;i++)
if(sqt.simul.aiguille)
{
std::ostringstream oss ;
oss<<"arete "<<i;
const QString& s=oss.str().c_str();
sqt.dock.comboBoxEdge->addItem(s,2);
for(unsigned int i = 0; i< sqt.simul.aiguille->nbEdges;i++)
{
std::ostringstream oss ;
oss<<"arete "<<i;
const QString& s=oss.str().c_str();
sqt.dock.comboBoxEdge->addItem(s,2);
}
}
}
......
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