mirror of https://github.com/vitalif/openscad
debugging failed test: throwntogethertest polygons
parent
aa2c67d249
commit
d656f556b8
|
@ -30,7 +30,8 @@
|
|||
|
||||
#include "system-gl.h"
|
||||
|
||||
#include <boost/unordered_map.hpp>
|
||||
//#include <boost/unordered_map.hpp>
|
||||
#include <map>
|
||||
|
||||
ThrownTogetherRenderer::ThrownTogetherRenderer(CSGChain *root_chain,
|
||||
CSGChain *highlights_chain,
|
||||
|
@ -62,7 +63,8 @@ void ThrownTogetherRenderer::renderCSGChain(CSGChain *chain, bool highlight,
|
|||
bool fberror) const
|
||||
{
|
||||
glDepthFunc(GL_LEQUAL);
|
||||
boost::unordered_map<std::pair<PolySet*,Transform3d*>,int> polySetVisitMark;
|
||||
//boost::unordered_map<std::pair<PolySet*,Transform3d*>,int> polySetVisitMark;
|
||||
std::map<std::pair<PolySet*,Transform3d*>,int> polySetVisitMark;
|
||||
for (size_t i = 0; i < chain->polysets.size(); i++) {
|
||||
if (polySetVisitMark[std::make_pair(chain->polysets[i].get(), &chain->matrices[i])]++ > 0)
|
||||
continue;
|
||||
|
|
|
@ -85,7 +85,8 @@ DxfData::DxfData(double fn, double fs, double fa,
|
|||
|
||||
Grid2d< std::vector<int> > grid(GRID_COARSE);
|
||||
std::vector<Line> lines; // Global lines
|
||||
boost::unordered_map< std::string, std::vector<Line> > blockdata; // Lines in blocks
|
||||
//boost::unordered_map< std::string, std::vector<Line> > blockdata; // Lines in blocks
|
||||
std::map< std::string, std::vector<Line> > blockdata; // Lines in blocks
|
||||
|
||||
bool in_entities_section = false;
|
||||
bool in_blocks_section = false;
|
||||
|
@ -123,7 +124,8 @@ DxfData::DxfData(double fn, double fs, double fa,
|
|||
for (int j = 0; j < 2; j++)
|
||||
coords[i][j] = 0;
|
||||
|
||||
typedef boost::unordered_map<std::string, int> EntityList;
|
||||
//typedef boost::unordered_map<std::string, int> EntityList;
|
||||
typedef std::map<std::string, int> EntityList;
|
||||
EntityList unsupported_entities_list;
|
||||
|
||||
//
|
||||
|
|
|
@ -36,9 +36,11 @@
|
|||
#include <sstream>
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
|
||||
boost::unordered_map<std::string,Value> dxf_dim_cache;
|
||||
boost::unordered_map<std::string,Value> dxf_cross_cache;
|
||||
//boost::unordered_map<std::string,Value> dxf_dim_cache;
|
||||
//boost::unordered_map<std::string,Value> dxf_cross_cache;
|
||||
#include <map>
|
||||
std::map<std::string,Value> dxf_dim_cache;
|
||||
std::map<std::string,Value> dxf_cross_cache;
|
||||
namespace fs = boost::filesystem;
|
||||
|
||||
Value builtin_dxf_dim(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args)
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
#ifndef DXFDIM_H_
|
||||
#define DXFDIM_H_
|
||||
|
||||
#include <boost/unordered_map.hpp>
|
||||
//#include <boost/unordered_map.hpp>
|
||||
#include <map>
|
||||
#include "value.h"
|
||||
|
||||
extern boost::unordered_map<std::string,Value> dxf_dim_cache;
|
||||
extern boost::unordered_map<std::string,Value> dxf_cross_cache;
|
||||
//extern boost::unordered_map<std::string,Value> dxf_dim_cache;
|
||||
//extern boost::unordered_map<std::string,Value> dxf_cross_cache;
|
||||
extern std::map<std::string,Value> dxf_dim_cache;
|
||||
extern std::map<std::string,Value> dxf_cross_cache;
|
||||
|
||||
#endif
|
||||
|
|
|
@ -30,7 +30,8 @@ typedef CGAL::Constrained_Delaunay_triangulation_2<K, Tds> CDT;
|
|||
typedef CDT::Vertex_handle Vertex_handle;
|
||||
typedef CDT::Point CDTPoint;
|
||||
|
||||
#include <boost/unordered_map.hpp>
|
||||
//#include <boost/unordered_map.hpp>
|
||||
#include <map>
|
||||
|
||||
template <class T> class DummyCriteria {
|
||||
public:
|
||||
|
@ -71,8 +72,10 @@ struct point_info_t
|
|||
typedef std::pair<point_info_t*,point_info_t*> edge_t;
|
||||
|
||||
void mark_inner_outer(std::vector<struct triangle> &tri, Grid2d<point_info_t> &point_info,
|
||||
boost::unordered_map<edge_t,int> &edge_to_triangle,
|
||||
boost::unordered_map<edge_t,int> &edge_to_path, int idx, bool inner)
|
||||
std::map<edge_t,int> &edge_to_triangle,
|
||||
std::map<edge_t,int> &edge_to_path, int idx, bool inner)
|
||||
// boost::unordered_map<edge_t,int> &edge_to_triangle,
|
||||
// boost::unordered_map<edge_t,int> &edge_to_path, int idx, bool inner)
|
||||
{
|
||||
if (tri[idx].is_marked)
|
||||
return;
|
||||
|
@ -107,8 +110,10 @@ void dxf_tesselate(PolySet *ps, DxfData &dxf, double rot, bool up, bool /* do_tr
|
|||
|
||||
std::vector<struct triangle> tri;
|
||||
Grid2d<point_info_t> point_info(GRID_FINE);
|
||||
boost::unordered_map<edge_t,int> edge_to_triangle;
|
||||
boost::unordered_map<edge_t,int> edge_to_path;
|
||||
// boost::unordered_map<edge_t,int> edge_to_triangle;
|
||||
// boost::unordered_map<edge_t,int> edge_to_path;
|
||||
std::map<edge_t,int> edge_to_triangle;
|
||||
std::map<edge_t,int> edge_to_path;
|
||||
|
||||
CGAL::Failure_behaviour old_behaviour = CGAL::set_error_behaviour(CGAL::THROW_EXCEPTION);
|
||||
try {
|
||||
|
|
|
@ -8,8 +8,10 @@
|
|||
#include <boost/filesystem.hpp>
|
||||
namespace fs = boost::filesystem;
|
||||
#include "boosty.h"
|
||||
#include <set>
|
||||
|
||||
boost::unordered_set<std::string> dependencies;
|
||||
//boost::unordered_set<std::string> dependencies;
|
||||
std::set<std::string> dependencies;
|
||||
const char *make_command = NULL;
|
||||
|
||||
void handle_dep(const std::string &filename)
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/assign/std/vector.hpp>
|
||||
using namespace boost::assign; // bring 'operator+=()' into scope
|
||||
#include <map>
|
||||
|
||||
#include <boost/filesystem.hpp>
|
||||
namespace fs = boost::filesystem;
|
||||
|
@ -110,7 +111,8 @@ PolySet *SurfaceNode::evaluate_polyset(class PolySetEvaluator *) const
|
|||
|
||||
PolySet *p = new PolySet();
|
||||
int lines = 0, columns = 0;
|
||||
boost::unordered_map<std::pair<int,int>,double> data;
|
||||
//boost::unordered_map<std::pair<int,int>,double> data;
|
||||
std::map<std::pair<int,int>,double> data;
|
||||
double min_val = 0;
|
||||
|
||||
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
|
||||
|
|
|
@ -357,6 +357,13 @@ int csgtestcore(int argc, char *argv[], test_type_e test_type)
|
|||
Vector3d camerapos = center - radius*1.8*cameradir;
|
||||
csgInfo.glview->setCamera(camerapos, center);
|
||||
|
||||
#include <iostream>
|
||||
if (csgInfo.background_chain)
|
||||
std::cout << csgInfo.background_chain->dump( true ) << "\n";
|
||||
if (csgInfo.root_chain)
|
||||
std::cout << csgInfo.root_chain->dump( true ) << "\n";
|
||||
if (csgInfo.highlights_chain)
|
||||
std::cout << csgInfo.highlights_chain->dump( true ) << "\n";
|
||||
OpenCSGRenderer opencsgRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain, csgInfo.glview->shaderinfo);
|
||||
ThrownTogetherRenderer thrownTogetherRenderer(csgInfo.root_chain, csgInfo.highlights_chain, csgInfo.background_chain);
|
||||
|
||||
|
|
Loading…
Reference in New Issue