Skip to content
Snippets Groups Projects
Commit 310fc44c authored by Armin Co's avatar Armin Co
Browse files

Merge branch 'master' into feature_google_test_integration

parents 0c03347e e198b96d
Branches
No related tags found
No related merge requests found
# get all GTKMM dependencies and configuration
if(APPLE)
link_directories("/usr/local/lib")
message("ATTENTION: You probably have to export the PKG_CONFIG_PATH.")
message("For example: export PKG_CONFIG_PATH=\"/usr/local/lib:/usr/local/opt/zlib/lib/pkgconfig\"")
endif()
pkg_check_modules(GTKMM gtkmm-3.0)
link_directories(${GTKMM_LIBRARY_DIRS})
include_directories(${GTKMM_INCLUDE_DIRS})
## Create the application based on GTK
##
# get all GTKMM dependencies and configuration
include_directories(${GTKMM_INCLUDE_DIRS})
include_directories(/usr/local/include)
# create the application
add_executable(qpong.app
main.cpp
QWindow.cpp
......
......@@ -4,7 +4,7 @@
#include "QWindow.hpp"
#include "Profiler.hpp"
// #include "Profiler.hpp"
bool propagating = true;
int propRate = 0;
......@@ -41,7 +41,7 @@ void QWindow::simulation()
// Limit the speed of the simulation.
auto dt = std::chrono::system_clock::now() - start;
auto dtMillis = std::chrono::duration_cast<std::chrono::milliseconds>(dt).count();
constexpr int propTime = 6;
constexpr int propTime = 60;
if (dtMillis < propTime)
{
std::this_thread::sleep_for(std::chrono::milliseconds(propTime - dtMillis));
......
Subproject commit 8b4817e3df3746a20502a84580f661ac448821be
Subproject commit e3f0319d89f4cbf32993de595d984183b1a9fc57
include_directories(/usr/local/include)
## library for the app should be GTK independent
##
add_library(qpong_core
Particle.cpp
ImageBuffer.cpp
Player.cpp
Profiler.cpp
# Profiler.cpp
)
......@@ -9,8 +9,8 @@
namespace QPong
{
constexpr int arrayWidth = 384;
constexpr int arrayHeight = 384;
constexpr int arrayWidth = 256;
constexpr int arrayHeight = 256;
constexpr int numberOfThreads = 8;
constexpr unsigned arraySize = arrayWidth * arrayHeight;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment