Thomas Buck 10 gadus atpakaļ
vecāks
revīzija
23a245a82f
11 mainītis faili ar 104 papildinājumiem un 127 dzēšanām
  1. 12
    12
      include/Camera.h
  2. 5
    5
      include/MatMath.h
  3. 0
    7
      include/Matrix.h
  4. 0
    2
      include/Network.h
  5. 57
    57
      src/Camera.cpp
  6. 4
    4
      src/Emitter.cpp
  7. 1
    1
      src/GLString.cpp
  8. 10
    10
      src/MatMath.cpp
  9. 0
    10
      src/Matrix.cpp
  10. 7
    11
      src/Network.cpp
  11. 8
    8
      src/Texture.cpp

+ 12
- 12
include/Camera.h Parādīt failu

104
      * \brief Get angle/yaw of camera
104
      * \brief Get angle/yaw of camera
105
      * \returns theta angle/yaw of camera
105
      * \returns theta angle/yaw of camera
106
      */
106
      */
107
-    double getRadianYaw();
107
+    vec_t getRadianYaw();
108
     /*------------------------------------------------------
108
     /*------------------------------------------------------
109
      * Pre  :
109
      * Pre  :
110
      * Post : Returns theta angle/yaw of camera
110
      * Post : Returns theta angle/yaw of camera
125
      * \brief Get angle/pitch of camera
125
      * \brief Get angle/pitch of camera
126
      * \returns phi angle/pitch of camera
126
      * \returns phi angle/pitch of camera
127
      */
127
      */
128
-    double getRadianPitch();
128
+    vec_t getRadianPitch();
129
 
129
 
130
     /*!
130
     /*!
131
      * \brief Check if the coordinate is behind camera eye
131
      * \brief Check if the coordinate is behind camera eye
208
     unsigned int mId;             //!< Unique id
208
     unsigned int mId;             //!< Unique id
209
     Quaternion mQ;                //!< Quaternion for rotation
209
     Quaternion mQ;                //!< Quaternion for rotation
210
     unsigned int mFlags;          //!< For testing with flags
210
     unsigned int mFlags;          //!< For testing with flags
211
-    double mPos[4];               //!< Location in 3 space (aka eye)
212
-    double mTarget[4];            //!< Postition we're looking at
213
-    double mUp[4];                //!< Up vector
214
-    double mSide[4];              //!< Side vector
215
-    double mViewDistance;         //!< Distance from target
216
-    double mTranslateDelta;       //!< Step size to move
217
-    double mRotateDelta;          //!< Radians to rotate Y
218
-    double mTheta;                //!< View angle Y
219
-    double mRotateDelta2;         //!< Radians to rotate Z
220
-    double mTheta2;               //!< View angle Z
211
+    vec_t mPos[4];               //!< Location in 3 space (aka eye)
212
+    vec_t mTarget[4];            //!< Postition we're looking at
213
+    vec_t mUp[4];                //!< Up vector
214
+    vec_t mSide[4];              //!< Side vector
215
+    vec_t mViewDistance;         //!< Distance from target
216
+    vec_t mTranslateDelta;       //!< Step size to move
217
+    vec_t mRotateDelta;          //!< Radians to rotate Y
218
+    vec_t mTheta;                //!< View angle Y
219
+    vec_t mRotateDelta2;         //!< Radians to rotate Z
220
+    vec_t mTheta2;               //!< View angle Z
221
     bool mUpdate;                 //!< Check to see if view needs updating
221
     bool mUpdate;                 //!< Check to see if view needs updating
222
     static unsigned int mCounter; //!< Id system use
222
     static unsigned int mCounter; //!< Id system use
223
 };
223
 };

+ 5
- 5
include/MatMath.h Parādīt failu

11
 #ifndef _MATMATH_H
11
 #ifndef _MATMATH_H
12
 #define _MATMATH_H
12
 #define _MATMATH_H
13
 
13
 
14
-#define HEL_PI           M_PI //!< pi
15
-#define HEL_2_PI         (M_PI * 2.0) //!< pi*2
16
-#define HEL_PI_OVER_4    M_PI_4 //!< pi/4
17
-#define HEL_PI_OVER_180  (M_PI / 180.0) //!< pi/180
18
-#define HEL_180_OVER_PI  (180.0 / M_PI) //!< 180/pi
14
+#define HEL_PI           ((float)M_PI) //!< pi
15
+#define HEL_2_PI         (HEL_PI * 2.0f) //!< pi*2
16
+#define HEL_PI_OVER_4    (M_PI_4 / 4.0f) //!< pi/4
17
+#define HEL_PI_OVER_180  (HEL_PI / 180.0f) //!< pi/180
18
+#define HEL_180_OVER_PI  (180.0f / HEL_PI) //!< 180/pi
19
 
19
 
20
 #define HEL_RAD_TO_DEG(x) ((x) * HEL_180_OVER_PI) //!< Convert radians to degrees
20
 #define HEL_RAD_TO_DEG(x) ((x) * HEL_180_OVER_PI) //!< Convert radians to degrees
21
 #define HEL_DEG_TO_RAD(x) ((x) * HEL_PI_OVER_180) //!< Convert degrees to radians
21
 #define HEL_DEG_TO_RAD(x) ((x) * HEL_PI_OVER_180) //!< Convert degrees to radians

+ 0
- 7
include/Matrix.h Parādīt failu

87
 
87
 
88
     /*!
88
     /*!
89
      * \brief Multiplies v vector and this matrix
89
      * \brief Multiplies v vector and this matrix
90
-     * \param v double[4] vector
91
-     * \param result where the result will be stored, may be same as v
92
-     */
93
-    void multiply4d(double *v, double *result);
94
-
95
-    /*!
96
-     * \brief Multiplies v vector and this matrix
97
      * \param v vector
90
      * \param v vector
98
      * \param result where the result will be stored, may be same as v
91
      * \param result where the result will be stored, may be same as v
99
      */
