Skip to content

Refactor prisms for scheme #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevengj merged 13 commits into from
Jan 7, 2019
Merged

Refactor prisms for scheme #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9e53969
implement geom_fix_object for prisms (recompute centroid of polygon f…
HomerReid Sep 6, 2018
00389d9
updates
HomerReid Nov 28, 2018
d569e6f
refactor make_prism() to facilitate handling of prisms in scheme
HomerReid Nov 29, 2018
46c40c6
refactor prism implementation for compatibility with legacy scheme in…
HomerReid Dec 2, 2018
d73d6a9
updates
Dec 12, 2018
25586df
updates
Dec 31, 2018
bab2110
updates
Jan 4, 2019
51f7060
updates
Jan 4, 2019
6d1e61a
fix commented-out code
stevengj Jan 7, 2019
f379cbd
use random sentinel for no-val
stevengj Jan 7, 2019
b3dc4d7
use same NO_VAL as in scm
stevengj Jan 7, 2019
49bab31
use nan instead of no-val
stevengj Jan 7, 2019
eb2ca33
use nan for auto-center
stevengj Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion utils/ctlgeom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extern void display_geometric_object_info(int indentby, geometric_object o);
#endif

extern void geom_initialize(void);
extern void geom_fix_object(GEOMETRIC_OBJECT o);
extern void geom_fix_object(GEOMETRIC_OBJECT *o);
extern void geom_fix_objects(void);
extern void geom_fix_objects0(GEOMETRIC_OBJECT_LIST geometry);
extern void geom_fix_lattice(void);
Expand Down Expand Up @@ -147,10 +147,18 @@ GEOMETRIC_OBJECT make_block(MATERIAL_TYPE material, vector3 center,
GEOMETRIC_OBJECT make_ellipsoid(MATERIAL_TYPE material, vector3 center,
vector3 e1, vector3 e2, vector3 e3,
vector3 size);

// prism with `center` field computed automatically from vertices, height, axis
GEOMETRIC_OBJECT make_prism(MATERIAL_TYPE material,
const vector3 *vertices, int num_vertices,
double height, vector3 axis);

// as make_prism, but with a rigid translation so that the prism is centered at center
GEOMETRIC_OBJECT make_prism_with_center(MATERIAL_TYPE material, vector3 center,
const vector3 *vertices, int num_vertices,
double height, vector3 axis);


int vector3_nearly_equal(vector3 v1, vector3 v2, double tolerance);

/**************************************************************************/
Expand Down
Loading