Changeset 1426
- Timestamp:
- May 30, 2012, 7:59:12 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/gpu/vertexbuffer.h
r1251 r1426 84 84 Typehalf, Typef16vec2, Typef16vec3, Typef16vec4, 85 85 Typefloat, Typevec2, Typevec3, Typevec4, 86 Typedouble, Type f64vec2, Typef64vec3, Typef64vec4,86 Typedouble, Typedvec2, Typedvec3, Typedvec4, 87 87 Typeint8_t, Typei8vec2, Typei8vec3, Typei8vec4, 88 88 Typeuint8_t, Typeu8vec2, Typeu8vec3, Typeu8vec4, … … 99 99 LOL_TYPE(half) LOL_TYPE(f16vec2) LOL_TYPE(f16vec3) LOL_TYPE(f16vec4) 100 100 LOL_TYPE(float) LOL_TYPE(vec2) LOL_TYPE(vec3) LOL_TYPE(vec4) 101 LOL_TYPE(double) LOL_TYPE( f64vec2) LOL_TYPE(f64vec3) LOL_TYPE(f64vec4)101 LOL_TYPE(double) LOL_TYPE(dvec2) LOL_TYPE(dvec3) LOL_TYPE(dvec4) 102 102 LOL_TYPE(uint8_t) LOL_TYPE(u8vec2) LOL_TYPE(u8vec3) LOL_TYPE(u8vec4) 103 103 LOL_TYPE(int8_t) LOL_TYPE(i8vec2) LOL_TYPE(i8vec3) LOL_TYPE(i8vec4) -
trunk/src/lol/math/vector.h
r1405 r1426 44 44 typedef tname<half> f16##suffix; \ 45 45 typedef tname<float> suffix; \ 46 typedef tname<double> f64##suffix; \46 typedef tname<double> d##suffix; \ 47 47 typedef tname<int8_t> i8##suffix; \ 48 48 typedef tname<uint8_t> u8##suffix; \ -
trunk/test/tutorial/03_fractal.cpp
r1392 r1426 100 100 } 101 101 #if defined __CELLOS_LV2__ || defined _XBOX 102 //m_center = f64cmplx(-.22815528839841, -1.11514249704382);103 //m_center = f64cmplx(0.001643721971153, 0.822467633298876);104 m_center = f64cmplx(-0.65823419062254, 0.50221777363480);102 //m_center = dcmplx(-.22815528839841, -1.11514249704382); 103 //m_center = dcmplx(0.001643721971153, 0.822467633298876); 104 m_center = dcmplx(-0.65823419062254, 0.50221777363480); 105 105 m_zoom_speed = -0.025; 106 106 #else … … 188 188 } 189 189 190 inline f64cmplx TexelToWorldOffset(vec2 texel)190 inline dcmplx TexelToWorldOffset(vec2 texel) 191 191 { 192 192 double dx = (0.5 + texel.x - m_size.x / 2) * m_texel2world.x; 193 193 double dy = (0.5 + m_size.y / 2 - texel.y) * m_texel2world.y; 194 return m_radius * f64cmplx(dx, dy);194 return m_radius * dcmplx(dx, dy); 195 195 } 196 196 197 inline f64cmplx ScreenToWorldOffset(vec2 pixel)197 inline dcmplx ScreenToWorldOffset(vec2 pixel) 198 198 { 199 199 /* No 0.5 offset here, because we want to be able to position the … … 201 201 double dx = pixel.x - m_window_size.x / 2; 202 202 double dy = m_window_size.y / 2 - pixel.y; 203 return m_radius * m_window2world * f64cmplx(dx, dy);203 return m_radius * m_window2world * dcmplx(dx, dy); 204 204 } 205 205 … … 211 211 m_frame = (m_frame + 1) % 4; 212 212 213 f64cmplx worldmouse = m_center + ScreenToWorldOffset(m_mousepos);213 dcmplx worldmouse = m_center + ScreenToWorldOffset(m_mousepos); 214 214 215 215 ivec3 buttons = Input::GetMouseButtons(); … … 260 260 if (m_zoom_speed || m_translate != 0.0) 261 261 { 262 f64cmplx oldcenter = m_center;262 dcmplx oldcenter = m_center; 263 263 double oldradius = m_radius; 264 264 double zoom = pow(2.0, seconds * 1e3f * m_zoom_speed); … … 370 370 for (int i = m_frame % 2; i < m_size.x; i += 2) 371 371 { 372 f64cmplx z0 = m_center + TexelToWorldOffset(ivec2(i, j));373 f64cmplx z1, z2, z3, r0 = z0;374 // f64cmplx r0(0.28693186889504513, 0.014286693904085048);375 // f64cmplx r0(0.001643721971153, 0.822467633298876);376 // f64cmplx r0(-1.207205434596, 0.315432814901);377 // f64cmplx r0(-0.79192956889854, -0.14632423080102);378 // f64cmplx r0(0.3245046418497685, 0.04855101129280834);372 dcmplx z0 = m_center + TexelToWorldOffset(ivec2(i, j)); 373 dcmplx z1, z2, z3, r0 = z0; 374 //dcmplx r0(0.28693186889504513, 0.014286693904085048); 375 //dcmplx r0(0.001643721971153, 0.822467633298876); 376 //dcmplx r0(-1.207205434596, 0.315432814901); 377 //dcmplx r0(-0.79192956889854, -0.14632423080102); 378 //dcmplx r0(0.3245046418497685, 0.04855101129280834); 379 379 int iter = MAX_ITERATIONS - 4; 380 380 for (;;) … … 601 601 ivec2 m_size, m_window_size, m_oldmouse; 602 602 double m_window2world; 603 f64vec2 m_texel2world;603 dvec2 m_texel2world; 604 604 u8vec4 *m_pixels, *m_tmppixels, *m_palette; 605 605 … … 620 620 bool m_ready, m_drag; 621 621 622 f64cmplx m_center, m_translate;622 dcmplx m_center, m_translate; 623 623 double m_zoom_speed, m_radius; 624 624 vec4 m_texel_settings, m_screen_settings; 625 625 mat4 m_zoom_settings; 626 f64cmplx m_deltashift[4];626 dcmplx m_deltashift[4]; 627 627 double m_deltascale[4]; 628 628 -
trunk/test/unit/build.cpp
r1395 r1426 51 51 LOLUNIT_ASSERT_EQUAL(sizeof(double), 8); 52 52 53 LOLUNIT_ASSERT_EQUAL(sizeof( f64vec2), 16);54 LOLUNIT_ASSERT_EQUAL(sizeof( f64vec3), 24);55 LOLUNIT_ASSERT_EQUAL(sizeof( f64vec4), 32);53 LOLUNIT_ASSERT_EQUAL(sizeof(dvec2), 16); 54 LOLUNIT_ASSERT_EQUAL(sizeof(dvec3), 24); 55 LOLUNIT_ASSERT_EQUAL(sizeof(dvec4), 32); 56 56 57 LOLUNIT_ASSERT_EQUAL(sizeof( f64mat2), 32);58 LOLUNIT_ASSERT_EQUAL(sizeof( f64mat3), 72);59 LOLUNIT_ASSERT_EQUAL(sizeof( f64mat4), 128);57 LOLUNIT_ASSERT_EQUAL(sizeof(dmat2), 32); 58 LOLUNIT_ASSERT_EQUAL(sizeof(dmat3), 72); 59 LOLUNIT_ASSERT_EQUAL(sizeof(dmat4), 128); 60 60 } 61 61
Note: See TracChangeset
for help on using the changeset viewer.