forked from bartvdbraak/blender
Freestyle: Code cleanup, prepare for strict C++ flags
This commit is contained in:
parent
2ada3512a2
commit
13358d049e
@ -58,7 +58,7 @@ extern "C" {
|
||||
|
||||
namespace Freestyle {
|
||||
|
||||
AppView::AppView(const char *iName)
|
||||
AppView::AppView(const char * /*iName*/)
|
||||
{
|
||||
_Fovy = DEG2RADF(30.0f);
|
||||
_ModelRootNode = new NodeDrawingStyle;
|
||||
|
@ -100,12 +100,12 @@ public:
|
||||
_SilhouetteRootNode->AddChild(iSilhouette);
|
||||
}
|
||||
|
||||
inline void Add2DSilhouette(NodeGroup *iSilhouette)
|
||||
inline void Add2DSilhouette(NodeGroup * /*iSilhouette*/)
|
||||
{
|
||||
//_pFENode->AddChild(iSilhouette);
|
||||
}
|
||||
|
||||
inline void Add2DVisibleSilhouette(NodeGroup *iVSilhouette)
|
||||
inline void Add2DVisibleSilhouette(NodeGroup * /*iVSilhouette*/)
|
||||
{
|
||||
//_pVisibleSilhouetteNode->AddChild(iVSilhouette);
|
||||
}
|
||||
|
@ -933,7 +933,7 @@ void Controller::InsertStyleModule(unsigned index, const char *iName, struct Tex
|
||||
_Canvas->InsertStyleModule(index, sm);
|
||||
}
|
||||
|
||||
void Controller::AddStyleModule(const char *iFileName)
|
||||
void Controller::AddStyleModule(const char * /*iFileName*/)
|
||||
{
|
||||
//_pStyleWindow->Add(iFileName);
|
||||
}
|
||||
@ -1003,7 +1003,7 @@ void Controller::toggleEdgeTesselationNature(Nature::EdgeNature iNature)
|
||||
ComputeViewMap();
|
||||
}
|
||||
|
||||
void Controller::setModelsDir(const string& dir)
|
||||
void Controller::setModelsDir(const string& /*dir*/)
|
||||
{
|
||||
//_current_dirs->setValue("models/dir", dir);
|
||||
}
|
||||
@ -1015,7 +1015,7 @@ string Controller::getModelsDir() const
|
||||
return dir;
|
||||
}
|
||||
|
||||
void Controller::setModulesDir(const string& dir)
|
||||
void Controller::setModulesDir(const string& /*dir*/)
|
||||
{
|
||||
//_current_dirs->setValue("modules/dir", dir);
|
||||
}
|
||||
|
@ -950,7 +950,7 @@ Object *BlenderStrokeRenderer::NewMesh() const
|
||||
return ob;
|
||||
}
|
||||
|
||||
Render *BlenderStrokeRenderer::RenderScene(Render *re, bool render)
|
||||
Render *BlenderStrokeRenderer::RenderScene(Render * /*re*/, bool render)
|
||||
{
|
||||
Camera *camera = (Camera *)freestyle_scene->camera->data;
|
||||
if (camera->clipend < _z)
|
||||
|
@ -87,7 +87,7 @@ int freestyle_viewport[4];
|
||||
// current scene
|
||||
Scene *freestyle_scene;
|
||||
|
||||
static void load_post_callback(struct Main *main, struct ID *id, void *arg)
|
||||
static void load_post_callback(struct Main * /*main*/, struct ID * /*id*/, void * /*arg*/)
|
||||
{
|
||||
lineset_copied = false;
|
||||
}
|
||||
@ -645,7 +645,7 @@ Render *FRS_do_stroke_rendering(Render *re, SceneRenderLayer *srl, int render)
|
||||
return freestyle_render;
|
||||
}
|
||||
|
||||
void FRS_finish_stroke_rendering(Render *re)
|
||||
void FRS_finish_stroke_rendering(Render * /*re*/)
|
||||
{
|
||||
// clear canvas
|
||||
controller->Clear();
|
||||
|
@ -495,7 +495,7 @@ bool intersectRayBBox(const Vec3r& orig, const Vec3r& dir, // ray origin an
|
||||
real t0, real t1,
|
||||
real& tmin, // I0 = orig + tmin * dir is the first intersection
|
||||
real& tmax, // I1 = orig + tmax * dir is the second intersection
|
||||
real epsilon)
|
||||
real /*epsilon*/)
|
||||
{
|
||||
float tymin, tymax, tzmin, tzmax;
|
||||
Vec3r inv_direction(1.0 / dir[0], 1.0 / dir[1], 1.0 / dir[2]);
|
||||
|
@ -97,11 +97,11 @@ class GridVisitor
|
||||
public:
|
||||
virtual ~GridVisitor() {}; //soc
|
||||
|
||||
virtual void discoverCell(Cell *cell) {}
|
||||
virtual void discoverCell(Cell * /*cell*/) {}
|
||||
|
||||
virtual void examineOccluder(Polygon3r *occ) {}
|
||||
virtual void examineOccluder(Polygon3r * /*occ*/) {}
|
||||
|
||||
virtual void finishCell(Cell *cell) {}
|
||||
virtual void finishCell(Cell * /*cell*/) {}
|
||||
|
||||
virtual bool stop() {
|
||||
return false;
|
||||
|
@ -42,7 +42,7 @@ ImagePyramid::ImagePyramid(const GrayImage& level0, unsigned nbLevels)
|
||||
}
|
||||
#endif
|
||||
|
||||
ImagePyramid::ImagePyramid(const ImagePyramid& iBrother)
|
||||
ImagePyramid::ImagePyramid(const ImagePyramid& /*iBrother*/)
|
||||
{
|
||||
if (!_levels.empty()) {
|
||||
for (vector<GrayImage*>::iterator im = _levels.begin(), imend = _levels.end(); im != imend; ++im) {
|
||||
|
@ -46,7 +46,7 @@ static char ContextFunctions_get_time_stamp___doc__[] =
|
||||
" :rtype: int\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_get_time_stamp(PyObject *self)
|
||||
ContextFunctions_get_time_stamp(PyObject * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(ContextFunctions::GetTimeStampCF());
|
||||
}
|
||||
@ -60,7 +60,7 @@ static char ContextFunctions_get_canvas_width___doc__[] =
|
||||
" :rtype: int\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_get_canvas_width(PyObject *self)
|
||||
ContextFunctions_get_canvas_width(PyObject * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(ContextFunctions::GetCanvasWidthCF());
|
||||
}
|
||||
@ -74,7 +74,7 @@ static char ContextFunctions_get_canvas_height___doc__[] =
|
||||
" :rtype: int\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_get_canvas_height(PyObject *self)
|
||||
ContextFunctions_get_canvas_height(PyObject * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(ContextFunctions::GetCanvasHeightCF());
|
||||
}
|
||||
@ -88,7 +88,7 @@ static char ContextFunctions_get_border___doc__[] =
|
||||
" :rtype: tuple\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_get_border(PyObject *self)
|
||||
ContextFunctions_get_border(PyObject * /*self*/)
|
||||
{
|
||||
BBox<Vec2i> border(ContextFunctions::GetBorderCF());
|
||||
PyObject *v = PyTuple_New(4);
|
||||
@ -117,7 +117,7 @@ static char ContextFunctions_load_map___doc__[] =
|
||||
" :type sigma: float\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_load_map(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
ContextFunctions_load_map(PyObject * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"file_name", "map_name", "num_levels", "sigma", NULL};
|
||||
char *fileName, *mapName;
|
||||
@ -150,7 +150,7 @@ static char ContextFunctions_read_map_pixel___doc__[] =
|
||||
" :rtype: float\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_read_map_pixel(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
ContextFunctions_read_map_pixel(PyObject * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"map_name", "level", "x", "y", NULL};
|
||||
char *mapName;
|
||||
@ -180,7 +180,7 @@ static char ContextFunctions_read_complete_view_map_pixel___doc__[] =
|
||||
" :rtype: float\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_read_complete_view_map_pixel(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
ContextFunctions_read_complete_view_map_pixel(PyObject * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"level", "x", "y", NULL};
|
||||
int level;
|
||||
@ -212,7 +212,7 @@ static char ContextFunctions_read_directional_view_map_pixel___doc__[] =
|
||||
" :rtype: float\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_read_directional_view_map_pixel(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
ContextFunctions_read_directional_view_map_pixel(PyObject * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"orientation", "level", "x", "y", NULL};
|
||||
int orientation, level;
|
||||
@ -232,7 +232,7 @@ static char ContextFunctions_get_selected_fedge___doc__[] =
|
||||
" :rtype: :class:`FEdge`\n";
|
||||
|
||||
static PyObject *
|
||||
ContextFunctions_get_selected_fedge(PyObject *self)
|
||||
ContextFunctions_get_selected_fedge(PyObject * /*self*/)
|
||||
{
|
||||
FEdge *fe = ContextFunctions::GetSelectedFEdgeCF();
|
||||
if (fe)
|
||||
|
@ -72,7 +72,7 @@ static char Freestyle_getCurrentScene___doc__[] =
|
||||
" :return: The current scene.\n"
|
||||
" :rtype: :class:`bpy.types.Scene`\n";
|
||||
|
||||
static PyObject *Freestyle_getCurrentScene(PyObject *self)
|
||||
static PyObject *Freestyle_getCurrentScene(PyObject * /*self*/)
|
||||
{
|
||||
if (!freestyle_scene) {
|
||||
PyErr_SetString(PyExc_TypeError, "current scene not available");
|
||||
@ -126,7 +126,7 @@ static char Freestyle_blendRamp___doc__[] =
|
||||
" :return: Blended color in RGB format.\n"
|
||||
" :rtype: :class:`mathutils.Vector`\n";
|
||||
|
||||
static PyObject *Freestyle_blendRamp(PyObject *self, PyObject *args)
|
||||
static PyObject *Freestyle_blendRamp(PyObject * /*self*/, PyObject *args)
|
||||
{
|
||||
PyObject *obj1, *obj2;
|
||||
char *s;
|
||||
@ -170,7 +170,7 @@ static char Freestyle_evaluateColorRamp___doc__[] =
|
||||
" :return: color in RGBA format.\n"
|
||||
" :rtype: :class:`mathutils.Vector`\n";
|
||||
|
||||
static PyObject *Freestyle_evaluateColorRamp(PyObject *self, PyObject *args)
|
||||
static PyObject *Freestyle_evaluateColorRamp(PyObject * /*self*/, PyObject *args)
|
||||
{
|
||||
BPy_StructRNA *py_srna;
|
||||
ColorBand *coba;
|
||||
@ -207,7 +207,7 @@ static char Freestyle_evaluateCurveMappingF___doc__[] =
|
||||
" :return: Mapped output value.\n"
|
||||
" :rtype: float\n";
|
||||
|
||||
static PyObject *Freestyle_evaluateCurveMappingF(PyObject *self, PyObject *args)
|
||||
static PyObject *Freestyle_evaluateCurveMappingF(PyObject * /*self*/, PyObject *args)
|
||||
{
|
||||
BPy_StructRNA *py_srna;
|
||||
CurveMapping *cumap;
|
||||
|
@ -63,7 +63,7 @@ PyDoc_STRVAR(Integrator_integrate_doc,
|
||||
" :class:`UnaryFunction0DUnsigned` type.\n"
|
||||
" :rtype: int or float");
|
||||
|
||||
static PyObject * Integrator_integrate(PyObject *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject * Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"func", "it", "it_end", "integration_type", NULL};
|
||||
PyObject *obj1, *obj4 = 0;
|
||||
|
@ -76,7 +76,7 @@ PyDoc_STRVAR(Operators_select_doc,
|
||||
" :arg pred: The predicate expressing this condition.\n"
|
||||
" :type pred: :class:`UnaryPredicate1D`");
|
||||
|
||||
static PyObject *Operators_select(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_select(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"pred", NULL};
|
||||
PyObject *obj = 0;
|
||||
@ -135,7 +135,7 @@ PyDoc_STRVAR(Operators_chain_doc,
|
||||
" stopping condition.\n"
|
||||
" :type pred: :class:`UnaryPredicate1D`");
|
||||
|
||||
static PyObject *Operators_chain(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_chain(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"it", "pred", "modifier", NULL};
|
||||
PyObject *obj1 = 0, *obj2 = 0, *obj3 = 0;
|
||||
@ -224,7 +224,7 @@ PyDoc_STRVAR(Operators_bidirectional_chain_doc,
|
||||
" contains the chaining rule.\n"
|
||||
" :type it: :class:`ChainingIterator`");
|
||||
|
||||
static PyObject *Operators_bidirectional_chain(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_bidirectional_chain(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"it", "pred", NULL};
|
||||
PyObject *obj1 = 0, *obj2 = 0;
|
||||
@ -304,7 +304,7 @@ PyDoc_STRVAR(Operators_sequential_split_doc,
|
||||
" resolution.)\n"
|
||||
" :type sampling: float");
|
||||
|
||||
static PyObject *Operators_sequential_split(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_sequential_split(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist_1[] = {"starting_pred", "stopping_pred", "sampling", NULL};
|
||||
static const char *kwlist_2[] = {"pred", "sampling", NULL};
|
||||
@ -411,7 +411,7 @@ PyDoc_STRVAR(Operators_recursive_split_doc,
|
||||
" resolution.)\n"
|
||||
" :type sampling: float");
|
||||
|
||||
static PyObject *Operators_recursive_split(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_recursive_split(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist_1[] = {"func", "pred_1d", "sampling", NULL};
|
||||
static const char *kwlist_2[] = {"func", "pred_0d", "pred_1d", "sampling", NULL};
|
||||
@ -486,7 +486,7 @@ PyDoc_STRVAR(Operators_sort_doc,
|
||||
" :arg pred: The binary predicate used for the comparison.\n"
|
||||
" :type pred: :class:`BinaryPredicate1D`");
|
||||
|
||||
static PyObject *Operators_sort(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_sort(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"pred", NULL};
|
||||
PyObject *obj = 0;
|
||||
@ -517,7 +517,7 @@ PyDoc_STRVAR(Operators_create_doc,
|
||||
" :arg shaders: The list of shaders used to shade the strokes.\n"
|
||||
" :type shaders: list of :class:`StrokeShader` objects");
|
||||
|
||||
static PyObject *Operators_create(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_create(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"pred", "shaders", NULL};
|
||||
PyObject *obj1 = 0, *obj2 = 0;
|
||||
@ -558,7 +558,7 @@ PyDoc_STRVAR(Operators_reset_doc,
|
||||
" :arg delete_strokes: Delete the strokes that are currently stored.\n"
|
||||
" :type delete_strokes: bool\n");
|
||||
|
||||
static PyObject *Operators_reset(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_reset(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"delete_strokes", NULL};
|
||||
PyObject *obj1 = 0;
|
||||
@ -583,7 +583,7 @@ PyDoc_STRVAR(Operators_get_viewedge_from_index_doc,
|
||||
" :return: The ViewEdge object.\n"
|
||||
" :rtype: :class:`ViewEdge`");
|
||||
|
||||
static PyObject *Operators_get_viewedge_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_get_viewedge_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"i", NULL};
|
||||
unsigned int i;
|
||||
@ -607,7 +607,7 @@ PyDoc_STRVAR(Operators_get_chain_from_index_doc,
|
||||
" :return: The Chain object.\n"
|
||||
" :rtype: :class:`Chain`");
|
||||
|
||||
static PyObject *Operators_get_chain_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_get_chain_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"i", NULL};
|
||||
unsigned int i;
|
||||
@ -631,7 +631,7 @@ PyDoc_STRVAR(Operators_get_stroke_from_index_doc,
|
||||
" :return: The Stroke object.\n"
|
||||
" :rtype: :class:`Stroke`");
|
||||
|
||||
static PyObject *Operators_get_stroke_from_index(BPy_Operators *self, PyObject *args, PyObject *kwds)
|
||||
static PyObject *Operators_get_stroke_from_index(BPy_Operators * /*self*/, PyObject *args, PyObject *kwds)
|
||||
{
|
||||
static const char *kwlist[] = {"i", NULL};
|
||||
unsigned int i;
|
||||
@ -653,7 +653,7 @@ PyDoc_STRVAR(Operators_get_view_edges_size_doc,
|
||||
" :return: The number of ViewEdges.\n"
|
||||
" :rtype: int");
|
||||
|
||||
static PyObject *Operators_get_view_edges_size(BPy_Operators *self)
|
||||
static PyObject *Operators_get_view_edges_size(BPy_Operators * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(Operators::getViewEdgesSize());
|
||||
}
|
||||
@ -666,7 +666,7 @@ PyDoc_STRVAR(Operators_get_chains_size_doc,
|
||||
" :return: The number of Chains.\n"
|
||||
" :rtype: int");
|
||||
|
||||
static PyObject *Operators_get_chains_size(BPy_Operators *self)
|
||||
static PyObject *Operators_get_chains_size(BPy_Operators * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(Operators::getChainsSize());
|
||||
}
|
||||
@ -679,7 +679,7 @@ PyDoc_STRVAR(Operators_get_strokes_size_doc,
|
||||
" :return: The number of Strokes.\n"
|
||||
" :rtype: int");
|
||||
|
||||
static PyObject *Operators_get_strokes_size(BPy_Operators *self)
|
||||
static PyObject *Operators_get_strokes_size(BPy_Operators * /*self*/)
|
||||
{
|
||||
return PyLong_FromLong(Operators::getStrokesSize());
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self)
|
||||
Py_TYPE(self)->tp_free((PyObject *)self);
|
||||
}
|
||||
|
||||
static PyObject *UnaryFunction0D___repr__(BPy_UnaryFunction0D *self)
|
||||
static PyObject *UnaryFunction0D___repr__(BPy_UnaryFunction0D * /*self*/)
|
||||
{
|
||||
return PyUnicode_FromString("UnaryFunction0D");
|
||||
}
|
||||
|
@ -87,7 +87,7 @@ static void UnaryFunction1D___dealloc__(BPy_UnaryFunction1D *self)
|
||||
Py_TYPE(self)->tp_free((PyObject *)self);
|
||||
}
|
||||
|
||||
static PyObject *UnaryFunction1D___repr__(BPy_UnaryFunction1D *self)
|
||||
static PyObject *UnaryFunction1D___repr__(BPy_UnaryFunction1D * /*self*/)
|
||||
{
|
||||
return PyUnicode_FromString("UnaryFunction1D");
|
||||
}
|
||||
|
@ -49,7 +49,7 @@ PyDoc_STRVAR(ViewVertex_doc,
|
||||
"Thus, this class can be specialized into two classes, the\n"
|
||||
":class:`TVertex` class and the :class:`NonTVertex` class.");
|
||||
|
||||
static int ViewVertex_init(BPy_ViewVertex *self, PyObject *args, PyObject *kwds)
|
||||
static int ViewVertex_init(BPy_ViewVertex * /*self*/, PyObject * /*args*/, PyObject * /*kwds*/)
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "cannot instantiate abstract class");
|
||||
return -1;
|
||||
@ -82,7 +82,7 @@ PyDoc_STRVAR(ViewVertex_edges_end_doc,
|
||||
" :return: An orientedViewEdgeIterator pointing after the last ViewEdge.\n"
|
||||
" :rtype: :class:`orientedViewEdgeIterator`");
|
||||
|
||||
static PyObject *ViewVertex_edges_end(BPy_ViewVertex *self)
|
||||
static PyObject *ViewVertex_edges_end(BPy_ViewVertex * /*self*/)
|
||||
{
|
||||
#if 0
|
||||
ViewVertexInternal::orientedViewEdgeIterator ove_it(self->vv->edgesEnd());
|
||||
|
@ -166,7 +166,7 @@ static int StrokeVertex_mathutils_check(BaseMathObject *bmo)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int StrokeVertex_mathutils_get(BaseMathObject *bmo, int subtype)
|
||||
static int StrokeVertex_mathutils_get(BaseMathObject *bmo, int /*subtype*/)
|
||||
{
|
||||
BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
|
||||
bmo->data[0] = (float)self->sv->x();
|
||||
@ -174,7 +174,7 @@ static int StrokeVertex_mathutils_get(BaseMathObject *bmo, int subtype)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int StrokeVertex_mathutils_set(BaseMathObject *bmo, int subtype)
|
||||
static int StrokeVertex_mathutils_set(BaseMathObject *bmo, int /*subtype*/)
|
||||
{
|
||||
BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
|
||||
self->sv->setX((real)bmo->data[0]);
|
||||
@ -182,7 +182,7 @@ static int StrokeVertex_mathutils_set(BaseMathObject *bmo, int subtype)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int StrokeVertex_mathutils_get_index(BaseMathObject *bmo, int subtype, int index)
|
||||
static int StrokeVertex_mathutils_get_index(BaseMathObject *bmo, int /*subtype*/, int index)
|
||||
{
|
||||
BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
|
||||
switch (index) {
|
||||
@ -194,7 +194,7 @@ static int StrokeVertex_mathutils_get_index(BaseMathObject *bmo, int subtype, in
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int StrokeVertex_mathutils_set_index(BaseMathObject *bmo, int subtype, int index)
|
||||
static int StrokeVertex_mathutils_set_index(BaseMathObject *bmo, int /*subtype*/, int index)
|
||||
{
|
||||
BPy_StrokeVertex *self = (BPy_StrokeVertex *)bmo->cb_user;
|
||||
switch (index) {
|
||||
|
@ -100,7 +100,7 @@ static int FEdge_init(BPy_FEdge *self, PyObject *args, PyObject *kwds)
|
||||
|
||||
/*----------------------FEdge sequence protocol ----------------------------*/
|
||||
|
||||
static Py_ssize_t FEdge_sq_length(BPy_FEdge *self)
|
||||
static Py_ssize_t FEdge_sq_length(BPy_FEdge * /*self*/)
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
@ -99,7 +99,7 @@ static int FEdgeSmooth_mathutils_check(BaseMathObject *bmo)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int subtype)
|
||||
static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int /*subtype*/)
|
||||
{
|
||||
BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
|
||||
Vec3r p(self->fes->normal());
|
||||
@ -109,7 +109,7 @@ static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int subtype)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int subtype)
|
||||
static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int /*subtype*/)
|
||||
{
|
||||
BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
|
||||
Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
|
||||
@ -117,7 +117,7 @@ static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int subtype)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int subtype, int index)
|
||||
static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int /*subtype*/, int index)
|
||||
{
|
||||
BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
|
||||
Vec3r p(self->fes->normal());
|
||||
@ -125,7 +125,7 @@ static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int subtype, int
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int FEdgeSmooth_mathutils_set_index(BaseMathObject *bmo, int subtype, int index)
|
||||
static int FEdgeSmooth_mathutils_set_index(BaseMathObject *bmo, int /*subtype*/, int index)
|
||||
{
|
||||
BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
|
||||
Vec3r p(self->fes->normal());
|
||||
|
@ -471,7 +471,7 @@ public:
|
||||
}
|
||||
|
||||
/*! The () operator. */
|
||||
int operator()(Interface1D& i1, Interface1D& i2)
|
||||
int operator()(Interface1D& /*i1*/, Interface1D& /*i2*/)
|
||||
{
|
||||
result = true;
|
||||
return 0;
|
||||
@ -490,7 +490,7 @@ public:
|
||||
}
|
||||
|
||||
/*! The () operator. */
|
||||
int operator()(Interface1D& i1, Interface1D& i2)
|
||||
int operator()(Interface1D& /*i1*/, Interface1D& /*i2*/)
|
||||
{
|
||||
result = false;
|
||||
return 0;
|
||||
|
@ -752,12 +752,12 @@ Interface0DIterator Stroke::verticesEnd()
|
||||
return ret;
|
||||
}
|
||||
|
||||
Interface0DIterator Stroke::pointsBegin(float t)
|
||||
Interface0DIterator Stroke::pointsBegin(float /*t*/)
|
||||
{
|
||||
return verticesBegin(); // FIXME
|
||||
}
|
||||
|
||||
Interface0DIterator Stroke::pointsEnd(float t)
|
||||
Interface0DIterator Stroke::pointsEnd(float /*t*/)
|
||||
{
|
||||
return verticesEnd();
|
||||
}
|
||||
|
@ -71,7 +71,7 @@ void BoxGrid::Cell::indexPolygons()
|
||||
// Iterator
|
||||
//////////////////
|
||||
|
||||
BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real epsilon)
|
||||
BoxGrid::Iterator::Iterator (BoxGrid& grid, Vec3r& center, real /*epsilon*/)
|
||||
: _target(grid.transform(center)), _foundOccludee(false)
|
||||
{
|
||||
// Find target cell
|
||||
@ -122,7 +122,7 @@ BoxGrid::BoxGrid(OccluderSource& source, GridDensityProvider& density, ViewMap *
|
||||
|
||||
BoxGrid::~BoxGrid() {}
|
||||
|
||||
void BoxGrid::assignCells (OccluderSource& source, GridDensityProvider& density, ViewMap *viewMap)
|
||||
void BoxGrid::assignCells (OccluderSource& /*source*/, GridDensityProvider& density, ViewMap *viewMap)
|
||||
{
|
||||
_cellSize = density.cellSize();
|
||||
_cellsX = density.cellsX();
|
||||
|
@ -42,13 +42,13 @@ Interface0DIterator Interface1D::verticesEnd()
|
||||
return Interface0DIterator();
|
||||
}
|
||||
|
||||
Interface0DIterator Interface1D::pointsBegin(float t)
|
||||
Interface0DIterator Interface1D::pointsBegin(float /*t*/)
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "method pointsBegin() not properly overridden");
|
||||
return Interface0DIterator();
|
||||
}
|
||||
|
||||
Interface0DIterator Interface1D::pointsEnd(float t)
|
||||
Interface0DIterator Interface1D::pointsEnd(float /*t*/)
|
||||
{
|
||||
PyErr_SetString(PyExc_TypeError, "method pointsEnd() not properly overridden");
|
||||
return Interface0DIterator();
|
||||
|
@ -1122,12 +1122,12 @@ Interface0DIterator FEdge::verticesEnd()
|
||||
return ret;
|
||||
}
|
||||
|
||||
Interface0DIterator FEdge::pointsBegin(float t)
|
||||
Interface0DIterator FEdge::pointsBegin(float /*t*/)
|
||||
{
|
||||
return verticesBegin();
|
||||
}
|
||||
|
||||
Interface0DIterator FEdge::pointsEnd(float t)
|
||||
Interface0DIterator FEdge::pointsEnd(float /*t*/)
|
||||
{
|
||||
return verticesEnd();
|
||||
}
|
||||
|
@ -72,7 +72,7 @@ void SphericalGrid::Cell::indexPolygons()
|
||||
// Iterator
|
||||
//////////////////
|
||||
|
||||
SphericalGrid::Iterator::Iterator(SphericalGrid& grid, Vec3r& center, real epsilon)
|
||||
SphericalGrid::Iterator::Iterator(SphericalGrid& grid, Vec3r& center, real /*epsilon*/)
|
||||
: _target(SphericalGrid::Transform::sphericalProjection(center)), _foundOccludee(false)
|
||||
{
|
||||
// Find target cell
|
||||
@ -120,7 +120,7 @@ SphericalGrid::SphericalGrid(OccluderSource& source, GridDensityProvider& densit
|
||||
|
||||
SphericalGrid::~SphericalGrid() {}
|
||||
|
||||
void SphericalGrid::assignCells(OccluderSource& source, GridDensityProvider& density, ViewMap *viewMap)
|
||||
void SphericalGrid::assignCells(OccluderSource& /*source*/, GridDensityProvider& density, ViewMap *viewMap)
|
||||
{
|
||||
_cellSize = density.cellSize();
|
||||
_cellsX = density.cellsX();
|
||||
|
@ -701,12 +701,12 @@ Interface0DIterator ViewEdge::verticesEnd()
|
||||
return ret;
|
||||
}
|
||||
|
||||
Interface0DIterator ViewEdge::pointsBegin(float t)
|
||||
Interface0DIterator ViewEdge::pointsBegin(float /*t*/)
|
||||
{
|
||||
return verticesBegin();
|
||||
}
|
||||
|
||||
Interface0DIterator ViewEdge::pointsEnd(float t)
|
||||
Interface0DIterator ViewEdge::pointsEnd(float /*t*/)
|
||||
{
|
||||
return verticesEnd();
|
||||
}
|
||||
|
@ -56,7 +56,7 @@ static const Global &_global = G;
|
||||
using namespace std;
|
||||
|
||||
template <typename G, typename I>
|
||||
static void findOccludee(FEdge *fe, G& grid, I& occluders, real epsilon, WFace **oaWFace,
|
||||
static void findOccludee(FEdge *fe, G& /*grid*/, I& occluders, real epsilon, WFace **oaWFace,
|
||||
Vec3r& u, Vec3r& A, Vec3r& origin, Vec3r& edge, vector<WVertex*>& faceVertices)
|
||||
{
|
||||
WFace *face = NULL;
|
||||
@ -169,7 +169,7 @@ static void findOccludee(FEdge *fe, G& grid, I& occluders, real epsilon, WFace *
|
||||
}
|
||||
|
||||
template <typename G, typename I>
|
||||
static void findOccludee(FEdge *fe, G& grid, real epsilon, ViewEdge *ve, WFace **oaFace)
|
||||
static void findOccludee(FEdge *fe, G& grid, real epsilon, ViewEdge * /*ve*/, WFace **oaFace)
|
||||
{
|
||||
Vec3r A;
|
||||
Vec3r edge;
|
||||
@ -205,7 +205,7 @@ static void findOccludee(FEdge *fe, G& grid, real epsilon, ViewEdge *ve, WFace *
|
||||
// computeVisibility takes a pointer to foundOccluders, instead of using a reference,
|
||||
// so that computeVeryFastVisibility can skip the AddOccluders step with minimal overhead.
|
||||
template <typename G, typename I>
|
||||
static int computeVisibility(ViewMap *viewMap, FEdge *fe, G& grid, real epsilon, ViewEdge *ve, WFace **oaWFace,
|
||||
static int computeVisibility(ViewMap *viewMap, FEdge *fe, G& grid, real epsilon, ViewEdge * /*ve*/, WFace **oaWFace,
|
||||
set<ViewShape*> *foundOccluders)
|
||||
{
|
||||
int qi = 0;
|
||||
|
@ -145,7 +145,7 @@ public:
|
||||
* The viewport. 4 real array: origin.x, origin.y, width, length
|
||||
*/
|
||||
inline void setTransform(const real iModelViewMatrix[4][4], const real iProjectionMatrix[4][4],
|
||||
const int iViewport[4], real iFocalLength, real iAspect, real iFovy)
|
||||
const int iViewport[4], real iFocalLength, real /*iAspect*/, real /*iFovy*/)
|
||||
{
|
||||
_orthographicProjection = (iProjectionMatrix[3][3] != 0.0);
|
||||
SilhouetteGeomEngine::setTransform(iModelViewMatrix, iProjectionMatrix, iViewport, iFocalLength);
|
||||
|
@ -221,7 +221,7 @@ void WingedEdgeBuilder::buildWVertices(WShape& shape, const real *vertices, unsi
|
||||
}
|
||||
}
|
||||
|
||||
void WingedEdgeBuilder::buildTriangleStrip(const real *vertices, const real *normals, vector<FrsMaterial>& iMaterials,
|
||||
void WingedEdgeBuilder::buildTriangleStrip(const real * /*vertices*/, const real *normals, vector<FrsMaterial>& /*iMaterials*/,
|
||||
const real *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks,
|
||||
const unsigned *vindices, const unsigned *nindices, const unsigned *mindices,
|
||||
const unsigned *tindices, const unsigned nvertices)
|
||||
@ -296,15 +296,15 @@ void WingedEdgeBuilder::buildTriangleStrip(const real *vertices, const real *nor
|
||||
}
|
||||
}
|
||||
|
||||
void WingedEdgeBuilder::buildTriangleFan(const real *vertices, const real *normals, vector<FrsMaterial>& iMaterials,
|
||||
const real *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks,
|
||||
const unsigned *vindices, const unsigned *nindices, const unsigned *mindices,
|
||||
const unsigned *tindices, const unsigned nvertices)
|
||||
void WingedEdgeBuilder::buildTriangleFan(const real * /*vertices*/, const real * /*normals*/, vector<FrsMaterial>& /*iMaterials*/,
|
||||
const real * /*texCoords*/, const IndexedFaceSet::FaceEdgeMark * /*iFaceEdgeMarks*/,
|
||||
const unsigned * /*vindices*/, const unsigned * /*nindices*/, const unsigned * /*mindices*/,
|
||||
const unsigned * /*tindices*/, const unsigned /*nvertices*/)
|
||||
{
|
||||
// Nothing to be done
|
||||
}
|
||||
|
||||
void WingedEdgeBuilder::buildTriangles(const real *vertices, const real *normals, vector<FrsMaterial>& iMaterials,
|
||||
void WingedEdgeBuilder::buildTriangles(const real * /*vertices*/, const real *normals, vector<FrsMaterial>& /*iMaterials*/,
|
||||
const real *texCoords, const IndexedFaceSet::FaceEdgeMark *iFaceEdgeMarks,
|
||||
const unsigned *vindices, const unsigned *nindices, const unsigned *mindices,
|
||||
const unsigned *tindices, const unsigned nvertices)
|
||||
|
Loading…
Reference in New Issue
Block a user