tobast/mpri-graphics-project
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Marching: fix static integration process

Browse source
This commit is contained in:
Théophile Bastian 2018-02-11 20:39:59 +01:00
parent 52ca47cde6
commit 0e026ccad1
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MarchingCubes.cpp
View file

@ -2,10 +2,6 @@
#include <cassert> #include <cassert>
const std::vector<MarchingCubes::CubeTri>
MarchingCubes::edges_of_intersection[256] = {
};
MarchingCubes::MarchingCubes( MarchingCubes::MarchingCubes(
const ImplicitSurface& surface, const ImplicitSurface& surface,
const Cuboid& box, const Cuboid& box,

3
tools/gen_marching_cubes_conf.py
View file

@ -16,6 +16,8 @@ PREAMBLE = """
typedef MarchingCubes::CubeTri Tri; typedef MarchingCubes::CubeTri Tri;
typedef std::vector<Tri> TriVect; typedef std::vector<Tri> TriVect;
typedef MarchingCubes::CubeEdge Edge; typedef MarchingCubes::CubeEdge Edge;
const TriVect MarchingCubes::edges_of_intersection[] = {
""" """
@ -206,7 +208,6 @@ def gen_index(base_cases):
def pretty_print(index): def pretty_print(index):
output = "" output = ""
output += PREAMBLE output += PREAMBLE
output += "static const TriVect edges_of_intersection[256] = {\n"
for (case_id, case) in enumerate(index): for (case_id, case) in enumerate(index):
output += "\tTriVect({\n" output += "\tTriVect({\n"