projects
/
matthijs
/
ABM2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Replace VideoUpdate DirectX code with OpenGL initialization and a test sprite.
[matthijs/ABM2.git]
/
ABM2
/
Engine
/
VideoUpdate.h
diff --git
a/ABM2/Engine/VideoUpdate.h
b/ABM2/Engine/VideoUpdate.h
index a859bd163b56c73ff0cd03171d9a5b520f2848df..e0f4bc212fc934fb00eb6d128da67e8d653259d7 100755
(executable)
--- a/
ABM2/Engine/VideoUpdate.h
+++ b/
ABM2/Engine/VideoUpdate.h
@@
-9,13
+9,18
@@
#pragma once
\r
#endif // _MSC_VER > 1000
\r
\r
#pragma once
\r
#endif // _MSC_VER > 1000
\r
\r
-#ifdef WIN32
\r
+#ifdef WITH_SDL
\r
+#include <Amaltheia/Graphics.h>
\r
+#include <Amaltheia/Sprite.h>
\r
+
\r
+#else // WITH_SDL
\r
#include <d3d9.h>
\r
#include <d3dx9.h>
\r
\r
#include "engine.h"
\r
extern LPDIRECT3DDEVICE9 d3ddev; // the pointer to the device class
\r
#include <d3d9.h>
\r
#include <d3dx9.h>
\r
\r
#include "engine.h"
\r
extern LPDIRECT3DDEVICE9 d3ddev; // the pointer to the device class
\r
-#endif // WIN32
\r
+#endif // WITH_SDL
\r
+
\r
class CVideoUpdate : public ITask
\r
{
\r
public:
\r
class CVideoUpdate : public ITask
\r
{
\r
public:
\r
@@
-29,10
+34,13
@@
public:
bool Start();
\r
void Update();
\r
void Stop();
\r
bool Start();
\r
void Update();
\r
void Stop();
\r
-#ifdef WIN32
\r
private:
\r
private:
\r
+#ifdef WITH_SDL
\r
+ Graphics *g;
\r
+ Sprite *s;
\r
+#else
\r
LPDIRECT3D9 d3d; // the pointer to our Direct3D interface
\r
LPDIRECT3D9 d3d; // the pointer to our Direct3D interface
\r
-#endif //WI
N32
\r
+#endif //WI
TH_SDL
\r
\r
};
\r
#endif // !defined(AFX_VIDEOUPDATE_H__FB4B263B_4FA7_4700_BB70_EE5CB1768E83__INCLUDED_)
\r
\r
};
\r
#endif // !defined(AFX_VIDEOUPDATE_H__FB4B263B_4FA7_4700_BB70_EE5CB1768E83__INCLUDED_)
\r