← Back to branch summary

~diegosarmentero/nuxplayground/nux-view-html-typos

« back to all changes in this revision

Viewing changes to src/shader-lighting/MainSceneView.cpp

  • Committer: Jay Taoko
  • Date: 2012-07-12 18:34:56 UTC
  • mfrom: (20.1.1 nuxp.timer-api)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: jay.taoko@canonical.com-20120712183456-ednq5vf65rixzlsx
* Added demo programs
* Added markdown script and syntax highlighting script
* Cleanup and fixes
* Added documentation folder

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shader-lighting/MainSceneView.cpp
3
3
#include "NuxCore/Math/Vector3.h"
4
4
#include "NuxCore/Math/Constants.h"
5
5
 
6
 
#include "NuxImage/ImageSurface.h"
 
6
#include "NuxGraphics/ImageSurface.h"
7
7
 
8
8
#include "NuxGraphics/GLShader.h"
9
9
#include "NuxCore/FilePath.h"
94
94
    -camera_radius_ * sin(camera_theta_) * sin(camera_phi_));
95
95
 
96
96
  live_timer_ = new nux::TimerFunctor();
97
 
  live_timer_->time_expires.connect(sigc::mem_fun(this, &MainSceneView::LiveTimerCallback));
 
97
  live_timer_->tick.connect(sigc::mem_fun(this, &MainSceneView::LiveTimerCallback));
98
98
}
99
99
 
100
100
MainSceneView::~MainSceneView()
124
124
 
125
125
void MainSceneView::LiveTimerCallback(void* data)
126
126
{
127
 
  live_timer_handle_ = nux::GetTimer().AddTimerHandler(16, live_timer_, this);
 
127
  live_timer_handle_ = nux::GetTimer().AddOneShotTimer(16, live_timer_, this);
128
128
 
129
129
  object_theta_ += 0.01f;
130
130
 
419
419
{
420
420
  if (state)
421
421
  {
422
 
    live_timer_handle_ = nux::GetTimer().AddTimerHandler(16, live_timer_, this);
 
422
    live_timer_handle_ = nux::GetTimer().AddOneShotTimer(16, live_timer_, this);
423
423
    time_passed_ = 0.0f;
424
424
    live_frame_count_ = 0.0f;
425
425
  }