blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: delete unused ViewMapIO files in Freestyle 

ViewMapIO.h is only included in Controller.cpp init_options().
However, g_models_path and g_flags set here are never used elsewhere.
Therefore, ViewMapIO files can be deleted without affecting anything.

Differential Revision: https://developer.blender.org/D14423
This commit is contained in:
Yuki Hashimoto 2022-03-23 17:46:20 +01:00 committed by Brecht Van Lommel
parent e7b1be52e0
commit 31bfa17a1f
4 changed files with 0 additions and 1389 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/CMakeLists.txt
View File

@ -508,8 +508,6 @@ set(SRC
intern/view_map/ViewMapAdvancedIterators.h
intern/view_map/ViewMapBuilder.cpp
intern/view_map/ViewMapBuilder.h
intern/view_map/ViewMapIO.cpp
intern/view_map/ViewMapIO.h
intern/view_map/ViewMapIterators.h
intern/view_map/ViewMapTesselator.cpp
intern/view_map/ViewMapTesselator.h

4
source/blender/freestyle/intern/application/Controller.cpp
View File

@ -36,7 +36,6 @@ extern "C" {
#include "../view_map/SteerableViewMap.h"
#include "../view_map/ViewMap.h"
#include "../view_map/ViewMapIO.h"
#include "../view_map/ViewMapTesselator.h"
#include "../winged_edge/Curvature.h"
@ -1099,13 +1098,10 @@ void Controller::init_options()
Config::Path *cpath = Config::Path::getInstance();
// Directories
ViewMapIO::Options::setModelsPath(cpath->getModelsPath());
TextureManager::Options::setPatternsPath(cpath->getPatternsPath());
TextureManager::Options::setBrushesPath(cpath->getModelsPath());
// ViewMap Format
ViewMapIO::Options::rmFlags(ViewMapIO::Options::FLOAT_VECTORS);
ViewMapIO::Options::rmFlags(ViewMapIO::Options::NO_OCCLUDERS);
setComputeSteerableViewMapFlag(false);
// Visibility

1294
source/blender/freestyle/intern/view_map/ViewMapIO.cpp
View File

File diff suppressed because it is too large Load Diff

89
source/blender/freestyle/intern/view_map/ViewMapIO.h
View File

@ -1,89 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
/** \file
* \ingroup freestyle
* \brief Functions to manage I/O for the view map
*/
#include <fstream>
#include <string>
#include "ViewMap.h"
#include "../system/FreestyleConfig.h"
#include "../system/ProgressBar.h"
namespace Freestyle {
namespace ViewMapIO {
static const unsigned ZERO = UINT_MAX;
int load(istream &in, ViewMap *vm, ProgressBar *pb = NULL);
int save(ostream &out, ViewMap *vm, ProgressBar *pb = NULL);
namespace Options {
static const unsigned char FLOAT_VECTORS = 1;
static const unsigned char NO_OCCLUDERS = 2;
void setFlags(unsigned char flags);
void addFlags(unsigned char flags);
void rmFlags(unsigned char flags);
unsigned char getFlags();
void setModelsPath(const string &path);
string getModelsPath();
}; // namespace Options
#ifdef IRIX
namespace Internal {
template<unsigned S> ostream &write(ostream &out, const char *str)
{
out.put(str[S - 1]);
return write<S - 1>(out, str);
}
template<> ostream &write<1>(ostream &out, const char *str)
{
return out.put(str[0]);
}
template<> ostream &write<0>(ostream &out, const char *)
{
return out;
}
template<unsigned S> istream &read(istream &in, char *str)
{
in.get(str[S - 1]);
return read<S - 1>(in, str);
}
template<> istream &read<1>(istream &in, char *str)
{
return in.get(str[0]);
}
template<> istream &read<0>(istream &in, char *)
{
return in;
}
} // End of namespace Internal
#endif // IRIX
} // End of namespace ViewMapIO
} /* namespace Freestyle */