Minor fixes
This commit is contained in:
parent
ad544a595d
commit
a1b6f51398
|
|
@ -36,13 +36,8 @@ jobs:
|
||||||
# Install Nazara dependencies
|
# Install Nazara dependencies
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install libsndfile1-dev libfreetype6-dev libsdl2-dev mesa-common-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev libglx-mesa0 mesa-vulkan-drivers alsa-base alsa-oss alsa-utils pulseaudio git gcovr -y
|
sudo apt-get -y install libsndfile1-dev libfreetype6-dev libsdl2-dev mesa-common-dev libxcb-ewmh-dev libxcb-randr0-dev libxcb-icccm4-dev libxcb-keysyms1-dev git gcovr
|
||||||
sudo apt-get -y install linux-modules-extra-$(uname -r)
|
|
||||||
|
|
||||||
# Setup dummy audio device
|
|
||||||
- name: Enable snd-dummy
|
|
||||||
run: sudo modprobe snd-dummy
|
|
||||||
|
|
||||||
# Force xmake to a specific folder (for cache)
|
# Force xmake to a specific folder (for cache)
|
||||||
- name: Set xmake env
|
- name: Set xmake env
|
||||||
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
|
run: echo "XMAKE_GLOBALDIR=${{ runner.workspace }}/xmake-global" >> $GITHUB_ENV
|
||||||
|
|
@ -79,7 +74,7 @@ jobs:
|
||||||
|
|
||||||
# Run unit tests
|
# Run unit tests
|
||||||
- name: Run unit tests
|
- name: Run unit tests
|
||||||
run: xmake run NazaraClientUnitTests
|
run: xmake run NazaraUnitTests
|
||||||
|
|
||||||
# Build coverage file
|
# Build coverage file
|
||||||
- name: Build coverage output
|
- name: Build coverage output
|
||||||
|
|
|
||||||
2
Doxyfile
2
Doxyfile
|
|
@ -38,7 +38,7 @@ PROJECT_NAME = "Nazara Engine"
|
||||||
# could be handy for archiving the generated documentation or if some version
|
# could be handy for archiving the generated documentation or if some version
|
||||||
# control system is used.
|
# control system is used.
|
||||||
|
|
||||||
PROJECT_NUMBER = 0.4
|
PROJECT_NUMBER = 0.1
|
||||||
|
|
||||||
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
# Using the PROJECT_BRIEF tag one can provide an optional one line description
|
||||||
# for a project that appears at the top of each page and should give viewer a
|
# for a project that appears at the top of each page and should give viewer a
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ int main()
|
||||||
registry.emplace<Nz::NodeComponent>(viewer);
|
registry.emplace<Nz::NodeComponent>(viewer);
|
||||||
auto& cameraComponent = registry.emplace<Nz::CameraComponent>(viewer, window.GetRenderTarget());
|
auto& cameraComponent = registry.emplace<Nz::CameraComponent>(viewer, window.GetRenderTarget());
|
||||||
cameraComponent.UpdateRenderMask(1);
|
cameraComponent.UpdateRenderMask(1);
|
||||||
//cameraComponent.UpdateClearColor(Nz::Color(127, 127, 127));
|
cameraComponent.UpdateClearColor(Nz::Color(127, 127, 127));
|
||||||
}
|
}
|
||||||
|
|
||||||
auto shipCollider = std::make_shared<Nz::ConvexCollider3D>(vertices, vertexMapper.GetVertexCount(), 0.01f);
|
auto shipCollider = std::make_shared<Nz::ConvexCollider3D>(vertices, vertexMapper.GetVertexCount(), 0.01f);
|
||||||
|
|
|
||||||
|
|
@ -654,7 +654,7 @@ namespace Nz
|
||||||
|
|
||||||
// Activation of the bit without branching
|
// Activation of the bit without branching
|
||||||
// https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
|
// https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
|
||||||
block = (block & ~mask) | (-val & mask);
|
block = (block & ~mask) | (-static_cast<Block>(val) & mask);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ namespace Nz
|
||||||
public:
|
public:
|
||||||
inline SimpleTextDrawer();
|
inline SimpleTextDrawer();
|
||||||
inline SimpleTextDrawer(const SimpleTextDrawer& drawer);
|
inline SimpleTextDrawer(const SimpleTextDrawer& drawer);
|
||||||
inline SimpleTextDrawer(SimpleTextDrawer&& drawer);
|
inline SimpleTextDrawer(SimpleTextDrawer&& drawer) noexcept;
|
||||||
~SimpleTextDrawer() = default;
|
~SimpleTextDrawer() = default;
|
||||||
|
|
||||||
inline void AppendText(const std::string_view& str);
|
inline void AppendText(const std::string_view& str);
|
||||||
|
|
@ -58,7 +58,7 @@ namespace Nz
|
||||||
inline void SetText(std::string str);
|
inline void SetText(std::string str);
|
||||||
|
|
||||||
inline SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer);
|
inline SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer);
|
||||||
inline SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer);
|
inline SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer) noexcept;
|
||||||
|
|
||||||
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White);
|
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White);
|
||||||
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style, const Color& color, float outlineThickness, const Color& outlineColor);
|
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style, const Color& color, float outlineThickness, const Color& outlineColor);
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ namespace Nz
|
||||||
SetFont(drawer.m_font);
|
SetFont(drawer.m_font);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline SimpleTextDrawer::SimpleTextDrawer(SimpleTextDrawer&& drawer)
|
inline SimpleTextDrawer::SimpleTextDrawer(SimpleTextDrawer&& drawer) noexcept
|
||||||
{
|
{
|
||||||
operator=(std::move(drawer));
|
operator=(std::move(drawer));
|
||||||
}
|
}
|
||||||
|
|
@ -228,7 +228,7 @@ namespace Nz
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline SimpleTextDrawer& SimpleTextDrawer::operator=(SimpleTextDrawer&& drawer)
|
inline SimpleTextDrawer& SimpleTextDrawer::operator=(SimpleTextDrawer&& drawer) noexcept
|
||||||
{
|
{
|
||||||
DisconnectFontSlots();
|
DisconnectFontSlots();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,8 +86,10 @@ struct VertOut
|
||||||
[entry(vert)]
|
[entry(vert)]
|
||||||
fn main(input: VertIn) -> VertOut
|
fn main(input: VertIn) -> VertOut
|
||||||
{
|
{
|
||||||
|
let worldPosition = instanceData.worldMatrix * vec4[f32](input.pos, 1.0);
|
||||||
|
|
||||||
let output: VertOut;
|
let output: VertOut;
|
||||||
output.position = viewerData.viewProjMatrix * instanceData.worldMatrix * vec4[f32](input.pos, 1.0);
|
output.position = viewerData.viewProjMatrix * worldPosition;
|
||||||
|
|
||||||
const if (HasUV)
|
const if (HasUV)
|
||||||
output.uv = input.uv;
|
output.uv = input.uv;
|
||||||
|
|
|
||||||
|
|
@ -1160,6 +1160,10 @@ namespace Nz
|
||||||
AppendVariableDeclaration(member.type.GetResultingValue(), member.name);
|
AppendVariableDeclaration(member.type.GetResultingValue(), member.name);
|
||||||
Append(";");
|
Append(";");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Empty structs are not allowed in GLSL
|
||||||
|
if (first)
|
||||||
|
AppendLine("int dummy;");
|
||||||
}
|
}
|
||||||
LeaveScope(false);
|
LeaveScope(false);
|
||||||
AppendLine(";");
|
AppendLine(";");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue