------------------------------------------------------------ revno: 2018 committer: Václav Šmilauer <[email protected]> branch nick: trunk timestamp: Thu 2010-02-11 09:25:11 +0100 message: 1. Fix empty display (improperly initialized drawMask) modified: pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
-- lp:yade https://code.launchpad.net/~yade-dev/yade/trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== modified file 'pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp' --- pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp 2010-02-09 16:50:30 +0000 +++ pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp 2010-02-11 08:25:11 +0000 @@ -38,6 +38,8 @@ } postProcessAttributes(true); + clipPlaneNormals.resize(numClipPlanes); + if (glutInitDone) return; glutInit(&Omega::instance().origArgc,Omega::instance().origArgv); /* transparent spheres (still not working): glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH | GLUT_MULTISAMPLE | GLUT_ALPHA); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE); */ === modified file 'pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp' --- pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp 2010-02-09 16:50:30 +0000 +++ pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp 2010-02-11 08:25:11 +0000 @@ -45,12 +45,12 @@ // updated after every call to render shared_ptr<Scene> scene; - DynLibDispatcher< InteractionGeometry , GlInteractionGeometryFunctor, void , TYPELIST_5(const shared_ptr<InteractionGeometry>&, const shared_ptr<Interaction>& , const shared_ptr<Body>&, const shared_ptr<Body>&, bool) > interactionGeometryDispatcher; - DynLibDispatcher< InteractionPhysics , GlInteractionPhysicsFunctor, void , TYPELIST_5(const shared_ptr<InteractionPhysics>& , const shared_ptr<Interaction>&, const shared_ptr<Body>&, const shared_ptr<Body>&, bool) > interactionPhysicsDispatcher; + DynLibDispatcher<InteractionGeometry, GlInteractionGeometryFunctor, void, TYPELIST_5(const shared_ptr<InteractionGeometry>&, const shared_ptr<Interaction>&, const shared_ptr<Body>&, const shared_ptr<Body>&, bool)> interactionGeometryDispatcher; + DynLibDispatcher<InteractionPhysics, GlInteractionPhysicsFunctor, void, TYPELIST_5(const shared_ptr<InteractionPhysics>&, const shared_ptr<Interaction>&, const shared_ptr<Body>&, const shared_ptr<Body>&, bool)> interactionPhysicsDispatcher; - DynLibDispatcher< State , GlStateFunctor, void , TYPELIST_1(const shared_ptr<State>&) > stateDispatcher; - DynLibDispatcher< Bound , GlBoundFunctor, void , TYPELIST_2(const shared_ptr<Bound>&, Scene*) > boundDispatcher; - DynLibDispatcher< Shape , GlShapeFunctor, void , TYPELIST_4(const shared_ptr<Shape>&, const shared_ptr<State>&,bool,const GLViewInfo&) > shapeDispatcher; + DynLibDispatcher<State, GlStateFunctor, void, TYPELIST_1(const shared_ptr<State>&)> stateDispatcher; + DynLibDispatcher<Bound, GlBoundFunctor, void, TYPELIST_2(const shared_ptr<Bound>&, Scene*)> boundDispatcher; + DynLibDispatcher<Shape, GlShapeFunctor, void, TYPELIST_4(const shared_ptr<Shape>&, const shared_ptr<State>&,bool,const GLViewInfo&)> shapeDispatcher; vector<vector<string> > stateFunctorNames, @@ -95,11 +95,11 @@ ((bool,Show_ID,false,"Show body id's")) ((bool,Body_state,false,"Render body state [deprecated]")) ((bool,Body_bounding_volume,false,"Render body bound")) - ((bool,Body_interacting_geom,false,"Render body shape")) + ((bool,Body_interacting_geom,true,"Render body shape")) ((bool,Interaction_wire,false,"??")) ((bool,Interaction_geometry,false,"Render :yref:`geometry of interaction<Interaction::interactionGeometry>`")) ((bool,Interaction_physics,false,"Render :yref:`Interaction::interactionPhysics`")) - ((int,Draw_mask,0,"Bitmask for showing only bodies where ((Draw_mask & Body::groupMask)!=0)")) + ((int,Draw_mask,((void)"draw everything",~0),"Bitmask for showing only bodies where ((Draw_mask & Body::groupMask)!=0)")) ((bool,Draw_inside,true,"??")) ((vector<Se3r>,clipPlaneSe3,vector<Se3r>(numClipPlanes,Se3r(Vector3r::ZERO,Quaternionr::IDENTITY)),"Position and orientation of clipping planes")) ((vector<int>,clipPlaneActive,vector<int>(numClipPlanes,0),"Activate/deactivate respective clipping planes"))
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
