diff --git a/hart/inferno-hart-cpu/src/main.cpp b/hart/inferno-hart-cpu/src/main.cpp index c19b1c9..59d60a7 100644 --- a/hart/inferno-hart-cpu/src/main.cpp +++ b/hart/inferno-hart-cpu/src/main.cpp @@ -5,6 +5,7 @@ #include #include +#include using namespace inferno; @@ -28,9 +29,7 @@ public: int ic) override { mState = EModuleState::Build; - - std::cout << "INFERNO HART CPU RECIEVED " << vc / 3 << " VERTICIES AND " << ic / 3 << " INDICIES" << std::endl; - + spdlog::info("[hartcpu] Recieved {} verticies and {} indicies", vc / 3, ic / 3); mState = EModuleState::Ready; } @@ -47,6 +46,7 @@ public: mState = EModuleState::Ready; continue; } + std::this_thread::sleep_for(std::chrono::microseconds(10)); mState = EModuleState::Trace; mToTrace.pop(); diff --git a/libhart/inferno_hart.hpp b/libhart/inferno_hart.hpp index 8d3d7ee..5a92bbe 100644 --- a/libhart/inferno_hart.hpp +++ b/libhart/inferno_hart.hpp @@ -1,5 +1,7 @@ #pragma once +#include + #include #include #include @@ -12,6 +14,12 @@ * * * Inferno will first initialise the module and then wait for the Ready state. * * * + * The possible states a module can be in are: * + * - Bad (Not ready) * + * - Ready (Ready for a command or a scene) * + * - Build (Scene is submitted and being processed) * + * - Trace (Tracing!) * + * * * Once the HHM dispatches a new scene to the module, it will wait until * * the state is Done to dispatch work during scene building the modules * * state must be Build. * @@ -53,7 +61,7 @@ struct ModuleCredit enum class EModuleState : uint8_t { Bad, // Not ready! - Ready, // Ready for initial command or scene + Ready, // Ready for command or scene Build, // Scene is passed, optimisation is taking place Trace, // Tracing! }; @@ -82,6 +90,7 @@ public: std::lock_guard lock(_mData); for (const auto& e: queue) mToTrace.push(e); + spdlog::info("[hartmodule] New trace queue"); } inline void pushtoQueue(Ray* ray) diff --git a/src/thirdparty/spdlog/async.h b/libhart/thirdparty/spdlog/async.h similarity index 100% rename from src/thirdparty/spdlog/async.h rename to libhart/thirdparty/spdlog/async.h diff --git a/src/thirdparty/spdlog/async_logger-inl.h b/libhart/thirdparty/spdlog/async_logger-inl.h similarity index 100% rename from src/thirdparty/spdlog/async_logger-inl.h rename to libhart/thirdparty/spdlog/async_logger-inl.h diff --git a/src/thirdparty/spdlog/async_logger.h b/libhart/thirdparty/spdlog/async_logger.h similarity index 100% rename from src/thirdparty/spdlog/async_logger.h rename to libhart/thirdparty/spdlog/async_logger.h diff --git a/src/thirdparty/spdlog/cfg/argv.h b/libhart/thirdparty/spdlog/cfg/argv.h similarity index 100% rename from src/thirdparty/spdlog/cfg/argv.h rename to libhart/thirdparty/spdlog/cfg/argv.h diff --git a/src/thirdparty/spdlog/cfg/env.h b/libhart/thirdparty/spdlog/cfg/env.h similarity index 100% rename from src/thirdparty/spdlog/cfg/env.h rename to libhart/thirdparty/spdlog/cfg/env.h diff --git a/src/thirdparty/spdlog/cfg/helpers-inl.h b/libhart/thirdparty/spdlog/cfg/helpers-inl.h similarity index 100% rename from src/thirdparty/spdlog/cfg/helpers-inl.h rename to libhart/thirdparty/spdlog/cfg/helpers-inl.h diff --git a/src/thirdparty/spdlog/cfg/helpers.h b/libhart/thirdparty/spdlog/cfg/helpers.h similarity index 100% rename from src/thirdparty/spdlog/cfg/helpers.h rename to libhart/thirdparty/spdlog/cfg/helpers.h diff --git a/src/thirdparty/spdlog/cfg/log_levels.h b/libhart/thirdparty/spdlog/cfg/log_levels.h similarity index 100% rename from src/thirdparty/spdlog/cfg/log_levels.h rename to libhart/thirdparty/spdlog/cfg/log_levels.h diff --git a/src/thirdparty/spdlog/common-inl.h b/libhart/thirdparty/spdlog/common-inl.h similarity index 100% rename from src/thirdparty/spdlog/common-inl.h rename to libhart/thirdparty/spdlog/common-inl.h diff --git a/src/thirdparty/spdlog/common.h b/libhart/thirdparty/spdlog/common.h similarity index 100% rename from src/thirdparty/spdlog/common.h rename to libhart/thirdparty/spdlog/common.h diff --git a/src/thirdparty/spdlog/details/backtracer-inl.h b/libhart/thirdparty/spdlog/details/backtracer-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/backtracer-inl.h rename to libhart/thirdparty/spdlog/details/backtracer-inl.h diff --git a/src/thirdparty/spdlog/details/backtracer.h b/libhart/thirdparty/spdlog/details/backtracer.h similarity index 100% rename from src/thirdparty/spdlog/details/backtracer.h rename to libhart/thirdparty/spdlog/details/backtracer.h diff --git a/src/thirdparty/spdlog/details/circular_q.h b/libhart/thirdparty/spdlog/details/circular_q.h similarity index 100% rename from src/thirdparty/spdlog/details/circular_q.h rename to libhart/thirdparty/spdlog/details/circular_q.h diff --git a/src/thirdparty/spdlog/details/console_globals.h b/libhart/thirdparty/spdlog/details/console_globals.h similarity index 100% rename from src/thirdparty/spdlog/details/console_globals.h rename to libhart/thirdparty/spdlog/details/console_globals.h diff --git a/src/thirdparty/spdlog/details/file_helper-inl.h b/libhart/thirdparty/spdlog/details/file_helper-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/file_helper-inl.h rename to libhart/thirdparty/spdlog/details/file_helper-inl.h diff --git a/src/thirdparty/spdlog/details/file_helper.h b/libhart/thirdparty/spdlog/details/file_helper.h similarity index 100% rename from src/thirdparty/spdlog/details/file_helper.h rename to libhart/thirdparty/spdlog/details/file_helper.h diff --git a/src/thirdparty/spdlog/details/fmt_helper.h b/libhart/thirdparty/spdlog/details/fmt_helper.h similarity index 100% rename from src/thirdparty/spdlog/details/fmt_helper.h rename to libhart/thirdparty/spdlog/details/fmt_helper.h diff --git a/src/thirdparty/spdlog/details/log_msg-inl.h b/libhart/thirdparty/spdlog/details/log_msg-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/log_msg-inl.h rename to libhart/thirdparty/spdlog/details/log_msg-inl.h diff --git a/src/thirdparty/spdlog/details/log_msg.h b/libhart/thirdparty/spdlog/details/log_msg.h similarity index 100% rename from src/thirdparty/spdlog/details/log_msg.h rename to libhart/thirdparty/spdlog/details/log_msg.h diff --git a/src/thirdparty/spdlog/details/log_msg_buffer-inl.h b/libhart/thirdparty/spdlog/details/log_msg_buffer-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/log_msg_buffer-inl.h rename to libhart/thirdparty/spdlog/details/log_msg_buffer-inl.h diff --git a/src/thirdparty/spdlog/details/log_msg_buffer.h b/libhart/thirdparty/spdlog/details/log_msg_buffer.h similarity index 100% rename from src/thirdparty/spdlog/details/log_msg_buffer.h rename to libhart/thirdparty/spdlog/details/log_msg_buffer.h diff --git a/src/thirdparty/spdlog/details/mpmc_blocking_q.h b/libhart/thirdparty/spdlog/details/mpmc_blocking_q.h similarity index 100% rename from src/thirdparty/spdlog/details/mpmc_blocking_q.h rename to libhart/thirdparty/spdlog/details/mpmc_blocking_q.h diff --git a/src/thirdparty/spdlog/details/null_mutex.h b/libhart/thirdparty/spdlog/details/null_mutex.h similarity index 100% rename from src/thirdparty/spdlog/details/null_mutex.h rename to libhart/thirdparty/spdlog/details/null_mutex.h diff --git a/src/thirdparty/spdlog/details/os-inl.h b/libhart/thirdparty/spdlog/details/os-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/os-inl.h rename to libhart/thirdparty/spdlog/details/os-inl.h diff --git a/src/thirdparty/spdlog/details/os.h b/libhart/thirdparty/spdlog/details/os.h similarity index 100% rename from src/thirdparty/spdlog/details/os.h rename to libhart/thirdparty/spdlog/details/os.h diff --git a/src/thirdparty/spdlog/details/periodic_worker-inl.h b/libhart/thirdparty/spdlog/details/periodic_worker-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/periodic_worker-inl.h rename to libhart/thirdparty/spdlog/details/periodic_worker-inl.h diff --git a/src/thirdparty/spdlog/details/periodic_worker.h b/libhart/thirdparty/spdlog/details/periodic_worker.h similarity index 100% rename from src/thirdparty/spdlog/details/periodic_worker.h rename to libhart/thirdparty/spdlog/details/periodic_worker.h diff --git a/src/thirdparty/spdlog/details/registry-inl.h b/libhart/thirdparty/spdlog/details/registry-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/registry-inl.h rename to libhart/thirdparty/spdlog/details/registry-inl.h diff --git a/src/thirdparty/spdlog/details/registry.h b/libhart/thirdparty/spdlog/details/registry.h similarity index 100% rename from src/thirdparty/spdlog/details/registry.h rename to libhart/thirdparty/spdlog/details/registry.h diff --git a/src/thirdparty/spdlog/details/synchronous_factory.h b/libhart/thirdparty/spdlog/details/synchronous_factory.h similarity index 100% rename from src/thirdparty/spdlog/details/synchronous_factory.h rename to libhart/thirdparty/spdlog/details/synchronous_factory.h diff --git a/src/thirdparty/spdlog/details/tcp_client-windows.h b/libhart/thirdparty/spdlog/details/tcp_client-windows.h similarity index 100% rename from src/thirdparty/spdlog/details/tcp_client-windows.h rename to libhart/thirdparty/spdlog/details/tcp_client-windows.h diff --git a/src/thirdparty/spdlog/details/tcp_client.h b/libhart/thirdparty/spdlog/details/tcp_client.h similarity index 100% rename from src/thirdparty/spdlog/details/tcp_client.h rename to libhart/thirdparty/spdlog/details/tcp_client.h diff --git a/src/thirdparty/spdlog/details/thread_pool-inl.h b/libhart/thirdparty/spdlog/details/thread_pool-inl.h similarity index 100% rename from src/thirdparty/spdlog/details/thread_pool-inl.h rename to libhart/thirdparty/spdlog/details/thread_pool-inl.h diff --git a/src/thirdparty/spdlog/details/thread_pool.h b/libhart/thirdparty/spdlog/details/thread_pool.h similarity index 100% rename from src/thirdparty/spdlog/details/thread_pool.h rename to libhart/thirdparty/spdlog/details/thread_pool.h diff --git a/src/thirdparty/spdlog/details/windows_include.h b/libhart/thirdparty/spdlog/details/windows_include.h similarity index 100% rename from src/thirdparty/spdlog/details/windows_include.h rename to libhart/thirdparty/spdlog/details/windows_include.h diff --git a/src/thirdparty/spdlog/fmt/bin_to_hex.h b/libhart/thirdparty/spdlog/fmt/bin_to_hex.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bin_to_hex.h rename to libhart/thirdparty/spdlog/fmt/bin_to_hex.h diff --git a/src/thirdparty/spdlog/fmt/bundled/LICENSE.rst b/libhart/thirdparty/spdlog/fmt/bundled/LICENSE.rst similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/LICENSE.rst rename to libhart/thirdparty/spdlog/fmt/bundled/LICENSE.rst diff --git a/src/thirdparty/spdlog/fmt/bundled/chrono.h b/libhart/thirdparty/spdlog/fmt/bundled/chrono.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/chrono.h rename to libhart/thirdparty/spdlog/fmt/bundled/chrono.h diff --git a/src/thirdparty/spdlog/fmt/bundled/color.h b/libhart/thirdparty/spdlog/fmt/bundled/color.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/color.h rename to libhart/thirdparty/spdlog/fmt/bundled/color.h diff --git a/src/thirdparty/spdlog/fmt/bundled/compile.h b/libhart/thirdparty/spdlog/fmt/bundled/compile.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/compile.h rename to libhart/thirdparty/spdlog/fmt/bundled/compile.h diff --git a/src/thirdparty/spdlog/fmt/bundled/core.h b/libhart/thirdparty/spdlog/fmt/bundled/core.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/core.h rename to libhart/thirdparty/spdlog/fmt/bundled/core.h diff --git a/src/thirdparty/spdlog/fmt/bundled/format-inl.h b/libhart/thirdparty/spdlog/fmt/bundled/format-inl.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/format-inl.h rename to libhart/thirdparty/spdlog/fmt/bundled/format-inl.h diff --git a/src/thirdparty/spdlog/fmt/bundled/format.h b/libhart/thirdparty/spdlog/fmt/bundled/format.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/format.h rename to libhart/thirdparty/spdlog/fmt/bundled/format.h diff --git a/src/thirdparty/spdlog/fmt/bundled/locale.h b/libhart/thirdparty/spdlog/fmt/bundled/locale.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/locale.h rename to libhart/thirdparty/spdlog/fmt/bundled/locale.h diff --git a/src/thirdparty/spdlog/fmt/bundled/ostream.h b/libhart/thirdparty/spdlog/fmt/bundled/ostream.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/ostream.h rename to libhart/thirdparty/spdlog/fmt/bundled/ostream.h diff --git a/src/thirdparty/spdlog/fmt/bundled/posix.h b/libhart/thirdparty/spdlog/fmt/bundled/posix.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/posix.h rename to libhart/thirdparty/spdlog/fmt/bundled/posix.h diff --git a/src/thirdparty/spdlog/fmt/bundled/printf.h b/libhart/thirdparty/spdlog/fmt/bundled/printf.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/printf.h rename to libhart/thirdparty/spdlog/fmt/bundled/printf.h diff --git a/src/thirdparty/spdlog/fmt/bundled/ranges.h b/libhart/thirdparty/spdlog/fmt/bundled/ranges.h similarity index 100% rename from src/thirdparty/spdlog/fmt/bundled/ranges.h rename to libhart/thirdparty/spdlog/fmt/bundled/ranges.h diff --git a/src/thirdparty/spdlog/fmt/fmt.h b/libhart/thirdparty/spdlog/fmt/fmt.h similarity index 100% rename from src/thirdparty/spdlog/fmt/fmt.h rename to libhart/thirdparty/spdlog/fmt/fmt.h diff --git a/src/thirdparty/spdlog/fmt/ostr.h b/libhart/thirdparty/spdlog/fmt/ostr.h similarity index 100% rename from src/thirdparty/spdlog/fmt/ostr.h rename to libhart/thirdparty/spdlog/fmt/ostr.h diff --git a/src/thirdparty/spdlog/formatter.h b/libhart/thirdparty/spdlog/formatter.h similarity index 100% rename from src/thirdparty/spdlog/formatter.h rename to libhart/thirdparty/spdlog/formatter.h diff --git a/src/thirdparty/spdlog/fwd.h b/libhart/thirdparty/spdlog/fwd.h similarity index 100% rename from src/thirdparty/spdlog/fwd.h rename to libhart/thirdparty/spdlog/fwd.h diff --git a/src/thirdparty/spdlog/logger-inl.h b/libhart/thirdparty/spdlog/logger-inl.h similarity index 100% rename from src/thirdparty/spdlog/logger-inl.h rename to libhart/thirdparty/spdlog/logger-inl.h diff --git a/src/thirdparty/spdlog/logger.h b/libhart/thirdparty/spdlog/logger.h similarity index 100% rename from src/thirdparty/spdlog/logger.h rename to libhart/thirdparty/spdlog/logger.h diff --git a/src/thirdparty/spdlog/pattern_formatter-inl.h b/libhart/thirdparty/spdlog/pattern_formatter-inl.h similarity index 100% rename from src/thirdparty/spdlog/pattern_formatter-inl.h rename to libhart/thirdparty/spdlog/pattern_formatter-inl.h diff --git a/src/thirdparty/spdlog/pattern_formatter.h b/libhart/thirdparty/spdlog/pattern_formatter.h similarity index 100% rename from src/thirdparty/spdlog/pattern_formatter.h rename to libhart/thirdparty/spdlog/pattern_formatter.h diff --git a/src/thirdparty/spdlog/sinks/android_sink.h b/libhart/thirdparty/spdlog/sinks/android_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/android_sink.h rename to libhart/thirdparty/spdlog/sinks/android_sink.h diff --git a/src/thirdparty/spdlog/sinks/ansicolor_sink-inl.h b/libhart/thirdparty/spdlog/sinks/ansicolor_sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/ansicolor_sink-inl.h rename to libhart/thirdparty/spdlog/sinks/ansicolor_sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/ansicolor_sink.h b/libhart/thirdparty/spdlog/sinks/ansicolor_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/ansicolor_sink.h rename to libhart/thirdparty/spdlog/sinks/ansicolor_sink.h diff --git a/src/thirdparty/spdlog/sinks/base_sink-inl.h b/libhart/thirdparty/spdlog/sinks/base_sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/base_sink-inl.h rename to libhart/thirdparty/spdlog/sinks/base_sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/base_sink.h b/libhart/thirdparty/spdlog/sinks/base_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/base_sink.h rename to libhart/thirdparty/spdlog/sinks/base_sink.h diff --git a/src/thirdparty/spdlog/sinks/basic_file_sink-inl.h b/libhart/thirdparty/spdlog/sinks/basic_file_sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/basic_file_sink-inl.h rename to libhart/thirdparty/spdlog/sinks/basic_file_sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/basic_file_sink.h b/libhart/thirdparty/spdlog/sinks/basic_file_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/basic_file_sink.h rename to libhart/thirdparty/spdlog/sinks/basic_file_sink.h diff --git a/src/thirdparty/spdlog/sinks/daily_file_sink.h b/libhart/thirdparty/spdlog/sinks/daily_file_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/daily_file_sink.h rename to libhart/thirdparty/spdlog/sinks/daily_file_sink.h diff --git a/src/thirdparty/spdlog/sinks/dist_sink.h b/libhart/thirdparty/spdlog/sinks/dist_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/dist_sink.h rename to libhart/thirdparty/spdlog/sinks/dist_sink.h diff --git a/src/thirdparty/spdlog/sinks/dup_filter_sink.h b/libhart/thirdparty/spdlog/sinks/dup_filter_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/dup_filter_sink.h rename to libhart/thirdparty/spdlog/sinks/dup_filter_sink.h diff --git a/src/thirdparty/spdlog/sinks/msvc_sink.h b/libhart/thirdparty/spdlog/sinks/msvc_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/msvc_sink.h rename to libhart/thirdparty/spdlog/sinks/msvc_sink.h diff --git a/src/thirdparty/spdlog/sinks/null_sink.h b/libhart/thirdparty/spdlog/sinks/null_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/null_sink.h rename to libhart/thirdparty/spdlog/sinks/null_sink.h diff --git a/src/thirdparty/spdlog/sinks/ostream_sink.h b/libhart/thirdparty/spdlog/sinks/ostream_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/ostream_sink.h rename to libhart/thirdparty/spdlog/sinks/ostream_sink.h diff --git a/src/thirdparty/spdlog/sinks/ringbuffer_sink.h b/libhart/thirdparty/spdlog/sinks/ringbuffer_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/ringbuffer_sink.h rename to libhart/thirdparty/spdlog/sinks/ringbuffer_sink.h diff --git a/src/thirdparty/spdlog/sinks/rotating_file_sink-inl.h b/libhart/thirdparty/spdlog/sinks/rotating_file_sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/rotating_file_sink-inl.h rename to libhart/thirdparty/spdlog/sinks/rotating_file_sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/rotating_file_sink.h b/libhart/thirdparty/spdlog/sinks/rotating_file_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/rotating_file_sink.h rename to libhart/thirdparty/spdlog/sinks/rotating_file_sink.h diff --git a/src/thirdparty/spdlog/sinks/sink-inl.h b/libhart/thirdparty/spdlog/sinks/sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/sink-inl.h rename to libhart/thirdparty/spdlog/sinks/sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/sink.h b/libhart/thirdparty/spdlog/sinks/sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/sink.h rename to libhart/thirdparty/spdlog/sinks/sink.h diff --git a/src/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h b/libhart/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h rename to libhart/thirdparty/spdlog/sinks/stdout_color_sinks-inl.h diff --git a/src/thirdparty/spdlog/sinks/stdout_color_sinks.h b/libhart/thirdparty/spdlog/sinks/stdout_color_sinks.h similarity index 100% rename from src/thirdparty/spdlog/sinks/stdout_color_sinks.h rename to libhart/thirdparty/spdlog/sinks/stdout_color_sinks.h diff --git a/src/thirdparty/spdlog/sinks/stdout_sinks-inl.h b/libhart/thirdparty/spdlog/sinks/stdout_sinks-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/stdout_sinks-inl.h rename to libhart/thirdparty/spdlog/sinks/stdout_sinks-inl.h diff --git a/src/thirdparty/spdlog/sinks/stdout_sinks.h b/libhart/thirdparty/spdlog/sinks/stdout_sinks.h similarity index 100% rename from src/thirdparty/spdlog/sinks/stdout_sinks.h rename to libhart/thirdparty/spdlog/sinks/stdout_sinks.h diff --git a/src/thirdparty/spdlog/sinks/syslog_sink.h b/libhart/thirdparty/spdlog/sinks/syslog_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/syslog_sink.h rename to libhart/thirdparty/spdlog/sinks/syslog_sink.h diff --git a/src/thirdparty/spdlog/sinks/systemd_sink.h b/libhart/thirdparty/spdlog/sinks/systemd_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/systemd_sink.h rename to libhart/thirdparty/spdlog/sinks/systemd_sink.h diff --git a/src/thirdparty/spdlog/sinks/tcp_sink.h b/libhart/thirdparty/spdlog/sinks/tcp_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/tcp_sink.h rename to libhart/thirdparty/spdlog/sinks/tcp_sink.h diff --git a/src/thirdparty/spdlog/sinks/win_eventlog_sink.h b/libhart/thirdparty/spdlog/sinks/win_eventlog_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/win_eventlog_sink.h rename to libhart/thirdparty/spdlog/sinks/win_eventlog_sink.h diff --git a/src/thirdparty/spdlog/sinks/wincolor_sink-inl.h b/libhart/thirdparty/spdlog/sinks/wincolor_sink-inl.h similarity index 100% rename from src/thirdparty/spdlog/sinks/wincolor_sink-inl.h rename to libhart/thirdparty/spdlog/sinks/wincolor_sink-inl.h diff --git a/src/thirdparty/spdlog/sinks/wincolor_sink.h b/libhart/thirdparty/spdlog/sinks/wincolor_sink.h similarity index 100% rename from src/thirdparty/spdlog/sinks/wincolor_sink.h rename to libhart/thirdparty/spdlog/sinks/wincolor_sink.h diff --git a/src/thirdparty/spdlog/spdlog-inl.h b/libhart/thirdparty/spdlog/spdlog-inl.h similarity index 100% rename from src/thirdparty/spdlog/spdlog-inl.h rename to libhart/thirdparty/spdlog/spdlog-inl.h diff --git a/src/thirdparty/spdlog/spdlog.h b/libhart/thirdparty/spdlog/spdlog.h similarity index 100% rename from src/thirdparty/spdlog/spdlog.h rename to libhart/thirdparty/spdlog/spdlog.h diff --git a/src/thirdparty/spdlog/tweakme.h b/libhart/thirdparty/spdlog/tweakme.h similarity index 100% rename from src/thirdparty/spdlog/tweakme.h rename to libhart/thirdparty/spdlog/tweakme.h diff --git a/src/thirdparty/spdlog/version.h b/libhart/thirdparty/spdlog/version.h similarity index 100% rename from src/thirdparty/spdlog/version.h rename to libhart/thirdparty/spdlog/version.h diff --git a/src/hart_directory.cpp b/src/hart_directory.cpp index 137100b..f6b828e 100644 --- a/src/hart_directory.cpp +++ b/src/hart_directory.cpp @@ -53,7 +53,7 @@ std::vector HARTModuleDirectory::discoverMo HARTModuleDirectory::discoveryEntry HARTModuleDirectory::registerModule(std::filesystem::path file) { - spdlog::debug("Registering module at {}", file.c_str()); + spdlog::info("Registering module at {}", file.c_str()); discoveryEntry entry; entry.Location = file; @@ -103,7 +103,7 @@ HARTModuleDirectory::discoveryEntry HARTModuleDirectory::registerModule(std::fil entry.Credit = (ModuleCredit*)credit(); - spdlog::info("Module {0} v{2}.{3}.{4} by {5}", entry.Credit->ModuleName, + spdlog::info("Module {0} v{1}.{2}.{3} by {4}", entry.Credit->ModuleName, entry.Credit->VersionMajor, entry.Credit->VersionMinor, entry.Credit->VersionBuild, diff --git a/src/hart_module.cpp b/src/hart_module.cpp index 9502341..8313d9b 100644 --- a/src/hart_module.cpp +++ b/src/hart_module.cpp @@ -41,7 +41,7 @@ void HHM::newScene(Scene* scene) // as it is now, submitTris assumes it's getting the whole scene // which would involve a lot of mesh copying (avoid!) if i were to chain them for (auto* mesh : meshs) { - spdlog::debug("MESH BEING SUBMITTED TO MODULE"); + spdlog::debug("Mesh for module ready..."); void* verticies; void* normals; void* indicies; int vertexCount = mesh->getVerticies(verticies, normals); int indexCount = mesh->getIndicies(indicies); diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp index 0257a27..9b7c9b3 100644 --- a/src/renderer/renderer.cpp +++ b/src/renderer/renderer.cpp @@ -93,12 +93,14 @@ void RayRenderer::draw() bool frameStatus = false; while (!frameStatus) { + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); switch(mIface->getModuleState()) { case EModuleState::Bad: spdlog::error("MODULE STATE BAD"); case EModuleState::Build: case EModuleState::Trace: + spdlog::debug("MODULE BUSY.."); break; case EModuleState::Ready: frameStatus = true; @@ -106,7 +108,7 @@ void RayRenderer::draw() } } - spdlog::debug("Sample complete"); + spdlog::info("Sample complete"); for (auto* ray : startRays) { diff --git a/src/scene/mesh.cpp b/src/scene/mesh.cpp index d9a9e4d..e4a9dfd 100644 --- a/src/scene/mesh.cpp +++ b/src/scene/mesh.cpp @@ -71,7 +71,7 @@ void Mesh::ready() glBindVertexArray(0); - spdlog::debug("PREVIEW MESH READY"); + spdlog::debug("Mesh for preview ready..."); } int Mesh::getVerticies(void* v, void* n)