bailwillharr/engine
1
0
Fork 0
mirror of https://github.com/bailwillharr/engine.git synced 2024-09-21 04:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

idk

Browse Source
This commit is contained in:
bailehuni 2024-05-16 01:31:19 +01:00
parent 3692dcf64f
commit 160de92a8c
8 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/application.cpp
View File

@ -29,6 +29,7 @@
#include "scene.h"
#include "scene_manager.h"
#include "window.h"
#include "util/gltf_loader.h"
#ifdef _MSC_VER
#include <windows.h>
@ -326,19 +327,15 @@ void Application::GameLoop()
ImGui::Checkbox("Show entity hitboxes", &debug_menu_state.show_entity_boxes);
ImGui::Checkbox("Show bounding volumes", &debug_menu_state.show_bounding_volumes);
ImGui::Separator();
#ifndef _WIN32
ImGui::BeginDisabled();
#endif
if (!scene) ImGui::BeginDisabled();
// load gltf file dialog
if (ImGui::Button("Load glTF")) {
#ifdef _WIN32
std::string path = std::filesystem::path(openGLTFDialog()).string();
LOG_ERROR("Not yet implemented!");
util::LoadGLTF(*scene, std::filesystem::path(path).string(), false);
#endif
}
#ifndef _WIN32
ImGui::EndDisabled();
#endif
if (!scene) ImGui::EndDisabled();
}
ImGui::End();
}

11
src/gfx_device_vulkan.cpp
View File