92
      */

+ 0
- 2
include/Network.h Parādīt failu

67
 
67
 
68
     unsigned int getUID();
68
     unsigned int getUID();
69
 
69
 
70
-    float getRandom(float from, float to);
71
-
72
     int getPort();
70
     int getPort();
73
 
71
 
74
     void setDebug(bool toggle);
72
     void setDebug(bool toggle);

+ 57
- 57
src/Camera.cpp Parādīt failu

26
 {
26
 {
27
     mId = ++mCounter;
27
     mId = ++mCounter;
28
     mFlags = 0;
28
     mFlags = 0;
29
-    mViewDistance = 14.0;
30
-    mTranslateDelta = 256.0;
31
-    mRotateDelta = HEL_DEG_TO_RAD(15.0);
32
-    mRotateDelta2 = HEL_DEG_TO_RAD(5.0);
29
+    mViewDistance = 14.0f;
30
+    mTranslateDelta = 256.0f;
31
+    mRotateDelta = HEL_DEG_TO_RAD(15.0f);
32
+    mRotateDelta2 = HEL_DEG_TO_RAD(5.0f);
33
     mFlags &= Camera_FlyMode;
33
     mFlags &= Camera_FlyMode;
34
     reset();
34
     reset();
35
 }
35
 }
80
 }
80
 }
81
 
81
 
82
 
82
 
83
-double Camera::getRadianYaw()
83
+vec_t Camera::getRadianYaw()
84
 {
84
 {
85
     return mTheta;
85
     return mTheta;
86
 }
86
 }
87
 
87
 
88
 
88
 
89
-double Camera::getRadianPitch()
89
+vec_t Camera::getRadianPitch()
90
 {
90
 {
91
     return mTheta2;
91
     return mTheta2;
92
 }
92
 }
