manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added SetView allowing direct passing of matrices.

This commit is contained in:
Federico Ponchio 2010-04-20 18:23:51 +00:00
parent c095f8efe6
commit bae0c7decc
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wrap/gui/frustum.h
View File

@ -65,7 +65,8 @@ namespace vcg {
template <class T> class Frustum: public View<T> {
public:
void GetView();
void GetView();
void SetView(const float *_proj, const float *_modelview, const int *_viewport);
Point3<T> ViewPoint();
T Resolution(float dist = 1);
bool IsOutside(Point3<T> &point);
@ -76,7 +77,8 @@ public:
protected:
T resolution;
Plane3<T> planes[6];
Point3<T> view_point;
Point3<T> view_point;
void UpdateView();
};
@ -137,7 +139,16 @@ template <class T> T Frustum<T>::Distance(Point3<T> &point, int plane) {
template <class T> void Frustum<T>::GetView() {
View<T>::GetView();
UpdateView();
}
template <class T> void Frustum<T>::SetView(const float *_proj = NULL,
const float *_modelview = NULL,
const int *_viewport = NULL) {
View<T>::SetView(_proj, _modelview, _viewport);
UpdateView();
}
template <class T> void Frustum<T>::UpdateView() {
float t = (float)(View<T>::viewport[1] +View<T>:: viewport[3]);
float b = (float)View<T>::viewport[1];
float r = (float)(View<T>::viewport[0] + View<T>::viewport[2]);

17
wrap/gui/view.h
View File

@ -109,7 +109,7 @@ Note: mainly it is used only by the TrackBall.
template <class T> class View {
public:
void GetView();
void SetView();
void SetView(const float *_proj, const float *_modelview, const int *_viewport);
Point3<T> Project(const Point3<T> &p) const;
Point3<T> UnProject(const Point3<T> &p) const;
Point3<T> ViewPoint() const;
@ -146,8 +146,19 @@ template <class T> void View<T>::GetView() {
Invert(inverse);
}
template <class T> void View<T>::SetView() {
template <class T> void View<T>::SetView(const float *_proj = NULL,
const float *_modelview = NULL,
const int *_viewport = NULL) {
for(int i = 0; i < 4; i++) {
for(int k =0; k < 4; k++) {
proj[i][k] = _proj[4*i+k];
model[i][k] = _modelview[4*i+k];
}
viewport[i] = _viewport[i];
}
matrix = proj*model;
inverse = matrix;
Invert(inverse);
}
template <class T> Point3<T> View<T>::ViewPoint() const {