Skip to content

Apply changes from SOFA PR #5470 #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bakpaul wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Apply changes from SOFA PR #5470 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/SofaSphFluid/OglFluidModel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,14 @@ class SOFA_SPH_FLUID_API OglFluidModel : public core::visual::VisualModel
protected:
OglFluidModel();
virtual ~OglFluidModel();


void doInitVisual(const core::visual::VisualParams* vparams) override;
void doFwdDraw(core::visual::VisualParams*) override;
void doBwdDraw(core::visual::VisualParams*) override;
void doDrawVisual(const core::visual::VisualParams* vparams) override;
void doDrawTransparent(const core::visual::VisualParams* vparams) override;

public:
Data<unsigned int> d_debugFBO; ///< DEBUG FBO
Data<float> d_spriteRadius; ///< Radius of sprites
Expand All @@ -87,11 +95,6 @@ class SOFA_SPH_FLUID_API OglFluidModel : public core::visual::VisualModel


void init() override;
void doInitVisual(const core::visual::VisualParams* vparams) override;
void fwdDraw(core::visual::VisualParams*) override;
void bwdDraw(core::visual::VisualParams*) override;
void doDrawVisual(const core::visual::VisualParams* vparams) override;
void drawTransparent(const core::visual::VisualParams* vparams) override;
void computeBBox(const core::ExecParams* params, bool onlyVisible = false) override;

void doUpdateVisual(const core::visual::VisualParams* vparams) override;
Expand Down
6 changes: 3 additions & 3 deletions src/SofaSphFluid/OglFluidModel.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ void OglFluidModel<DataTypes>::doUpdateVisual(const core::visual::VisualParams*
}

template<class DataTypes>
void OglFluidModel<DataTypes>::fwdDraw(core::visual::VisualParams* vparams)
void OglFluidModel<DataTypes>::doFwdDraw(core::visual::VisualParams* vparams)
{
updateVisual(vparams);

}

template<class DataTypes>
void OglFluidModel<DataTypes>::bwdDraw(core::visual::VisualParams*)
void OglFluidModel<DataTypes>::doBwdDraw(core::visual::VisualParams*)
{

}
Expand Down Expand Up @@ -659,7 +659,7 @@ void OglFluidModel<DataTypes>::doDrawVisual(const core::visual::VisualParams* vp
glEnable(GL_DEPTH_TEST);
}
template<class DataTypes>
void OglFluidModel<DataTypes>::drawTransparent(const core::visual::VisualParams* vparams)
void OglFluidModel<DataTypes>::doDrawTransparent(const core::visual::VisualParams* vparams)
{
vparams->drawTool()->saveLastState();

Expand Down
Loading