Skip to content

Added BoundsOverlay Rendermode Primitive #1336

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

Open
jpchip wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Added BoundsOverlay Rendermode Primitive #1336

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86d0b9d
start work on overview-bounds rendermode
jpchip Oct 10, 2016
c7dd67d
fix example, add is_inside function
jpchip Oct 11, 2016
b4f5927
cleanup code
jpchip Oct 11, 2016
7466860
fixed calculating absolute x and z positions
jpchip Oct 18, 2016
1c5546d
update docs to include BoundsOverlay
jpchip Oct 19, 2016
09985a5
fix doc formatting
jpchip Oct 19, 2016
42572ec
add curly braces to if statements
jpchip Oct 21, 2016
131d788
Merge pull request #1 from jpchip/overlay-bounds
theraccoonbear Oct 21, 2016
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
Prev Previous commit
Next Next commit
add curly braces to if statements
  • Loading branch information
@jpchip
jpchip committed Oct 21, 2016
commit 42572ec47fcd8fc97216a33529413cb8f0de2148
15 changes: 9 additions & 6 deletions overviewer_core/src/primitives/overlay-bounds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,18 @@ static int overlay_bounds_start(void *data, RenderState *state, PyObject *suppor

/* first, chain up */
int ret = primitive_overlay.start(data, state, support);
if (ret != 0)
return ret;
if (ret != 0) {
return ret;
}

/* now do custom initializations */
self = (RenderPrimitiveBounds *)data;

// opt is a borrowed reference. do not deref
// store the bounds python object into opt.
if (!render_mode_parse_option(support, "bounds", "O", &(opt)))
return 1;
if (!render_mode_parse_option(support, "bounds", "O", &(opt))) {
return 1;
}

/**
* Check if a sane option was passed.
Expand Down Expand Up @@ -220,8 +222,9 @@ static void overlay_bounds_finish(void *data, RenderState *state) {
// freeing the nested bounds
struct Color * m = self->bounds;
for(i = 0; i < self->numcolors; i++){
if(m[i].conditions)
free(m[i].conditions);
if(m[i].conditions) {
free(m[i].conditions);
}
}
}

Expand Down