Subversion Repositories gelsvn

Rev

Rev 304 | Rev 595 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 304 Rev 501
Line 8... Line 8...
8
		Mat4x4f m(0.0f);
8
		Mat4x4f m(0.0f);
9
 
9
 
10
		switch(axis)
10
		switch(axis)
11
			{
11
			{
12
			case XAXIS:
12
			case XAXIS:
13
				m[0][0] = 1.0;
13
				m[0][0] = 1.0f;
14
				m[1][1] = cos(angle);
14
				m[1][1] = cos(angle);
15
				m[1][2] = sin(angle);
15
				m[1][2] = sin(angle);
16
				m[2][1] = -sin(angle);
16
				m[2][1] = -sin(angle);
17
				m[2][2] = cos(angle);
17
				m[2][2] = cos(angle);
18
				m[3][3] = 1.0;
18
				m[3][3] = 1.0f;
19
				break;
19
				break;
20
			case YAXIS:
20
			case YAXIS:
21
				m[0][0] = cos(angle);
21
				m[0][0] = cos(angle);
22
				m[0][2] = -sin(angle);
22
				m[0][2] = -sin(angle);
23
				m[2][0] = sin(angle);
23
				m[2][0] = sin(angle);
24
				m[2][2] = cos(angle);
24
				m[2][2] = cos(angle);
25
				m[1][1] = 1.0;
25
				m[1][1] = 1.0f;
26
				m[3][3] = 1.0;
26
				m[3][3] = 1.0f;
27
				break;
27
				break;
28
			case ZAXIS:
28
			case ZAXIS:
29
				m[0][0] = cos(angle);
29
				m[0][0] = cos(angle);
30
				m[0][1] = sin(angle);
30
				m[0][1] = sin(angle);
31
				m[1][0] = -sin(angle);
31
				m[1][0] = -sin(angle);
32
				m[1][1] = cos(angle);
32
				m[1][1] = cos(angle);
33
				m[2][2] = 1.0;
33
				m[2][2] = 1.0f;
34
				m[3][3] = 1.0;
34
				m[3][3] = 1.0f;
35
				break;
35
				break;
36
			}
36
			}
37
		return m;
37
		return m;
38
	}
38
	}
39
 
39
 
40
	Mat4x4f translation_Mat4x4f(const Vec3f& v)
40
	Mat4x4f translation_Mat4x4f(const Vec3f& v)
41
	{
41
	{
42
		Mat4x4f m(0.0f);
42
		Mat4x4f m(0.0f);
43
 
43
 
44
		m[0][0] = 1.0;
44
		m[0][0] = 1.0f;
45
		m[1][1] = 1.0;
45
		m[1][1] = 1.0f;
46
		m[2][2] = 1.0;
46
		m[2][2] = 1.0f;
47
		m[3][3] = 1.0;
47
		m[3][3] = 1.0f;
48
  
48
  
49
		m[0][3] = v[0];
49
		m[0][3] = v[0];
50
		m[1][3] = v[1];
50
		m[1][3] = v[1];
51
		m[2][3] = v[2];
51
		m[2][3] = v[2];
52
  
52
  
Line 58... Line 58...
58
		Mat4x4f m(0.0f);
58
		Mat4x4f m(0.0f);
59
 
59
 
60
		m[0][0] = v[0];
60
		m[0][0] = v[0];
61
		m[1][1] = v[1];
61
		m[1][1] = v[1];
62
		m[2][2] = v[2];
62
		m[2][2] = v[2];
63
		m[3][3] = 1.0;
63
		m[3][3] = 1.0f;
64
   
64
   
65
		return m;
65
		return m;
66
	}
66
	}
67
}
67
}