@ -583,7 +583,8 @@ void GFXDevice::ChangePresentMode(gfx::PresentMode mode)
pimpl->swapchainIsOutOfDate = true;
}
gfx::PresentMode GFXDevice::GetPresentMode() {
gfx::PresentMode GFXDevice::GetPresentMode()
{
switch (pimpl->swapchain.presentMode) {
case VK_PRESENT_MODE_FIFO_KHR:
return gfx::PresentMode::kDoubleBufferedVsync;
@ -736,7 +737,7 @@ gfx::DrawBuffer* GFXDevice::BeginRender(bool window_resized)
createSwapchain(&pimpl->swapchain, pimpl->swapchainInfo);
}
// THIS FUNCTION BLOCKS UNTIL AN IMAGE IS AVAILABLE (it waits for vsync)
res = vkAcquireNextImageKHR(pimpl->device.device, pimpl->swapchain.swapchain, 1000000000LL, frameData.presentSemaphore, VK_NULL_HANDLE,
res = vkAcquireNextImageKHR(pimpl->device.device, pimpl->swapchain.swapchain, 1'000'000'000LL, frameData.presentSemaphore, VK_NULL_HANDLE,
&swapchainImageIndex);
if (res != VK_SUBOPTIMAL_KHR && res != VK_ERROR_OUT_OF_DATE_KHR) VKCHECK(res);
if (res == VK_ERROR_OUT_OF_DATE_KHR) pimpl->swapchainIsOutOfDate = true;
@ -1594,7 +1595,7 @@ void GFXDevice::UpdateDescriptorCombinedImageSampler(const gfx::DescriptorSet* s
assert(image != nullptr);
assert(sampler != nullptr);
if (pimpl->FRAMECOUNT != 0) abort(); // TODO. This is annoying
// if (pimpl->FRAMECOUNT != 0) abort(); // TODO. This is annoying
VkDescriptorImageInfo imageInfo{};
imageInfo.sampler = sampler->sampler;
@ -1620,6 +1621,8 @@ gfx::UniformBuffer* GFXDevice::CreateUniformBuffer(uint64_t size, const void* in
{
assert(initialData != nullptr);
if (pimpl->FRAMECOUNT != 0) abort();
gfx::UniformBuffer* out = new gfx::UniformBuffer{};
/* first make staging buffer */
@ -1778,7 +1781,7 @@ gfx::Image* GFXDevice::CreateImage(uint32_t w, uint32_t h, gfx::ImageFormat inpu
{
assert(imageData != nullptr);
if (pimpl->FRAMECOUNT != 0) abort(); // TODO. This is annoying
// if (pimpl->FRAMECOUNT != 0) abort(); // TODO. This is annoying
gfx::Image* out = new gfx::Image{};

42
src/resources/font.cpp
View File

@ -10,7 +10,8 @@
namespace engine {
Font::Font(const std::string& path) {
Font::Font(const std::string& path)
{
font_buffer_ = util::ReadBinaryFile(path);
font_info_ = std::make_unique<stbtt_fontinfo>();
@ -23,8 +24,8 @@ Font::Font(const std::string& path) {
Font::~Font() { LOG_DEBUG("Destroyed font"); }
std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(
const std::string& text, float height_px, int& width_out, int& height_out) {
std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(const std::string& text, float height_px, int& width_out, int& height_out)
{
const float sf = stbtt_ScaleForPixelHeight(font_info_.get(), height_px);
int ascent, descent, line_gap;
@ -44,8 +45,7 @@ std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(
const int glyph_index = GetGlyphIndex(static_cast<int>(text.at(i)));
int advanceWidth, leftSideBearing;
stbtt_GetGlyphHMetrics(font_info_.get(), glyph_index, &advanceWidth,
&leftSideBearing);
stbtt_GetGlyphHMetrics(font_info_.get(), glyph_index, &advanceWidth, &leftSideBearing);
if (i == 0 && leftSideBearing < 0) {
// if the character extends before the current point
@ -59,24 +59,22 @@ std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(
if (stbtt_IsGlyphEmpty(font_info_.get(), glyph_index) == 0) {
renderInfo.isEmpty = false;
} else {
}
else {
renderInfo.isEmpty = true;
}
if (!renderInfo.isEmpty) {
renderInfo.bitmap = stbtt_GetGlyphBitmap(
font_info_.get(), sf, sf, glyph_index, &renderInfo.width,
&renderInfo.height, &renderInfo.xoff, &renderInfo.yoff);
renderInfo.bitmap =
stbtt_GetGlyphBitmap(font_info_.get(), sf, sf, glyph_index, &renderInfo.width, &renderInfo.height, &renderInfo.xoff, &renderInfo.yoff);
}
characterRenderInfos.push_back(renderInfo);
}
const size_t bitmap_width = std::ceil(static_cast<float>(width) * sf);
const size_t bitmap_height =
std::ceil(static_cast<float>(ascent - descent) * sf);
auto bitmap =
std::make_unique<std::vector<uint8_t>>(bitmap_width * bitmap_height * 4);
const size_t bitmap_width = static_cast<size_t>(std::ceil(static_cast<float>(width) * sf));
const size_t bitmap_height = static_cast<size_t>(std::ceil(static_cast<float>(ascent - descent) * sf));
auto bitmap = std::make_unique<std::vector<uint8_t>>(bitmap_width * bitmap_height * 4);
for (size_t i = 0; i < bitmap->size() / 4; i++) {
bitmap->at(i * 4 + 0) = 0x00;
@ -96,8 +94,7 @@ std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(
// copy the 8bpp char bitmap to the 4bpp output
for (int y = 0; y < char_bitmap_height; y++) {
for (int x = 0; x < char_bitmap_width; x++) {
const int out_index =
((bitmap_width * (top_left_y + y)) + (top_left_x + x)) * 4;
const size_t out_index = ((bitmap_width * (static_cast<size_t>(top_left_y) + y)) + (static_cast<size_t>(top_left_x) + x)) * 4;
const uint8_t pixel = renderInfo.bitmap[y * char_bitmap_width + x];
(*bitmap)[out_index + 0] = pixel;
(*bitmap)[out_index + 1] = pixel;
@ -112,17 +109,18 @@ std::unique_ptr<std::vector<uint8_t>> Font::GetTextBitmap(
top_left_x += renderInfo.advance - renderInfo.xoff;
}
width_out = bitmap_width;
height_out = bitmap_height;
width_out = static_cast<int>(bitmap_width);
height_out = static_cast<int>(bitmap_height);
return bitmap;
}
int Font::GetGlyphIndex(int unicode_codepoint) {
int Font::GetGlyphIndex(int unicode_codepoint)
{
if (unicode_to_glyph_.contains(unicode_codepoint)) {
return unicode_to_glyph_.at(unicode_codepoint);
} else {
const int glyph_index =
stbtt_FindGlyphIndex(font_info_.get(), unicode_codepoint);
}
else {
const int glyph_index = stbtt_FindGlyphIndex(font_info_.get(), unicode_codepoint);
if (glyph_index == 0) {
throw std::runtime_error("Glyph not found in font!");
}

2
src/util/gltf_loader.cpp
View File

@ -15,7 +15,7 @@ struct Color {
uint8_t r, g, b, a;
Color(const std::vector<double>& doubles)
{
if (doubles.size() != 4) throw std::runtime_error("Invalid color doubles array");
assert(doubles.size() == 4 && "Invalid color doubles array");
r = static_cast<uint8_t>(lround(doubles[0] * 255.0));
g = static_cast<uint8_t>(lround(doubles[1] * 255.0));
b = static_cast<uint8_t>(lround(doubles[2] * 255.0));

2
src/vulkan/device.cpp
View File

@ -244,6 +244,8 @@ Device createDevice(VkInstance instance, const DeviceRequirements& requirements,
}
}
// TODO: Remove optional extensions. They'll never be handled anyway. Just stick to well-supported extensions.
bool formatsSupported = true;
for (const FormatRequirements& formatRequirements : requirements.formats) {
VkFormatFeatureFlags requiredLinearFlags = formatRequirements.properties.linearTilingFeatures;

BIN
test/res/models/box.glb
View File

Binary file not shown.

BIN
test/res/models/floor2.glb Normal file
View File

Binary file not shown.

6
test/src/game.cpp
View File

@ -97,7 +97,7 @@ void PlayGame(GameSettings settings)
main_scene->AddComponent<CameraControllerComponent>(camera);
/* floor */
engine::Entity floor = engine::util::LoadGLTF(*main_scene, app.GetResourcePath("models/floor.glb"), true);
engine::Entity floor = engine::util::LoadGLTF(*main_scene, app.GetResourcePath("models/floor2.glb"), true);
//main_scene->GetComponent<engine::MeshRenderableComponent>(main_scene->GetEntity("Cube", floor))->visible = false;
engine::Entity monke = engine::util::LoadGLTF(*main_scene, app.GetResourcePath("models/monke.glb"), true);
@ -159,13 +159,13 @@ void PlayGame(GameSettings settings)
engine::Entity box = engine::util::LoadGLTF(*main_scene, app.GetResourcePath("models/box.glb"), true);
main_scene->GetPosition(box) = glm::vec3{ -5.0f, -17.0f, 0.1f };
main_scene->GetScale(box) *= 10.0f;
main_scene->GetRotation(box) = glm::angleAxis(glm::pi<float>(), glm::vec3{ 0.0f, 0.0f, 1.0f });
main_scene->GetRotation(box) = glm::angleAxis(glm::pi<float>() * 0.0f, glm::vec3{ 0.0f, 0.0f, 1.0f });
main_scene->GetRotation(box) *= glm::angleAxis(glm::half_pi<float>(), glm::vec3{ 1.0f, 0.0f, 0.0f });
}
start_scene->GetSystem<CameraControllerSystem>()->next_scene_ = main_scene;
main_scene->GetSystem<CameraControllerSystem>()->next_scene_ = start_scene;
app.scene_manager()->SetActiveScene(main_scene);
app.scene_manager()->SetActiveScene(start_scene);
app.GameLoop();
}