Skip to content

Commit

Permalink
Some small stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Zang3th committed Jun 4, 2024
1 parent ecfc390 commit 7548962
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NamespaceIndentation: All
IndentPPDirectives: AfterHash

AllowShortFunctionsOnASingleLine: Empty
ColumnLimit: 100
ColumnLimit: 120
BinPackArguments: false
BinPackParameters: false
SpacesInAngles: false
Expand Down
1 change: 1 addition & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Checks: "*,
-readability-simplify-boolean-expr,
-hicpp-use-auto,
-modernize-use-auto,
-cert-err58-cpp,
"
WarningsAsErrors: ''
HeaderFilterRegex: ''
Expand Down
2 changes: 1 addition & 1 deletion Engine/Application/GlobalParams.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,4 @@ namespace Engine
cflCondition = 0.0f;
}
};
}
}
8 changes: 3 additions & 5 deletions Engine/Physics/FluidSimulation/FluidSimulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ namespace Engine
*prev_pos = pos * h + h2 - dt * vel;
}

float FluidSimulator::BackwardEuler() const
void FluidSimulator::BackwardEuler() const
{
/* The update rule for Backward-Euler looks like this: *
* *
Expand All @@ -377,8 +377,6 @@ namespace Engine
* Using a nonlinear solver for each step of Backward-Euler: *
* Source: Cornell University - CS3220 Lecture Notes *
* https://www.cs.cornell.edu/~bindel/class/cs3220-s12/lectures.html */

return 0.0f;
}

void FluidSimulator::RungeKutta2(const float dt, const float pos, const float h, const float h2,
Expand Down Expand Up @@ -408,9 +406,9 @@ namespace Engine
//ToDo: Implement
}

float FluidSimulator::RungeKutta3() const
void FluidSimulator::RungeKutta3() const
{
return 0.0f;

}

// ----- Public -----
Expand Down
7 changes: 4 additions & 3 deletions Engine/Physics/FluidSimulation/FluidSimulator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ namespace Engine
void AdvectSmoke(float dt);
void MonitorCFLStability(float dt, float value) const;
void ForwardEuler(float dt, float pos, float h, float h2, float vel, float* prev_pos);
[[nodiscard]] float BackwardEuler() const;
void BackwardEuler() const;
void RungeKutta2(float dt, float pos, float h, float h2,
float vel, float dx, float dy, float* prev_pos) const;
[[nodiscard]] float RungeKutta3() const;
void RungeKutta3() const;

public:
FluidSimulator();
Expand All @@ -36,6 +36,7 @@ namespace Engine
void Reset() const;
void AddBorderCell(uint32 x, uint32 y) const;
void AddHorizonalTurbine(uint32 x, uint32 y, float power, float dt) const;

[[nodiscard]] float GetDensity(uint32 x, uint32 y) const;
};
}
}
12 changes: 12 additions & 0 deletions myeasylog.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
05:666 [INFO] | Loaded | GLFW-Library |
05:762 [INFO] | Created | GLFW-Window | Liquefied (0.2.0-alpha)
05:764 [INFO] | Loaded | OpenGL | NVIDIA GeForce RTX 4070/PCIe/SSE2, 4.5.0 NVIDIA 550.67
05:764 [ERROR] | Failed | File-Load. | ../Res/Shader/Liquefied/Grid_VS.glsl
05:764 [ERROR] | Failed | File-Load. | ../Res/Shader/Liquefied/Grid_FS.glsl
05:773 [ERROR] | Failed | Shader-Comp. | Type: 35633, Error: (0) : error C0000: syntax error, unexpected $end, expecting "::" at token "<EOF>"

05:773 [ERROR] | Failed | Shader-Comp. | Type: 35632, Error: (0) : error C0000: syntax error, unexpected $end, expecting "::" at token "<EOF>"

05:773 [ERROR] | GL_DEBUG | SEVERITY_HIGH | GL_INVALID_OPERATION error generated. <program> is not a program object, or <shader> is not a shader object.
05:773 [ERROR] | GL_LOG | Error: 1282 | glAttachShader(programID, vsID)
05:773 [ERROR] | GL_LOG | Line: 49 | /home/zang3th/Dev/SalinityGL/Engine/Rendering/Resources/Shader.cpp

0 comments on commit 7548962

Please sign in to comment.