Преглед на файлове

scenegraph: Entity::TickDraw() now provides a reference to the current

scene so that g_scene can be deprecated later.
master
Sam Hocevar преди 10 години
родител
ревизия
70e6a8e570
променени са 6 файла, в които са добавени 9 реда и са изтрити 9 реда
  1. +2
    -2
      neercs/neercs.cpp
  2. +1
    -1
      neercs/neercs.h
  3. +2
    -2
      neercs/term/term.cpp
  4. +1
    -1
      neercs/term/term.h
  5. +2
    -2
      neercs/video/render.cpp
  6. +1
    -1
      neercs/video/render.h

+ 2
- 2
neercs/neercs.cpp Целия файл

@@ -39,9 +39,9 @@ void Neercs::TickGame(float seconds)
WorldEntity::TickGame(seconds);
}

void Neercs::TickDraw(float seconds)
void Neercs::TickDraw(float seconds, Scene &scene)
{
WorldEntity::TickDraw(seconds);
WorldEntity::TickDraw(seconds, scene);
}

Neercs::~Neercs()


+ 1
- 1
neercs/neercs.h Целия файл

@@ -27,7 +27,7 @@ public:

protected:
virtual void TickGame(float seconds);
virtual void TickDraw(float seconds);
virtual void TickDraw(float seconds, Scene &scene);

private:
Term *m_term;


+ 2
- 2
neercs/term/term.cpp Целия файл

@@ -165,9 +165,9 @@ void Term::TickGame(float seconds)
#endif
}

void Term::TickDraw(float seconds)
void Term::TickDraw(float seconds, Scene &scene)
{
Entity::TickDraw(seconds);
Entity::TickDraw(seconds, scene);
}

Term::~Term()


+ 1
- 1
neercs/term/term.h Целия файл

@@ -92,7 +92,7 @@ public:

protected:
virtual void TickGame(float seconds);
virtual void TickDraw(float seconds);
virtual void TickDraw(float seconds, Scene &scene);

private:
/* Terminal emulation main entry point */


+ 2
- 2
neercs/video/render.cpp Целия файл

@@ -1078,7 +1078,7 @@ void Render::Pause()
m_pause=!m_pause;
}

void Render::TickDraw(float seconds)
void Render::TickDraw(float seconds, Scene &scene)
{
/* keyboard manager */
#if 0
@@ -1379,7 +1379,7 @@ void Render::TickDraw(float seconds)
}
#endif

Entity::TickDraw(seconds);
Entity::TickDraw(seconds, scene);

if (!m_ready)
{


+ 1
- 1
neercs/video/render.h Целия файл

@@ -15,7 +15,7 @@ public:

protected:
virtual void TickGame(float seconds);
virtual void TickDraw(float seconds);
virtual void TickDraw(float seconds, Scene &scene);

void Draw2D();
void Draw3D();


Зареждане…
Отказ
Запис