Skip to content

add support for prisms (new type of geometric_object) to libctlgeom #13

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
May 17, 2018
Merged

add support for prisms (new type of geometric_object) to libctlgeom #13

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
37afb5b
add support for prisms (new type of geometric_object) to libctlgeom
HomerReid Mar 2, 2018
af697cb
updates
HomerReid Mar 4, 2018
54e75a3
Merge branch 'master' of ssh://github.com/stevengj/libctl into prisms
HomerReid Mar 13, 2018
35dcb87
updates to point_in_prism and other functions
HomerReid Mar 16, 2018
21c71eb
implemented intersect_line_with_object for prisms; added working unit…
HomerReid Mar 22, 2018
83a21bb
updates
HomerReid Mar 28, 2018
e06c6d3
new function intersect_line_segment_with_object
HomerReid Mar 28, 2018
137ba57
finished implementing all geometry primitives for prisms; added passi…
HomerReid May 16, 2018
7a4cec1
Merge branch 'master' of ssh://github.com/stevengj/libctl into prisms
HomerReid May 16, 2018
dd61f26
updates
HomerReid May 16, 2018
2ff356e
finished implementing all geometry primitives for prisms; added passi…
HomerReid May 16, 2018
c7bf25c
inserted content of prism.c into geom.c, made updates to enable mpb a…
HomerReid May 17, 2018
e22d1fd
fixed compilation issues for test-prism
HomerReid May 17, 2018
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
7 changes: 7 additions & 0 deletions utils/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ geomtst_SOURCES = geomtst.c
geomtst_LDADD = libctlgeom.la
geomtst_CPPFLAGS = -I$(top_srcdir)/src

check_PROGRAMS = test-prism

test_prism_SOURCES = test-prism.c
test_prism_LDADD = libctlgeom.la

TESTS = test-prism

dist_man_MANS = gen-ctl-io.1

BUILT_SOURCES = gen-ctl-io geom-ctl-io.c ctlgeom-types.h nlopt-constants.scm
Expand Down
7 changes: 7 additions & 0 deletions utils/ctlgeom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ extern vector3 normal_to_object(vector3 p, GEOMETRIC_OBJECT o);
extern vector3 normal_to_fixed_object(vector3 p, GEOMETRIC_OBJECT o);
extern int intersect_line_with_object(vector3 p, vector3 d, GEOMETRIC_OBJECT o,
double s[2]);
extern double intersect_line_segment_with_object(vector3 p, vector3 d,
GEOMETRIC_OBJECT o,
double a, double b);
extern MATERIAL_TYPE material_of_point_inobject(vector3 p, boolean *inobject);
extern MATERIAL_TYPE material_of_point_inobject0(
GEOMETRIC_OBJECT_LIST geometry, vector3 p, boolean *inobject);
Expand Down Expand Up @@ -144,7 +147,11 @@ 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);
GEOMETRIC_OBJECT make_prism(MATERIAL_TYPE material,
const vector3 *vertices, int num_vertices,
double height, vector3 axis);

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

/**************************************************************************/

Expand Down
Loading