From 4aa3330211f3c4f694df0d172f450d0713b387c0 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 7 Oct 2005 01:31:27 +0000 Subject: [PATCH] Nothing ever overrides BeginDraw or EndDraw--any time where we might, we just do the stuff in DrawPrimitives. Remove unneeded virtual calls from the Actor draw path. Fix comments. --- stepmania/src/Actor.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h index 609d3a263f..e864a40aae 100644 --- a/stepmania/src/Actor.h +++ b/stepmania/src/Actor.h @@ -102,13 +102,13 @@ public: NUM_CLOCKS }; - void Draw(); // calls, NeedsDraw, BeginDraw, DrawPrimitives, EndDraw + void Draw(); // calls, EarlyAbortDraw, BeginDraw, DrawPrimitives, EndDraw virtual bool EarlyAbortDraw() const { return false; } // return true to early abort drawing of this Actor - virtual void BeginDraw(); // pushes transform onto world matrix stack + void BeginDraw(); // pushes transform onto world matrix stack virtual void SetGlobalRenderStates(); // Actor should call this at beginning of their DrawPrimitives() virtual void SetTextureRenderStates(); // Actor should call this after setting a texture - virtual void DrawPrimitives() {}; // Derivitives should override - virtual void EndDraw(); // pops transform from world matrix stack + virtual void DrawPrimitives() {}; // Derivatives should override + void EndDraw(); // pops transform from world matrix stack // TODO: make Update non virtual and change all classes to override UpdateInternal // instead.