Commit 71f5ed05 authored by Dirk Wilden's avatar Dirk Wilden
Browse files

removed warnings

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@10625 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 8779809e
...@@ -294,7 +294,7 @@ void SkeletonEditingPlugin::slotPickToolbarAction(QAction* _action) ...@@ -294,7 +294,7 @@ void SkeletonEditingPlugin::slotPickToolbarAction(QAction* _action)
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
void SkeletonEditingPlugin::slotSetEditingMode(QAction* _action) void SkeletonEditingPlugin::slotSetEditingMode(QAction* /*_action*/)
{ {
PluginFunctions::actionMode(Viewer::PickingMode); PluginFunctions::actionMode(Viewer::PickingMode);
PluginFunctions::pickMode("MoveJoints"); PluginFunctions::pickMode("MoveJoints");
...@@ -820,8 +820,6 @@ void SkeletonEditingPlugin::insertJoint(QMouseEvent* _event) ...@@ -820,8 +820,6 @@ void SkeletonEditingPlugin::insertJoint(QMouseEvent* _event)
if (skeleton == 0) if (skeleton == 0)
return; return;
Skeleton::Joint* joint = skeleton->joint( currentJoint_ );
for (Skeleton::Iterator it=skeleton->begin(); it != skeleton->end(); ++it) for (Skeleton::Iterator it=skeleton->begin(); it != skeleton->end(); ++it)
(*it)->setSelected(false); (*it)->setSelected(false);
} }
...@@ -835,8 +833,6 @@ Skeleton::Pose* SkeletonEditingPlugin::activePose(SkeletonObject* _skeletonObj){ ...@@ -835,8 +833,6 @@ Skeleton::Pose* SkeletonEditingPlugin::activePose(SkeletonObject* _skeletonObj){
AnimationHandle handle = _skeletonObj->skeletonNode()->activePose(); AnimationHandle handle = _skeletonObj->skeletonNode()->activePose();
Skeleton::Pose* pose = 0;
if ( !handle.isValid() ){ if ( !handle.isValid() ){
//no current animation found -> transform the reference Pose //no current animation found -> transform the reference Pose
return skeleton->referencePose(); return skeleton->referencePose();
......
...@@ -156,7 +156,6 @@ void SkeletonEditingPlugin::addJoint( int _objectId , int _parent, Vector _posit ...@@ -156,7 +156,6 @@ void SkeletonEditingPlugin::addJoint( int _objectId , int _parent, Vector _posit
skeleton->addJoint(parent, jointNew); skeleton->addJoint(parent, jointNew);
//set the position //set the position
Skeleton::Pose* refPose = skeleton->referencePose();
setJointPosition(PluginFunctions::skeletonObject(baseObject), jointNew, _position); setJointPosition(PluginFunctions::skeletonObject(baseObject), jointNew, _position);
emit updatedObject(_objectId, UPDATE_ALL); emit updatedObject(_objectId, UPDATE_ALL);
...@@ -542,8 +541,6 @@ int SkeletonEditingPlugin::activeAnimation(int _objectId){ ...@@ -542,8 +541,6 @@ int SkeletonEditingPlugin::activeAnimation(int _objectId){
return -1; return -1;
} }
Skeleton* skeleton = PluginFunctions::skeleton(obj);
AnimationHandle handle = skeletonObj->skeletonNode()->activePose(); AnimationHandle handle = skeletonObj->skeletonNode()->activePose();
emit scriptInfo("activeAnimation( ObjectId )" ); emit scriptInfo("activeAnimation( ObjectId )" );
...@@ -570,8 +567,6 @@ int SkeletonEditingPlugin::activeFrame(int _objectId){ ...@@ -570,8 +567,6 @@ int SkeletonEditingPlugin::activeFrame(int _objectId){
return -1; return -1;
} }
Skeleton* skeleton = PluginFunctions::skeleton(obj);
AnimationHandle handle = skeletonObj->skeletonNode()->activePose(); AnimationHandle handle = skeletonObj->skeletonNode()->activePose();
emit scriptInfo("activeFrame( ObjectId )" ); emit scriptInfo("activeFrame( ObjectId )" );
......
...@@ -50,7 +50,7 @@ const ACG::Vec4f base_color (0.4,0.4,0.4,1.0); ...@@ -50,7 +50,7 @@ const ACG::Vec4f base_color (0.4,0.4,0.4,1.0);
//****************************************************************************** //******************************************************************************
bool SkeletonMarker::stencilRefForObject(BaseObjectData * _obj, GLuint & _reference) bool SkeletonMarker::stencilRefForObject(BaseObjectData * /*_obj*/, GLuint & _reference)
{ {
_reference = 1; _reference = 1;
return true; return true;
......
Supports Markdown
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