fix msvc problems
This commit is contained in:
parent
53531b603a
commit
40c79f18e4
|
@ -218,11 +218,11 @@ void SoFCBoundingBox::GLRender (SoGLRenderAction *action)
|
||||||
state->pop();
|
state->pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoFCBoundingBox::generatePrimitives (SoAction */*action*/)
|
void SoFCBoundingBox::generatePrimitives (SoAction * /*action*/)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void SoFCBoundingBox::computeBBox (SoAction */*action*/, SbBox3f &box, SbVec3f ¢er)
|
void SoFCBoundingBox::computeBBox (SoAction * /*action*/, SbBox3f &box, SbVec3f ¢er)
|
||||||
{
|
{
|
||||||
center = (minBounds.getValue() + maxBounds.getValue()) / 2.0f;
|
center = (minBounds.getValue() + maxBounds.getValue()) / 2.0f;
|
||||||
box.setBounds(minBounds.getValue(), maxBounds.getValue());
|
box.setBounds(minBounds.getValue(), maxBounds.getValue());
|
||||||
|
|
|
@ -474,3 +474,29 @@ std::vector<Base::Vector3d> ViewProvider::getModelPoints(const SoPickedPoint* pp
|
||||||
pts.push_back(Base::Vector3d(vec[0],vec[1],vec[2]));
|
pts.push_back(Base::Vector3d(vec[0],vec[1],vec[2]));
|
||||||
return pts;
|
return pts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ViewProvider::keyPressed(bool pressed, int key)
|
||||||
|
{
|
||||||
|
(void)pressed;
|
||||||
|
(void)key;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ViewProvider::mouseMove(const SbVec2s &cursorPos,
|
||||||
|
View3DInventorViewer* viewer)
|
||||||
|
{
|
||||||
|
(void)cursorPos;
|
||||||
|
(void)viewer;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ViewProvider::mouseButtonPressed(int button, bool pressed,
|
||||||
|
const SbVec2s &cursorPos,
|
||||||
|
const View3DInventorViewer* viewer)
|
||||||
|
{
|
||||||
|
(void)button;
|
||||||
|
(void)pressed;
|
||||||
|
(void)cursorPos;
|
||||||
|
(void)viewer;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
|
@ -290,29 +290,14 @@ public:
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
/// is called when the provider is in edit and a key event occurs. Only ESC ends edit.
|
/// is called when the provider is in edit and a key event occurs. Only ESC ends edit.
|
||||||
virtual bool keyPressed(bool pressed, int key) {
|
virtual bool keyPressed(bool pressed, int key);
|
||||||
(void)pressed;
|
|
||||||
(void)key;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
/// is called by the tree if the user double click on the object
|
/// is called by the tree if the user double click on the object
|
||||||
virtual bool doubleClicked(void) { return false; }
|
virtual bool doubleClicked(void) { return false; }
|
||||||
/// is called when the provider is in edit and the mouse is moved
|
/// is called when the provider is in edit and the mouse is moved
|
||||||
virtual bool mouseMove(const SbVec2s &cursorPos,
|
virtual bool mouseMove(const SbVec2s &cursorPos, View3DInventorViewer* viewer);
|
||||||
View3DInventorViewer* viewer) {
|
|
||||||
(void)cursorPos;
|
|
||||||
(void)viewer;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
/// is called when the Provider is in edit and the mouse is clicked
|
/// is called when the Provider is in edit and the mouse is clicked
|
||||||
virtual bool mouseButtonPressed(int button, bool pressed, const SbVec2s &cursorPos,
|
virtual bool mouseButtonPressed(int button, bool pressed, const SbVec2s &cursorPos,
|
||||||
const View3DInventorViewer* viewer) {
|
const View3DInventorViewer* viewer);
|
||||||
(void)button;
|
|
||||||
(void)pressed;
|
|
||||||
(void)cursorPos;
|
|
||||||
(void)viewer;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
/// set up the context-menu with the supported edit modes
|
/// set up the context-menu with the supported edit modes
|
||||||
virtual void setupContextMenu(QMenu*, QObject*, const char*) {}
|
virtual void setupContextMenu(QMenu*, QObject*, const char*) {}
|
||||||
|
|
||||||
|
|
|
@ -560,7 +560,7 @@ QWidget* UiLoader::createWidget(const QString & className, QWidget * parent,
|
||||||
|
|
||||||
// ----------------------------------------------------
|
// ----------------------------------------------------
|
||||||
|
|
||||||
PyObject *UiLoaderPy::PyMake(struct _typeobject */*type*/, PyObject * args, PyObject * /*kwds*/)
|
PyObject *UiLoaderPy::PyMake(struct _typeobject * /*type*/, PyObject * args, PyObject * /*kwds*/)
|
||||||
{
|
{
|
||||||
if (!PyArg_ParseTuple(args, ""))
|
if (!PyArg_ParseTuple(args, ""))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user