hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

Make the fluid sample do a splat on startup #156

Merged
MartinFouilleul merged 2 commits from ilidemi/orca:fluid-startup into main 2023-10-08 15:44:45 +00:00
Conversation 0 Commits 2 Files Changed 1 +11 -11
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5e62a5d2e7 - Show all commits

22
samples/fluid/src/main.c
View File

@ -582,6 +582,14 @@ void input_splat(float t)
{ {
bool applySplat = false; bool applySplat = false;
float x, y, deltaX, deltaY; float x, y, deltaX, deltaY;
static f64 lastFrameTime = 0;
if (lastFrameTime == 0)
{
lastFrameTime = startTime;
}
f64 now = oc_clock_time(OC_CLOCK_MONOTONIC);
float frameDuration = now - lastFrameTime;
lastFrameTime = now;
if (mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY)) if (mouseInput.down && (mouseInput.deltaX || mouseInput.deltaY))
{ {
@ -589,13 +597,12 @@ void input_splat(float t)
applySplat = true; applySplat = true;
x = mouseInput.x * scaling.x / frameWidth; x = mouseInput.x * scaling.x / frameWidth;
y = mouseInput.y * scaling.y / frameHeight; y = mouseInput.y * scaling.y / frameHeight;
deltaX = mouseInput.deltaX * scaling.x / frameWidth; deltaX = 1. / 60 / frameDuration * mouseInput.deltaX * scaling.x / frameWidth;
deltaY = mouseInput.deltaY * scaling.y / frameHeight; deltaY = 1. / 60 / frameDuration * mouseInput.deltaY * scaling.y / frameHeight;
mouseInput.deltaX = 0; mouseInput.deltaX = 0;
mouseInput.deltaY = 0; mouseInput.deltaY = 0;
} }
f64 now = oc_clock_time(OC_CLOCK_MONOTONIC);
f64 timeSinceStart = now - startTime; f64 timeSinceStart = now - startTime;
if (!mouseWasDown && timeSinceStart < 1) if (!mouseWasDown && timeSinceStart < 1)
{ {
@ -603,15 +610,8 @@ void input_splat(float t)
float totalDeltaX = 0.5; float totalDeltaX = 0.5;
x = 0.1 + totalDeltaX * timeSinceStart; x = 0.1 + totalDeltaX * timeSinceStart;
y = 0.5; y = 0.5;
deltaX = totalDeltaX / 180;
static f64 lastFrameTime = 0;
if (lastFrameTime == 0)
{
lastFrameTime = startTime;
}
deltaX = totalDeltaX * (now - lastFrameTime) / 3;
deltaY = 0; deltaY = 0;
lastFrameTime = now;
} }
//NOTE: apply force and dye //NOTE: apply force and dye