100
 {
100
 {
101
     Quaternion t, n;
101
     Quaternion t, n;
102
     Matrix matrix;
102
     Matrix matrix;
103
-    double side[4] = { 1, 0,  0, 1 };
104
-    double up[4] =   { 0, 1,  0, 1 };
105
-    double look[4] = { 0, 0, -1, 1 };
103
+    vec_t side[4] = { 1.0f, 0.0f,  0.0f, 1.0f };
104
+    vec_t up[4] =   { 0.0f, 1.0f,  0.0f, 1.0f };
105
+    vec_t look[4] = { 0.0f, 0.0f, -1.0f, 1.0f };
106
     unsigned int i;
106
     unsigned int i;
107
     matrix_t m;
107
     matrix_t m;
108
 
108
 
113
 
113
 
114
     n.getMatrix(m);
114
     n.getMatrix(m);
115
     matrix.setMatrix(m);
115
     matrix.setMatrix(m);
116
-    matrix.multiply4d(side, mSide);
117
-    matrix.multiply4d(look, mTarget);
118
-    matrix.multiply4d(up, mUp);
116
+    matrix.multiply4v(side, mSide);
117
+    matrix.multiply4v(look, mTarget);
118
+    matrix.multiply4v(up, mUp);
119
 
119
 
120
     for (i = 0; i < 3; ++i)
120
     for (i = 0; i < 3; ++i)
121
     {
121
     {
131
 void Camera::translate(float x, float y, float z)
131
 void Camera::translate(float x, float y, float z)
132
 {
132
 {
133
     int i;
133
     int i;
134
-    double result[4];
135
-    double v[4];
134
+    vec_t result[4];
135
+    vec_t v[4];
136
     matrix_t m;
136
     matrix_t m;
137
     Matrix matrix;
137
     Matrix matrix;
138
 
138
 
160
     m[15] = 1;
160
     m[15] = 1;
161
 
161
 
162
     matrix.setMatrix(m);
162
     matrix.setMatrix(m);
163
-    matrix.multiply4d(v, result);
163
+    matrix.multiply4v(v, result);
164
 
164
 
165
     for (i = 0; i < 3; ++i)
165
     for (i = 0; i < 3; ++i)
166
     {
166
     {
178
 
178
 
179
 void Camera::reset()
179
 void Camera::reset()
180
 {
180
 {
181
-    mTheta = 0.0;
182
-    mTheta2 = 0.0;
181
+    mTheta = 0.0f;
182
+    mTheta2 = 0.0f;
183
 
183
 
184
-    mPos[0] = 0.0;
185
-    mPos[1] = 0.0;
186
-    mPos[2] = 0.0;
184
+    mPos[0] = 0.0f;
185
+    mPos[1] = 0.0f;
186
+    mPos[2] = 0.0f;
187
 
187
 
188
-    mTarget[0] = 0.0;
189
-    mTarget[1] = 0.0;
188
+    mTarget[0] = 0.0f;
189
+    mTarget[1] = 0.0f;
190
     mTarget[2] = mViewDistance;
190
     mTarget[2] = mViewDistance;
191
 
191
 
192
-    mSide[0] = 1.0;
193
-    mSide[1] = 0.0;
194
-    mSide[2] = 0.0;
192
+    mSide[0] = 1.0f;
193
+    mSide[1] = 0.0f;
194
+    mSide[2] = 0.0f;
195
 
195
 
196
-    mUp[0] = 0.0;
197
-    mUp[1] = 1.0;
198
-    mUp[2] = 0.0;
196
+    mUp[0] = 0.0f;
197
+    mUp[1] = 1.0f;
198
+    mUp[2] = 0.0f;
199
 
199
 
200
     mQ.setIdentity();
200
     mQ.setIdentity();
201
-    translate(0.0, 0.0, 0.0);
201
+    translate(0.0f, 0.0f, 0.0f);
202
 }
202
 }
203
 
203
 
204
 
204
 
222
         case CAMERA_MOVE_FORWARD:
222
         case CAMERA_MOVE_FORWARD:
223
             if (mFlags & Camera_FlyMode)
223
             if (mFlags & Camera_FlyMode)
224
             {
224
             {
225
-                mPos[2] += (mTranslateDelta * cos(mTheta));
225
+                mPos[2] += (mTranslateDelta * cosf(mTheta));
226
             }
226
             }
227
 
227
 
228
-            mPos[0] += (mTranslateDelta * sin(mTheta));
229
-            mPos[1] += (mTranslateDelta * sin(mTheta2));
228
+            mPos[0] += (mTranslateDelta * sinf(mTheta));
229
+            mPos[1] += (mTranslateDelta * sinf(mTheta2));
230
             break;
230
             break;
231
         case CAMERA_MOVE_BACKWARD:
231
         case CAMERA_MOVE_BACKWARD:
232
             if (mFlags & Camera_FlyMode)
232
             if (mFlags & Camera_FlyMode)
233
             {
233
             {
234
-                mPos[2] -= (mTranslateDelta * cos(mTheta));
234
+                mPos[2] -= (mTranslateDelta * cosf(mTheta));
235
             }
235
             }
236
 
236
 
237
-            mPos[0] -= (mTranslateDelta * sin(mTheta));
238
-            mPos[1] -= (mTranslateDelta * sin(mTheta2));
237
+            mPos[0] -= (mTranslateDelta * sinf(mTheta));
238
+            mPos[1] -= (mTranslateDelta * sinf(mTheta2));
239
             break;
239
             break;
240
         case CAMERA_MOVE_LEFT:
240
         case CAMERA_MOVE_LEFT:
241
-            mPos[0] -= (mTranslateDelta * sin(mTheta - 90.0f));
242
-            mPos[2] -= (mTranslateDelta * cos(mTheta - 90.0f));
241
+            mPos[0] -= (mTranslateDelta * sinf(mTheta - 90.0f));
242
+            mPos[2] -= (mTranslateDelta * cosf(mTheta - 90.0f));
243
             break;
243
             break;
244
         case CAMERA_MOVE_RIGHT:
244
         case CAMERA_MOVE_RIGHT:
245
-            mPos[0] -= (mTranslateDelta * sin(mTheta + 90.0f));
246
-            mPos[2] -= (mTranslateDelta * cos(mTheta + 90.0f));
245
+            mPos[0] -= (mTranslateDelta * sinf(mTheta + 90.0f));
246
+            mPos[2] -= (mTranslateDelta * cosf(mTheta + 90.0f));
247
             break;
247
             break;
248
         case CAMERA_ROTATE_UP:
248
         case CAMERA_ROTATE_UP:
249
             if (mTheta2 < (M_PI / 2)) {
249
             if (mTheta2 < (M_PI / 2)) {
250
                 mTheta2 += mRotateDelta2;
250
                 mTheta2 += mRotateDelta2;
251
-                rotate(mTheta2, 1.0, 0.0, 0.0);
251
+                rotate(mTheta2, 1.0f, 0.0f, 0.0f);
252
             }
252
             }
253
             break;
253
             break;
254
         case CAMERA_ROTATE_DOWN:
254
         case CAMERA_ROTATE_DOWN:
255
             if (mTheta2 > -(M_PI / 2)) {
255
             if (mTheta2 > -(M_PI / 2)) {
256
                 mTheta2 -= mRotateDelta2;
256
                 mTheta2 -= mRotateDelta2;
257
-                rotate(mTheta2, 1.0, 0.0, 0.0);
257
+                rotate(mTheta2, 1.0f, 0.0f, 0.0f);
258
             }
258
             }
259
             break;
259
             break;
260
         case CAMERA_ROTATE_RIGHT:
260
         case CAMERA_ROTATE_RIGHT:
261
             mTheta += mRotateDelta;
261
             mTheta += mRotateDelta;
262
-            rotate(mTheta, 0.0, 1.0, 0.0);
262
+            rotate(mTheta, 0.0f, 1.0f, 0.0f);
263
             break;
263
             break;
264
         case CAMERA_ROTATE_LEFT:
264
         case CAMERA_ROTATE_LEFT:
265
             mTheta -= mRotateDelta;
265
             mTheta -= mRotateDelta;
266
-            rotate(mTheta, 0.0, 1.0, 0.0);
266
+            rotate(mTheta, 0.0f, 1.0f, 0.0f);
267
             break;
267
             break;
268
         case CAMERA_MOVE_UP:
268
         case CAMERA_MOVE_UP:
269
-            mPos[1] -= mTranslateDelta / 2.0;
270
-            mTarget[1] -= mTranslateDelta / 2.0;
269
+            mPos[1] -= mTranslateDelta / 2.0f;
270
+            mTarget[1] -= mTranslateDelta / 2.0f;
271
             break;
271
             break;
272
         case CAMERA_MOVE_DOWN:
272
         case CAMERA_MOVE_DOWN:
273
-            mPos[1] += mTranslateDelta / 2.0;
274
-            mTarget[1] += mTranslateDelta / 2.0;
273
+            mPos[1] += mTranslateDelta / 2.0f;
274
+            mTarget[1] += mTranslateDelta / 2.0f;
275
             break;
275
             break;
276
         case CAMERA_SPEED_UP:
276
         case CAMERA_SPEED_UP:
277
             ++mTranslateDelta;
277
             ++mTranslateDelta;
278
             break;
278
             break;
279
         case CAMERA_SPEED_DOWN:
279
         case CAMERA_SPEED_DOWN:
280
-            if (--mTranslateDelta < 0.0)
281
-                mTranslateDelta = 1.0;
280
+            if (--mTranslateDelta < 0.0f)
281
+                mTranslateDelta = 1.0f;
282
             break;
282
             break;
283
         default:
283
         default:
284
             ;
284
             ;
289
 //! \fixme Mostly invalid for QUAT_CAM (can rotate on XYZ)
289
 //! \fixme Mostly invalid for QUAT_CAM (can rotate on XYZ)
290
 bool Camera::isBehind(int x, int z)
290
 bool Camera::isBehind(int x, int z)
291
 {
291
 {
292
-    double bTheta, bCameraX, bCameraZ, Distance;
292
+    vec_t bTheta, bCameraX, bCameraZ, Distance;
293
 
293
 
294
 
294
 
295
     // Set up a "virtual camera" a huge distance behind us
295
     // Set up a "virtual camera" a huge distance behind us
299
         bTheta -= HEL_2_PI;
299
         bTheta -= HEL_2_PI;
300
 
300
 
301
     // 64k is a fair distance away...
301
     // 64k is a fair distance away...
302
-    bCameraX = (65536.0 * sin(bTheta)) + mPos[0];
303
-    bCameraZ = (65536.0 * cos(bTheta)) + mPos[2];
302
+    bCameraX = (65536.0f * sinf(bTheta)) + mPos[0];
303
+    bCameraZ = (65536.0f * cosf(bTheta)) + mPos[2];
304
 
304
 
305
     bCameraX -= x;
305
     bCameraX -= x;
306
     bCameraZ -= z;
306
     bCameraZ -= z;
307
-    Distance = sqrt((bCameraX * bCameraX) + (bCameraZ * bCameraZ));
307
+    Distance = sqrtf((bCameraX * bCameraX) + (bCameraZ * bCameraZ));
308
 
308
 
309
-    return (Distance < 65536.0);
309
+    return (Distance < 65536.0f);
310
 }
310
 }
311
 
311
 
312
 
312
 
318
 
318
 
319
 void Camera::update()
319
 void Camera::update()
320
 {
320
 {
321
-    mTarget[2] = (mViewDistance * cos(mTheta)) + mPos[2];
322
-    mTarget[0] = (mViewDistance * sin(mTheta)) + mPos[0];
323
-    mTarget[1] = (mViewDistance * sin(mTheta2)) + mPos[1]; // + height_offset;
321
+    mTarget[2] = (mViewDistance * cosf(mTheta)) + mPos[2];
322
+    mTarget[0] = (mViewDistance * sinf(mTheta)) + mPos[0];
323
+    mTarget[1] = (mViewDistance * sinf(mTheta2)) + mPos[1]; // + height_offset;
324
 }
324
 }
325
 
325
 
326
 
326
 

+ 4
- 4
src/Emitter.cpp Parādīt failu

226
             // Render tristrip quad
226
             // Render tristrip quad
227
             glBegin(GL_TRIANGLE_STRIP);
227
             glBegin(GL_TRIANGLE_STRIP);
228
             glTexCoord2d(1.0, 1.0);
228
             glTexCoord2d(1.0, 1.0);
229
-            glVertex3f(x + 0.5, y + 0.5, z);
229
+            glVertex3f(x + 0.5f, y + 0.5f, z);
230
 
230
 
231
             glTexCoord2d(0.0, 1.0);
231
             glTexCoord2d(0.0, 1.0);
232
-            glVertex3f(x - 0.5, y + 0.5, z);
232
+            glVertex3f(x - 0.5f, y + 0.5f, z);
233
 
233
 
234
             glTexCoord2d(1.0, 0.0);
234
             glTexCoord2d(1.0, 0.0);
235
-            glVertex3f(x + 0.5, y - 0.5, z);
235
+            glVertex3f(x + 0.5f, y - 0.5f, z);
236
 
236
 
237
             glTexCoord2d(0.0, 0.0);
237
             glTexCoord2d(0.0, 0.0);
238
-            glVertex3f(x - 0.5, y - 0.5, z);
238
+            glVertex3f(x - 0.5f, y - 0.5f, z);
239
             glEnd();
239
             glEnd();
240
 
240
 
241
             // Update particle's attributes for it's life cycle
241
             // Update particle's attributes for it's life cycle

+ 1
- 1
src/GLString.cpp Parādīt failu

159
     va_end(args);
159
     va_end(args);
160
 
160
 
161
     // Mongoose 2002.01.04, Remeber string size, for future rebuffering use
161
     // Mongoose 2002.01.04, Remeber string size, for future rebuffering use
162
-    _string[_num_string].len = sz;
162
+    _string[_num_string].len = (unsigned short)sz;
163
 
163
 
164
     // Mongoose 2002.01.01, Incement string counter, since we just
164
     // Mongoose 2002.01.01, Incement string counter, since we just
165
     //   allocated a string
165
     //   allocated a string

+ 10
- 10
src/MatMath.cpp Parādīt failu

88
         // Two intersections
88
         // Two intersections
89
 
89
 
90
         // First intersection
90
         // First intersection
91
-        mu = (-b + sqrt( square(b) - 4*a*c)) / (2*a);
91
+        mu = (-b + sqrtf( square(b) - 4.0f*a*c)) / (2.0f*a);
92
         intersectionA[1] = posA[0] + mu*(posB[0]-posA[0]);
92
         intersectionA[1] = posA[0] + mu*(posB[0]-posA[0]);
93
         intersectionA[2] = posA[1] + mu*(posB[1]-posA[1]);
93
         intersectionA[2] = posA[1] + mu*(posB[1]-posA[1]);
94
         intersectionA[3] = posA[2] + mu*(posB[2]-posA[2]);
94
         intersectionA[3] = posA[2] + mu*(posB[2]-posA[2]);
95
 
95
 
96
         // Second intersection
96
         // Second intersection
97
-        mu = (-b - sqrt(square(b) - 4*a*c)) / (2*a);
97
+        mu = (-b - sqrtf(square(b) - 4.0f*a*c)) / (2.0f*a);
98
         intersectionB[0] = posA[0] + mu*(posB[0]-posA[0]);
98
         intersectionB[0] = posA[0] + mu*(posB[0]-posA[0]);
99
         intersectionB[1] = posA[1] + mu*(posB[1]-posA[1]);
99
         intersectionB[1] = posA[1] + mu*(posB[1]-posA[1]);
100
         intersectionB[2] = posA[2] + mu*(posB[2]-posA[2]);
100
         intersectionB[2] = posA[2] + mu*(posB[2]-posA[2]);
235
 
235
 
236
 vec_t helDist3v(vec3_t a, vec3_t b)
236
 vec_t helDist3v(vec3_t a, vec3_t b)
237
 {
237
 {
238
-    return (sqrt( ((b[0] - a[0]) * (b[0] - a[0])) +
238
+    return (sqrtf( ((b[0] - a[0]) * (b[0] - a[0])) +
239
                 ((b[1] - a[1]) * (b[1] - a[1])) +
239
                 ((b[1] - a[1]) * (b[1] - a[1])) +
240
                 ((b[2] - a[2]) * (b[2] - a[2]))));
240
                 ((b[2] - a[2]) * (b[2] - a[2]))));
241
 }
241
 }
243
 
243
 
244
 void helMidpoint3v(vec3_t a, vec3_t b, vec3_t mid)
244
 void helMidpoint3v(vec3_t a, vec3_t b, vec3_t mid)
245
 {
245
 {
246
-    mid[0] = (a[0] + b[0]) / 2;
247
-    mid[1] = (a[1] + b[1]) / 2;
248
-    mid[2] = (a[2] + b[2]) / 2;
246
+    mid[0] = (a[0] + b[0]) / 2.0f;
247
+    mid[1] = (a[1] + b[1]) / 2.0f;
248
+    mid[2] = (a[2] + b[2]) / 2.0f;
249
 }
249
 }
250
 
250
 
251
 
251
 
252
 vec_t helNorm4v(vec4_t v)
252
 vec_t helNorm4v(vec4_t v)
253
 {
253
 {
254
-    return (sqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2] + v[3]*v[3]));
254
+    return (sqrtf(v[0]*v[0] + v[1]*v[1] + v[2]*v[2] + v[3]*v[3]));
255
 }
255
 }
256
 
256
 
257
 
257
 
258
 vec_t helNorm3v(vec3_t v)
258
 vec_t helNorm3v(vec3_t v)
259
 {
259
 {
260
-    return (sqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]));
260
+    return (sqrtf(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]));
261
 }
261
 }
262
 
262
 
263
 
263
 
264
 vec_t helNorm2v(vec2_t v)
264
 vec_t helNorm2v(vec2_t v)
265
 {
265
 {
266
-    return (sqrt(v[0]*v[0] + v[1]*v[1]));
266
+    return (sqrtf(v[0]*v[0] + v[1]*v[1]));
267
 }
267
 }
268
 
268
 
269
 
269
 
270
 vec_t helRandomNum(vec_t from, vec_t to)
270
 vec_t helRandomNum(vec_t from, vec_t to)
271
 {
271
 {
272
-    return from + ((to - from) * rand() / (RAND_MAX + 1.0));
272
+    return from + ((to - from) * rand() / (RAND_MAX + 1.0f));
273
 }
273
 }
274
 
274
 

+ 0
- 10
src/Matrix.cpp Parādīt failu

214
     result[2] = mMatrix[8]*x + mMatrix[9]*y + mMatrix[10]*z + mMatrix[11];
214
     result[2] = mMatrix[8]*x + mMatrix[9]*y + mMatrix[10]*z + mMatrix[11];
215
 }
215
 }
216
 
216
 
217
-void Matrix::multiply4d(double *v, double *result)
218
-{
219
-    double x = v[0], y = v[1], z = v[2], w = v[3];
220
-
221
-    result[0] = mMatrix[ 0]*x + mMatrix[ 1]*y + mMatrix[ 2]*z + mMatrix[ 3]*w;
222
-    result[1] = mMatrix[ 4]*x + mMatrix[ 5]*y + mMatrix[ 6]*z + mMatrix[ 7]*w;
223
-    result[2] = mMatrix[ 8]*x + mMatrix[ 9]*y + mMatrix[10]*z + mMatrix[11]*w;
224
-    result[3] = mMatrix[12]*x + mMatrix[13]*y + mMatrix[14]*z + mMatrix[15]*w;
225
-}
226
-
227
 void Matrix::multiply4v(vec4_t v, vec4_t result)
217
 void Matrix::multiply4v(vec4_t v, vec4_t result)
228
 {
218
 {
229
     vec_t x = v[0], y = v[1], z = v[2], w = v[3];
219
     vec_t x = v[0], y = v[1], z = v[2], w = v[3];

+ 7
- 11
src/Network.cpp Parādīt failu

22
 #include <arpa/inet.h>
22
 #include <arpa/inet.h>
23
 #include <stdlib.h>
23
 #include <stdlib.h>
24
 
24
 
25
+#include <MatMath.h> // Random Number
26
+
25
 //#define LOCAL_BCAST
27
 //#define LOCAL_BCAST
26
 #define MAX_CLIENTS 32
28
 #define MAX_CLIENTS 32
27
 
29
 
126
 
128
 
127
     srand(tv.tv_usec);
129
     srand(tv.tv_usec);
128
 
130
 
129
-    return ((unsigned int)(tv.tv_sec * getRandom(2.0, 3.3) -
130
-                tv.tv_sec * getRandom(1.0, 2.0)) +
131
-            (unsigned int)(tv.tv_usec * getRandom(2.0, 3.3) -
132
-                tv.tv_usec * getRandom(1.0, 2.0)) +
133
-            (unsigned int)getRandom(666.0, 5000.0));
134
-}
135
-
136
-
137
-float Network::getRandom(float from, float to)
138
-{
139
-    return from + (to*rand()/(RAND_MAX+1.0));
131
+    return ((unsigned int)(tv.tv_sec * helRandomNum(2.0f, 3.3f) -
132
+                tv.tv_sec * helRandomNum(1.0f, 2.0f)) +
133
+            (unsigned int)(tv.tv_usec * helRandomNum(2.0f, 3.3f) -
134
+                tv.tv_usec * helRandomNum(1.0f, 2.0f)) +
135
+            (unsigned int)helRandomNum(666.0f, 5000.0f));
140
 }
136
 }
141
 
137
 
142
 
138
 

+ 8
- 8
src/Texture.cpp Parādīt failu

448
 
448
 
449
     for (i = 0; i < count; ++i)
449
     for (i = 0; i < count; ++i)
450
     {
450
     {
451
-        glyph = TTF_RenderGlyph_Blended(font, i + utf8Offset, sdlColor);
451
+        glyph = TTF_RenderGlyph_Blended(font, (Uint16)(i + utf8Offset), sdlColor);
452
 
452
 
453
         if (glyph)
453
         if (glyph)
454
         {
454
         {
455
             image = (unsigned char*)glyph->pixels;
455
             image = (unsigned char*)glyph->pixels;
456
 
456
 
457
-            TTF_GlyphMetrics(font, i + utf8Offset,
457
+            TTF_GlyphMetrics(font, (Uint16)(i + utf8Offset),
458
                     &texture->glyphs[i].minx, &texture->glyphs[i].maxx,
458
                     &texture->glyphs[i].minx, &texture->glyphs[i].maxx,
459
                     &texture->glyphs[i].miny, &texture->glyphs[i].maxy,
459
                     &texture->glyphs[i].miny, &texture->glyphs[i].maxy,
460
                     &texture->glyphs[i].advance);
460
                     &texture->glyphs[i].advance);
886
 
886
 
887
     delete [] swap_row;
887
     delete [] swap_row;
888
 
888
 
889
-    comment_lenght = strlen(comment);
889
+    comment_lenght = (unsigned char)strlen(comment);
890
     colormap_type = 0;
890
     colormap_type = 0;
891
     image_type = 2;
891
     image_type = 2;
892
     colormap_index = 0;
892
     colormap_index = 0;
893
     colormap_lenght = 0;
893
     colormap_lenght = 0;
894
     colormap_bbp = 0;
894
     colormap_bbp = 0;
895
     origin_x = origin_y = 0;
895
     origin_x = origin_y = 0;
896
-    swidth = width;
897
-    sheight = height;
896
+    swidth = (unsigned short)width;
897
+    sheight = (unsigned short)height;
898
     bpp = 24;
898
     bpp = 24;
899
     desc_flags = 32;
899
     desc_flags = 32;
900
 
900
 
1133
 
1133
 
1134
                 for (k = 0; k < components; ++k)
1134
                 for (k = 0; k < components; ++k)
1135
                 {
1135
                 {
1136
-                    s1 = *src00++ * (1.0 - beta) + *src01++ * beta;
1137
-                    s2 = *src10++ * (1.0 - beta) + *src11++ * beta;
1138
-                    *dst++ = s1 * (1.0 - alpha) + s2 * alpha;
1136
+                    s1 = *src00++ * (1.0f - beta) + *src01++ * beta;
1137
+                    s2 = *src10++ * (1.0f - beta) + *src11++ * beta;
1138
+                    *dst++ = s1 * (1.0f - alpha) + s2 * alpha;
1139
                 }
1139
                 }
1140
             }
1140
             }
1141
         }
1141
         }

Notiek ielāde…
Atcelt
Saglabāt