finally we have a window

NikoZHAI · May 18, 2020 · 116dcea · 116dcea
1 parent 4b94335
commit 116dcea
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 5 deletions.
diff --git a/SimViewer/src/main.cpp b/SimViewer/src/main.cpp
@@ -1,6 +1,17 @@
 #include "App/App.hpp"
 
 
+#include <Poco/Logger.h>
+#include <Poco/AutoPtr.h>
+#include <Poco/FileChannel.h>
+#include <tera/Core/Logger.hpp>
+#include <tera/Core/TeraSystem.hpp>
+
+
+// alias tera::Logger
+using tera::Logger;
+using tera::TeraSystem;
+
 
 /**
  * @brief SimViewer Driver
@@ -13,7 +24,25 @@ int main(int argc, char const *argv[])
 {
  sv::App app;
  {
+ using Poco::AutoPtr;
+ using Poco::FileChannel;
+ using Poco::Logger;
+ AutoPtr<FileChannel> pChannel(new FileChannel);
+ pChannel->setProperty("path", "sv.log");
+ pChannel->setProperty("rotation", "2 K");
+ pChannel->setProperty("archive", "timestamp");
+ Logger::root().setChannel(pChannel);
 
+ Logger& logger = Logger::get("svInfo");
+ tera::Logger::add("svInfo", logger);
  }
+
+ // init tera system
+ TeraSystem::init(argv[0], "SimViewer");
+
+ Logger::info("------ TeraSystem init ------");
+
+ Logger::info("------ svMain() init ------");
+
  return app.run(argc, argv);
 }
diff --git a/Tera/CMakeLists.txt b/Tera/CMakeLists.txt
@@ -21,13 +21,19 @@ find_library(glfw3
  NAMES glfw3 HINTS ${GLFW_PATH}/lib
 )
 find_library(PocoFoundation
- NAMES PocoFoundation HINTS ${POCO_PATH}/*lib*
+ NAMES PocoFoundation HINTS ${POCO_PATH}/lib
 )
 find_library(PocoUtil
- NAMES PocoUtil HINTS ${POCO_PATH}/*lib*
+ NAMES PocoUtil HINTS ${POCO_PATH}/lib
 )
 
 
+message(STATUS "POCO_PATH: ${POCO_PATH}")
+message(STATUS "PocoFoundation: ${PocoFoundation}")
+message(STATUS "PocoUtil: ${PocoUtil}")
+message(STATUS "glfw3: ${glfw3}")
+
+
 if(NOT MSVC)
  # set(CMAKE_C_FLAGS )
  set(CMAKE_C_FLAGS_DEBUG "-Og -D_DEBUG -g")

diff --git a/Tera/src/Core/TeraSystem.cpp b/Tera/src/Core/TeraSystem.cpp
@@ -16,7 +16,7 @@ std::string TeraSystem::m_exePath = "";
 
 // callback for glfw errors
 static void onErrorGlfwCb(int code, const char* mess)
-{ Logger::error( Poco::format("glfw(code = %d): %s", code, mess) ); }
+{ Logger::error( Poco::format("glfw(code = %d): %s", code, std::string(mess)) ); }
 
 
 void TeraSystem::pollEvents()
@@ -49,13 +49,13 @@ void TeraSystem::init(const char* exeFileNameWPath, const char* projectName)
  m_exePath = Poco::Path(exeFileNameWPath).absolute().parent().toString();
 
  // init the glfw library
+ glfwSetErrorCallback(onErrorGlfwCb);
  int result = glfwInit();
  if (!result) {
  Logger::fatal("could not init glfw, exiting");
  errMsg( "GLFW initialization failed" );
  }
 
- glfwSetErrorCallback(onErrorGlfwCb);
 
  m_sysInit = true;
 

diff --git a/Tera/src/Core/WindowedApp.cpp b/Tera/src/Core/WindowedApp.cpp
@@ -1,4 +1,8 @@
 #include "WindowedApp.hpp"
+#include "Logger.hpp"
+#include "TeraSystem.hpp"
+
+
 #include <cstdlib>
 
 
@@ -18,12 +22,31 @@ WindowedApp::~WindowedApp()
 
 int WindowedApp::run()
 {
+ int winpos[2]{50, 50};
+ int winsize[2]{800, 600};
+
+ if (!Window::open(winpos[0], winpos[1], winsize[0], winsize[1], "Test Window", false))
+ {
+ Logger::error("Could not create window...");
+ return EXIT_FAILURE;
+ }
+
  bool run_ = true;
 
  if (run_)
  {
- while (true)
+ bool wasClosed = false;
+ while (pollEvents())
  {
+ while(!isOpen())
+ {
+ TeraSystem::waitEvents();
+ wasClosed = true;
+ }
+ if (wasClosed)
+ {
+ continue;
+ }
  /* code */
  }
  }