Commit 322f954b authored by Martin Schultz's avatar Martin Schultz
Browse files

* removed some unused variables

* fixed missing log entry


git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@21139 383ad7c9-94d9-4d36-a494-682f7c89f535
parent d058e60c
......@@ -491,9 +491,7 @@ template <class PointT>
ACG::Vec2i
BSplineCurveT<PointT>::
interval(double _t)
{
Vec2i interval = Vec2i(-1, -1);
{
unsigned int i(0);
while (_t >= knotvector_(i)) i++;
while (_t < knotvector_(i)) i--;
......
......@@ -551,12 +551,8 @@ drawControlNet(GLState& _state)
// draw selection
if (controlNetSelIndices_)
{
// save old values
float point_size_old = _state.point_size();
glColor(generateHighlightColor(controlnet_color_));
glPointSize(10);
// glPointSize(point_size_old+2);
// selected points are in index buffer
controlNetSelIBO_.bind();
......
......@@ -782,8 +782,6 @@ ACG::Vec2i
BSplineSurfaceT<PointT>::
interval_m(double _t)
{
Vec2i interval = Vec2i(-1, -1);
unsigned int i(0);
if (_t >= upperu())
......@@ -804,8 +802,6 @@ ACG::Vec2i
BSplineSurfaceT<PointT>::
interval_n(double _t)
{
Vec2i interval = Vec2i(-1, -1);
unsigned int i(0);
if (_t >= upperv())
......
......@@ -2038,12 +2038,6 @@ int FileOBJPlugin::loadObject(QString _filename) {
}
#endif
#ifdef ENABLE_BSPLINESURFACE_SUPPORT
//handle new BSplineCurves
BSplineSurfaceObject* bssObj = dynamic_cast< BSplineSurfaceObject* > (object);
#endif
//textures
if ( importer.hasTexture(i) && !importer.hasOption( i, OBJImporter::FORCE_NOTEXTURES ) ){
......
......@@ -46,7 +46,6 @@
* $Date$ *
* *
\*===========================================================================*/
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
......@@ -74,11 +73,11 @@ void FileViewPlugin::initializePlugin() {
QString FileViewPlugin::getLoadFilters() {
return QString( tr("View definition files ( *.ofv )") );
};
}
QString FileViewPlugin::getSaveFilters() {
return QString( tr("View definition files ( *.ofv )") );
};
}
DataType FileViewPlugin::supportedType() {
return DataType();
......@@ -90,14 +89,11 @@ int FileViewPlugin::loadObject(QString _filename) {
ACG::Vec3d eye(1.0,1.0,1.0);
ACG::Vec3d center(0.0,0.0,0.0);
ACG::Vec3d up(1.0,0.0,0.0);
// float fovy = 0;
ACG::Vec4f background;
//bool e_widthAndHeight = false;
bool e_eye = false;
bool e_center = false;
bool e_up = false;
// bool e_fovy = false;
bool e_background = false;
QSettings settings(_filename, QSettings::IniFormat);
......@@ -107,7 +103,6 @@ int FileViewPlugin::loadObject(QString _filename) {
const int width = settings.value("Width").toInt();
const int height = settings.value("Height").toInt();
std::cerr << "Setting new viewport to " << width << "x" << height << std::endl;
//e_widthAndHeight = true;
}
if(settings.contains("EyeX")) {
......@@ -134,11 +129,6 @@ int FileViewPlugin::loadObject(QString _filename) {
e_up = true;
}
// if(settings.contains("Fovy")) {
// fovy = settings.value("Fovy").toDouble();
// std::cerr << "Setting fovy to " << fovy << std::endl;
// e_fovy = true;
// }
if(settings.contains("BackgroundR")) {
background[0] = settings.value("BackgroundR").toDouble();
......@@ -152,31 +142,7 @@ int FileViewPlugin::loadObject(QString _filename) {
settings.endGroup();
// Now set new projection and view
// Get number of viewers
int viewers = PluginFunctions::viewers();
for(int i = 0; i < viewers; ++i) {
Viewer::ViewerProperties& props = PluginFunctions::viewerProperties(i);
ACG::GLState& state = props.glState();
// // Perspective update
// double aspect = 0.0;
// if(e_widthAndHeight) aspect = width / height;
// else aspect = state.aspect();
// Set projection matrix
//if(e_fovy)
// state.perspective(fovy, aspect, near, far);
// Viewport
//if(e_widthAndHeight)
// state.viewport(0, 0, width, height);
//std::cerr << "Fovy: " << state.fovy() << std::endl;
}
// LookAt
ACG::Vec3d new_eye = e_eye ? eye : PluginFunctions::eyePos();
ACG::Vec3d new_center = e_center ? center : PluginFunctions::sceneCenter();
......@@ -192,7 +158,7 @@ int FileViewPlugin::loadObject(QString _filename) {
emit updateView();
return 0;
};
}
bool FileViewPlugin::saveObject(int /*_id*/, QString /*_filename*/) {
......
......@@ -181,7 +181,7 @@ int FilePLYPlugin::loadObject(QString _filename, DataType _type) {
return objectId;
} else {
emit ( LOGERR, tr("FilePLYPlugin::loadObject(): Tried loading with unknown forced data type"));
emit log( LOGERR, tr("FilePLYPlugin::loadObject(): Tried loading with unknown forced data type"));
}
return -1;
......
Markdown is supported
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