projects
/
summerhack
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolution don't care option, heuristic to avoid multimon sizes
[summerhack]
/
src
/
3dengfx
/
src
/
gfx
/
base_cam.cpp
diff --git
a/src/3dengfx/src/gfx/base_cam.cpp
b/src/3dengfx/src/gfx/base_cam.cpp
index
2078529
..
ee89992
100644
(file)
--- a/
src/3dengfx/src/gfx/base_cam.cpp
+++ b/
src/3dengfx/src/gfx/base_cam.cpp
@@
-24,6
+24,7
@@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#ifdef USING_3DENGFX
#include "3dengfx/3denginefx.hpp"
#ifdef USING_3DENGFX
#include "3dengfx/3denginefx.hpp"
+#include "fxwt/fxwt.hpp"
#endif // USING_3DENGFX
FrustumPlane::FrustumPlane() {
#endif // USING_3DENGFX
FrustumPlane::FrustumPlane() {
@@
-62,7
+63,11
@@
BaseCamera::BaseCamera(const Vector3 &trans, const Quaternion &rot) {
fov = quarter_pi;
near_clip = 1.0;
far_clip = 10000.0;
fov = quarter_pi;
near_clip = 1.0;
far_clip = 10000.0;
- aspect = 1.33333;
+#ifdef USING_3DENGFX
+ aspect = (float)fxwt::screenx / fxwt::screeny;
+#else
+ aspect = 1.33333333;
+#endif
flip_view.x = flip_view.y = flip_view.z = false;
}
flip_view.x = flip_view.y = flip_view.z = false;
}