[Scummvm-cvs-logs] CVS: residual driver.h,1.9,1.10 driver_gl.cpp,1.47,1.48 driver_gl.h,1.22,1.23 driver_tinygl.cpp,1.16,1.17 driver_tinygl.h,1.9,1.10 lua.cpp,1.120,1.121

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28871

Modified Files:
	driver.h driver_gl.cpp driver_gl.h driver_tinygl.cpp 
	driver_tinygl.h lua.cpp 
Log Message:
added few lua stubs

Index: driver.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- driver.h	7 Apr 2005 19:29:05 -0000	1.9
+++ driver.h	7 Apr 2005 20:06:25 -0000	1.10
@@ -52,6 +52,8 @@
 
 	virtual void toggleFullscreenMode() = 0;
 
+	virtual bool isHardwareAccelerated() = 0;
+
 	virtual void setupCamera(float fov, float nclip, float fclip, float roll) = 0;
 	virtual void positionCamera(Vector3d pos, Vector3d interest) = 0;
 

Index: driver_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- driver_gl.cpp	7 Apr 2005 19:34:03 -0000	1.47
+++ driver_gl.cpp	7 Apr 2005 20:06:26 -0000	1.48
@@ -90,6 +90,10 @@
 	SDL_GL_SwapBuffers();
 }
 
+bool DriverGL::isHardwareAccelerated() {
+	return true;
+}
+
 void DriverGL::startActorDraw(Vector3d pos, float yaw, float pitch, float roll) {
 	glEnable(GL_TEXTURE_2D);
 	glMatrixMode(GL_MODELVIEW);

Index: driver_gl.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_gl.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- driver_gl.h	7 Apr 2005 19:29:05 -0000	1.22
+++ driver_gl.h	7 Apr 2005 20:06:26 -0000	1.23
@@ -41,6 +41,8 @@
 	void clearScreen(); 
 	void flipBuffer();
 
+	bool isHardwareAccelerated();
+
 	void startActorDraw(Vector3d pos, float yaw, float pitch, float roll);
 	void finishActorDraw();
 	

Index: driver_tinygl.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- driver_tinygl.cpp	7 Apr 2005 19:29:05 -0000	1.16
+++ driver_tinygl.cpp	7 Apr 2005 20:06:26 -0000	1.17
@@ -164,6 +164,10 @@
 	SDL_Flip(_screen);
 }
 
+bool DriverTinyGL::isHardwareAccelerated() {
+	return false;
+}
+
 void DriverTinyGL::startActorDraw(Vector3d pos, float yaw, float pitch, float roll) {
 #ifndef TURN_ON_LIGTHS_WITHOUT_TEXTURES
 	tglEnable(TGL_TEXTURE_2D);

Index: driver_tinygl.h
===================================================================
RCS file: /cvsroot/scummvm/residual/driver_tinygl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- driver_tinygl.h	7 Apr 2005 19:29:05 -0000	1.9
+++ driver_tinygl.h	7 Apr 2005 20:06:26 -0000	1.10
@@ -43,6 +43,8 @@
 	void clearScreen(); 
 	void flipBuffer();
 
+	bool isHardwareAccelerated();
+
 	void startActorDraw(Vector3d pos, float yaw, float pitch, float roll);
 	void finishActorDraw();
 	

Index: lua.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/lua.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- lua.cpp	7 Apr 2005 19:29:05 -0000	1.120
+++ lua.cpp	7 Apr 2005 20:06:27 -0000	1.121
@@ -498,7 +498,27 @@
 }
 
 static void Is3DHardwareEnabled() {
-	pushbool(true);
+	pushbool(g_driver->isHardwareAccelerated());
+}
+
+static void SetHardwareState() {
+	// ignore changing hardware state
+}
+
+static void SetVideoDevices() {
+	// ignore setting video devices
+}
+
+static void GetVideoDevices() {
+	// ignore getting of video devices
+}
+
+static void EnumerateVideoDevices() {
+	// ignore list of video devices
+}
+
+static void Enumerate3DDevices() {
+	// ignore list of 3d devices
 }
 
 static void IsActorResting() {
@@ -1882,13 +1902,8 @@
 STUB_FUNC(GetMemoryUsage)
 STUB_FUNC(GetFontDimensions)
 STUB_FUNC(PurgeText)
-STUB_FUNC(GetVideoDevices)
-STUB_FUNC(SetVideoDevices)
-STUB_FUNC(SetHardwareState)
-STUB_FUNC(Enumerate3DDevices)
-STUB_FUNC(EnumerateVideoDevices)
 
-	// new Monkey 4 opcodes:
+// new Monkey 4 opcodes:
 
 STUB_FUNC(SetActiveCD)
 STUB_FUNC(GetActiveCD)