~ubuntu-branches/ubuntu/vivid/grass/vivid-proposed

« back to all changes in this revision

Viewing changes to misc/m.nviz.image/local_proto.h

  • Committer: Package Import Robot
  • Author(s): Bas Couwenberg
  • Date: 2015-02-20 23:12:08 UTC
  • mfrom: (8.2.6 experimental)
  • Revision ID: package-import@ubuntu.com-20150220231208-1u6qvqm84v430b10
Tags: 7.0.0-1~exp1
* New upstream release.
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
* Drop patches applied upstream, refresh remaining patches.
* Update symlinks for images switched from jpg to png.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
struct GParams
8
8
{
9
9
    struct Flag *mode_all;
 
10
    struct Flag *isosurf_toggle_norm_dir;
 
11
    struct Flag *draw_volume_box;
10
12
 
11
 
    struct Option 
12
 
    /* surface */
13
 
    *elev_map, *elev_const, *color_map, *color_const,
 
13
    struct Option
 
14
        /* surface */
 
15
     *elev_map, *elev_const, *color_map, *color_const,
14
16
        *mask_map, *transp_map, *transp_const, *shine_map, *shine_const,
15
17
        *emit_map, *emit_const,
16
 
    /* surface draw mode */
17
 
        *mode, *res_fine, *res_coarse, *style, *shade, *wire_color, *surface_pos,
18
 
    /* vector lines */
19
 
        *vlines, *vline_width, *vline_color, *vline_mode, *vline_height, *vline_pos,
20
 
    /* vector points */
21
 
        *vpoints, *vpoint_size, *vpoint_marker, *vpoint_color, *vpoint_width, *vpoint_pos,
22
 
    /* volumes */
23
 
        *volume, *volume_mode, *volume_shade, *volume_pos, *volume_res, *isosurf_level,
24
 
        *isosurf_color_map, *isosurf_color_const, *isosurf_transp_map, *isosurf_transp_const,
25
 
        *isosurf_shine_map, *isosurf_shine_const, *slice_pos, *slice, *slice_transp,
26
 
    /* misc */
27
 
        *exag, *bgcolor,
28
 
    /* cutting planes */
29
 
        *cplane, *cplane_pos, *cplane_rot, *cplane_tilt, *cplane_shading,
30
 
    /* viewpoint */
31
 
        *pos, *height, *persp, *twist, *focus,
32
 
    /* output */
33
 
        *output, *format, *size,
34
 
    /* lighting */
35
 
        *light_pos, *light_color, *light_bright, *light_ambient,
36
 
    /* fringe */
37
 
        *fringe, *fringe_color, *fringe_elev,
38
 
    /* north arrow */
39
 
        *north_arrow, *north_arrow_size, *north_arrow_color;
 
18
        /* surface draw mode */
 
19
     *mode, *res_fine, *res_coarse, *style, *shade, *wire_color, *surface_pos,
 
20
        /* vector lines */
 
21
     *vlines, *vline_width, *vline_color, *vline_mode, *vline_height,
 
22
        *vline_pos, *vline_layer, *vline_color_column, *vline_width_column,
 
23
        /* vector points */
 
24
     *vpoints, *vpoint_size, *vpoint_mode, *vpoint_marker, *vpoint_color,
 
25
        *vpoint_width, *vpoint_pos, *vpoint_layer, *vpoint_size_column,
 
26
        *vpoint_marker_column, *vpoint_color_column, *vpoint_width_column,
 
27
        /* volumes */
 
28
     *volume, *volume_mode, *volume_shade, *volume_pos, *volume_res,
 
29
        *isosurf_level, *isosurf_color_map, *isosurf_color_const,
 
30
        *isosurf_transp_map, *isosurf_transp_const, *isosurf_shine_map,
 
31
        *isosurf_shine_const, *slice_pos, *slice, *slice_transp,
 
32
        /* misc */
 
33
     *exag, *bgcolor,
 
34
        /* cutting planes */
 
35
     *cplane, *cplane_pos, *cplane_rot, *cplane_tilt, *cplane_shading,
 
36
        /* viewpoint */
 
37
     *pos, *height, *persp, *twist, *focus,
 
38
        /* output */
 
39
     *output, *format, *size,
 
40
        /* lighting */
 
41
     *light_pos, *light_color, *light_bright, *light_ambient,
 
42
        /* fringe */
 
43
     *fringe, *fringe_color, *fringe_elev,
 
44
        /* north arrow */
 
45
     *north_arrow, *north_arrow_size, *north_arrow_color;
40
46
};
41
47
 
42
48
/* args.c */
54
60
int load_vpoints(const struct GParams *, nv_data *);
55
61
int vlines_set_attrb(const struct GParams *);
56
62
int vpoints_set_attrb(const struct GParams *);
 
63
int check_map(const struct GParams *, int, int, int *, int *);
57
64
 
58
65
/* volume.c */
59
66
int load_rasters3d(const struct GParams *, nv_data *);