diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-13 00:39:39 +0400 |
| commit | 9892736206676c5b7fabc8d1184f9655511ff2dd (patch) | |
| tree | 83562ac50c93fe3004959d35c1af4a5b380fdd97 /source/blender/blenkernel/BKE_ocean.h | |
| parent | cffaa42d3a34c6b310c3c87c98e1f8313881e473 (diff) | |
code cleanup: header cleanup and remove some duplicate defines.
Diffstat (limited to 'source/blender/blenkernel/BKE_ocean.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_ocean.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_ocean.h b/source/blender/blenkernel/BKE_ocean.h index 1c659b61d7d..de12afb02bd 100644 --- a/source/blender/blenkernel/BKE_ocean.h +++ b/source/blender/blenkernel/BKE_ocean.h @@ -69,25 +69,25 @@ typedef struct OceanCache { } OceanCache; -#define OCEAN_NOT_CACHED 0 -#define OCEAN_CACHING 1 -#define OCEAN_CACHED 2 +#define OCEAN_NOT_CACHED 0 +#define OCEAN_CACHING 1 +#define OCEAN_CACHED 2 struct Ocean *BKE_add_ocean(void); void BKE_free_ocean_data(struct Ocean *oc); void BKE_free_ocean(struct Ocean *oc); -void BKE_init_ocean(struct Ocean* o, int M, int N, float Lx, float Lz, float V, float l, float A, float w, float damp, +void BKE_init_ocean(struct Ocean *o, int M, int N, float Lx, float Lz, float V, float l, float A, float w, float damp, float alignment, float depth, float time, short do_height_field, short do_chop, short do_normals, short do_jacobian, int seed); void BKE_simulate_ocean(struct Ocean *o, float t, float scale, float chop_amount); /* sampling the ocean surface */ float BKE_ocean_jminus_to_foam(float jminus, float coverage); -void BKE_ocean_eval_uv(struct Ocean * oc, struct OceanResult *ocr, float u, float v); -void BKE_ocean_eval_uv_catrom(struct Ocean * oc, struct OceanResult *ocr, float u, float v); -void BKE_ocean_eval_xz(struct Ocean * oc, struct OceanResult *ocr, float x, float z); -void BKE_ocean_eval_xz_catrom(struct Ocean * oc, struct OceanResult *ocr, float x, float z); -void BKE_ocean_eval_ij(struct Ocean * oc, struct OceanResult *ocr, int i, int j); +void BKE_ocean_eval_uv(struct Ocean *oc, struct OceanResult *ocr, float u, float v); +void BKE_ocean_eval_uv_catrom(struct Ocean *oc, struct OceanResult *ocr, float u, float v); +void BKE_ocean_eval_xz(struct Ocean *oc, struct OceanResult *ocr, float x, float z); +void BKE_ocean_eval_xz_catrom(struct Ocean *oc, struct OceanResult *ocr, float x, float z); +void BKE_ocean_eval_ij(struct Ocean *oc, struct OceanResult *ocr, int i, int j); /* ocean cache handling */ |