[Scummvm-git-logs] scummvm master -> c22f408d46e7e4da372aa2066d9732cfc18344d2
dreammaster
dreammaster at scummvm.org
Tue Apr 11 02:02:08 CEST 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2c9dffc502 TITANIC: Temporarily lock camera for testing star closeup rendering
c22f408d46 TITANIC: Formatting fix
Commit: 2c9dffc502e3f4a8daaf20869b11e38397951a14
https://github.com/scummvm/scummvm/commit/2c9dffc502e3f4a8daaf20869b11e38397951a14
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-10T19:58:33-04:00
Commit Message:
TITANIC: Temporarily lock camera for testing star closeup rendering
Changed paths:
engines/titanic/star_control/base_stars.cpp
diff --git a/engines/titanic/star_control/base_stars.cpp b/engines/titanic/star_control/base_stars.cpp
index d1ead70..a88c86f 100644
--- a/engines/titanic/star_control/base_stars.cpp
+++ b/engines/titanic/star_control/base_stars.cpp
@@ -440,6 +440,12 @@ void CBaseStars::draw4(CSurfaceArea *surfaceArea, CStarCamera *camera, CStarClos
FPose pose = camera->getPose();
camera->proc36(&_value1, &_value2, &_value3, &_value4);
+ //**DEBUG** Testing star closeup
+ pose._row1 = FVector(-0.309339792, 0.777301192, -0.547824562);
+ pose._row2 = FVector(0.796925128, -0.102426603, -0.595331132);
+ pose._row3 = FVector(-0.518863380, -0.620734751, -0.587766230);
+ pose._vector = FVector(28068592.0, 5345916.50, -116580624.0);
+
const double MAX_VAL = 1.0e9 * 1.0e9;
FPoint centroid = surfaceArea->_centroid - FPoint(0.5, 0.5);
double threshold = camera->getThreshold();
@@ -465,6 +471,7 @@ void CBaseStars::draw4(CSurfaceArea *surfaceArea, CStarCamera *camera, CStarClos
total2 = tempY * tempY + tempX * tempX + tempZ * tempZ;
if (total2 < 1.0e12) {
+ // We're in close proximity to the given star, so draw a closeup of it
closeup->draw(pose, vector, FVector(centroid._x, centroid._y, total2),
surfaceArea, camera);
continue;
Commit: c22f408d46e7e4da372aa2066d9732cfc18344d2
https://github.com/scummvm/scummvm/commit/c22f408d46e7e4da372aa2066d9732cfc18344d2
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-04-10T19:59:43-04:00
Commit Message:
TITANIC: Formatting fix
Changed paths:
engines/titanic/star_control/star_camera.cpp
diff --git a/engines/titanic/star_control/star_camera.cpp b/engines/titanic/star_control/star_camera.cpp
index fc5035e..651dbdd 100644
--- a/engines/titanic/star_control/star_camera.cpp
+++ b/engines/titanic/star_control/star_camera.cpp
@@ -452,8 +452,7 @@ bool CStarCamera::setupHandler(const CStar20Data *src) {
assert(!_handlerP);
_handlerP = handler;
return true;
- }
- else {
+ } else {
return false;
}
}
More information about the Scummvm-git-logs
mailing list