Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
m039 committed Apr 17, 2017
1 parent 36e03a6 commit 950a3ea
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -336,4 +336,5 @@ __pycache__/
*.odx.cs
*.xsd.cs

cmake-build-debug/
cmake-build-debug/
build/
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

4 changes: 2 additions & 2 deletions void-app/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
get_filename_component (CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../Third-Party/libCinder/" ABSOLUTE)
get_filename_component (CINDER_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../Third-Party/Cinder/" ABSOLUTE)
get_filename_component (APP_PATH "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)

set (FILES ${APP_PATH}/src/CubeApp.cpp)
set (FILES ${APP_PATH}/src/VoidApp.cpp)

include ("${CINDER_PATH}/proj/cmake/modules/cinderMakeApp.cmake")

Expand Down
7 changes: 0 additions & 7 deletions void-app/src/HelloWorld.cpp

This file was deleted.

41 changes: 41 additions & 0 deletions void-app/src/VoidApp.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//
// Created by Dmitry Mozgin on 17/04/2017.
//

#include "cinder/app/RendererGl.h"
#include "cinder/gl/gl.h"

#include "VoidApp.h"

using namespace ci;

void prepareSettings(VoidApp::Settings *settings) {
settings->setHighDensityDisplayEnabled();
settings->setMultiTouchEnabled( false );
}

CINDER_APP( VoidApp, app::RendererGl, prepareSettings)

void VoidApp::setup() {
app::AppBase::setup();

console() << "Setup " << std::endl;

getWindow()->getSignalDisplayChange().connect( std::bind( &VoidApp::displayChange, this ) );
}

void VoidApp::update() {
app::AppBase::update();
}

void VoidApp::draw() {
app::AppBase::draw();

gl::clear( Color::black() );

gl::drawString("Hello, world", vec2(40, 40));
}

void VoidApp::displayChange() {

}
26 changes: 26 additions & 0 deletions void-app/src/VoidApp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// Created by Dmitry Mozgin on 17/04/2017.
//

#pragma once

#include "cinder/app/App.h"

class VoidApp : public ci::app::App {

public:
void setup() override;

void update() override;

void draw() override;

private:

void displayChange();

};




0 comments on commit 950a3ea

Please sign in to comment.