[Scummvm-cvs-logs] SF.net SVN: scummvm: [33080] residual/trunk/engine

aquadran at users.sourceforge.net aquadran at users.sourceforge.net
Wed Jul 16 00:36:14 CEST 2008


Revision: 33080
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33080&view=rev
Author:   aquadran
Date:     2008-07-15 15:36:14 -0700 (Tue, 15 Jul 2008)

Log Message:
-----------
fixed lipsync and added more code for shadow

Modified Paths:
--------------
    residual/trunk/engine/actor.cpp
    residual/trunk/engine/imuse/imuse_script.cpp

Modified: residual/trunk/engine/actor.cpp
===================================================================
--- residual/trunk/engine/actor.cpp	2008-07-15 20:31:11 UTC (rev 33079)
+++ residual/trunk/engine/actor.cpp	2008-07-15 22:36:14 UTC (rev 33080)
@@ -622,25 +622,33 @@
 				g_driver->startActorDraw(_pos, _yaw, _pitch, _roll);
 				costume->draw();
 				g_driver->finishActorDraw();
+				g_driver->clearShadowMode();
 				g_driver->setShadow(NULL);
-				g_driver->clearShadowMode();
 			}
+			// normal draw actor
+			g_driver->startActorDraw(_pos, _yaw, _pitch, _roll);
+			costume->draw();
+			g_driver->finishActorDraw();
 		} else {
+			// normal draw actor
+			g_driver->startActorDraw(_pos, _yaw, _pitch, _roll);
+			costume->draw();
+			g_driver->finishActorDraw();
+
 			for (int l = 0; l < 5; l++) {
 				if (!_shadowArray[l].active)
 					continue;
 				g_driver->setShadow(&_shadowArray[l]);
+				g_driver->setShadowMode();
+				g_driver->drawShadowPlanes();
 				g_driver->startActorDraw(_pos, _yaw, _pitch, _roll);
 				costume->draw();
 				g_driver->finishActorDraw();
+				g_driver->clearShadowMode();
 				g_driver->setShadow(NULL);
 			}
 		}
 
-		// normal draw actor
-		g_driver->startActorDraw(_pos, _yaw, _pitch, _roll);
-		costume->draw();
-		g_driver->finishActorDraw();
 	}
 }
 

Modified: residual/trunk/engine/imuse/imuse_script.cpp
===================================================================
--- residual/trunk/engine/imuse/imuse_script.cpp	2008-07-15 20:31:11 UTC (rev 33079)
+++ residual/trunk/engine/imuse/imuse_script.cpp	2008-07-15 22:36:14 UTC (rev 33080)
@@ -119,7 +119,7 @@
 		return false;
 	}
 
-	int32 pos = (5 * (getTrack->dataOffset + getTrack->regionOffset)) / (getTrack->feedSize / 200);
+	int32 pos = (5 * (getTrack->dataOffset + getTrack->regionOffset)) / (getTrack->feedSize / 12);
 	return pos;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list