eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-20 06:40:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix water ripples

Browse Source 
git-svn-id: svn://code.dyne.org/veejay/trunk@1098 eb8d1916-c9e9-0310-b8de-cf0c9472ead5
This commit is contained in:
Niels Elburg
2008-10-21 17:44:34 +00:00
parent 514a148e55
commit aeb5838e82
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sandbox/veejay-server/libvje/effects/waterrippletv.c
View File

@@ -31,6 +31,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include "common.h" #include "common.h"
#define RUP8(num)(((num)+8)&~8)
static uint8_t *ripple_data[3]; static uint8_t *ripple_data[3];
static int stat; static int stat;
@@ -100,15 +102,15 @@ vj_effect *waterrippletv_init(int width, int height)
int waterrippletv_malloc(int width, int height) int waterrippletv_malloc(int width, int height)
{ {
ripple_data[0] = (uint8_t*)vj_malloc(sizeof(uint8_t) * width * height); ripple_data[0] = (uint8_t*)vj_malloc(sizeof(uint8_t) * RUP8(width * height));
if(!ripple_data[0]) return 0; if(!ripple_data[0]) return 0;
veejay_memset( ripple_data[0], pixel_Y_lo_, width*height); veejay_memset( ripple_data[0], pixel_Y_lo_, width*height);
map_h = height / 2 + 1; map_h = height / 2 + 1;
map_w = width / 2 + 1; map_w = width / 2 + 1;
map = (int*) vj_calloc (sizeof(int) * map_h * map_w * 3); map = (int*) vj_calloc (sizeof(int) * RUP8(map_h * map_w * 3));
if(!map) return 0; if(!map) return 0;
vtable = (signed char*) vj_calloc( sizeof(signed char) * map_w * map_h * 2); vtable = (signed char*) vj_calloc( sizeof(signed char) * RUP8(map_w * map_h * 2));
if(!vtable) return 0; if(!vtable) return 0;
map3 = map + map_w * map_h * 2; map3 = map + map_w * map_h * 2;
setTable(); setTable();
@@ -123,7 +125,6 @@ void waterrippletv_free() {
if(ripple_data[0]) free(ripple_data[0]); if(ripple_data[0]) free(ripple_data[0]);
if(map) free(map); if(map) free(map);
if(vtable) free(vtable); if(vtable) free(vtable);
} }
@@ -131,7 +132,6 @@ static inline void drop(int power)
{ {
int x, y; int x, y;
int *p, *q; int *p, *q;
x = wfastrand()%(map_w-4)+2; x = wfastrand()%(map_w-4)+2;
y = wfastrand()%(map_h-4)+2; y = wfastrand()%(map_h-4)+2;
p = map1 + y*map_w + x; p = map1 + y*map_w + x;
@@ -230,7 +230,6 @@ void waterrippletv_apply(VJFrame *frame, int width, int height, int fresh_rate,
signed char *vp; signed char *vp;
uint8_t *src,*dest; uint8_t *src,*dest;
const int len = frame->len; const int len = frame->len;
uint8_t *Y = frame->data[0];
if(last_fresh_rate != fresh_rate || tick > fresh_rate) if(last_fresh_rate != fresh_rate || tick > fresh_rate)
{ {
@@ -240,9 +239,9 @@ void waterrippletv_apply(VJFrame *frame, int width, int height, int fresh_rate,
} }
tick ++; tick ++;
veejay_memcpy ( ripple_data[0], Y,len); veejay_memcpy ( ripple_data[0], frame->data[0],len);
dest = Y; dest = frame->data[0];
src = ripple_data[0]; src = ripple_data[0];
/* impact from the motion or rain drop */ /* impact from the motion or rain drop */