From a71562bd833f57337b885de9025335f9c3fa8876 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Wed, 30 May 2012 17:59:12 +0000 Subject: [PATCH] core: rename f64vec4 to dvec4 etc. for consistency with GLSL. --- src/gpu/vertexbuffer.h | 4 ++-- src/lol/math/vector.h | 2 +- test/tutorial/03_fractal.cpp | 38 ++++++++++++++++++------------------ test/unit/build.cpp | 12 ++++++------ 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/gpu/vertexbuffer.h b/src/gpu/vertexbuffer.h index d942356d..f7203cee 100644 --- a/src/gpu/vertexbuffer.h +++ b/src/gpu/vertexbuffer.h @@ -83,7 +83,7 @@ protected: Typevoid = 0, Typehalf, Typef16vec2, Typef16vec3, Typef16vec4, Typefloat, Typevec2, Typevec3, Typevec4, - Typedouble, Typef64vec2, Typef64vec3, Typef64vec4, + Typedouble, Typedvec2, Typedvec3, Typedvec4, Typeint8_t, Typei8vec2, Typei8vec3, Typei8vec4, Typeuint8_t, Typeu8vec2, Typeu8vec3, Typeu8vec4, Typeint16_t, Typei16vec2, Typei16vec3, Typei16vec4, @@ -98,7 +98,7 @@ protected: LOL_TYPE(void) LOL_TYPE(half) LOL_TYPE(f16vec2) LOL_TYPE(f16vec3) LOL_TYPE(f16vec4) LOL_TYPE(float) LOL_TYPE(vec2) LOL_TYPE(vec3) LOL_TYPE(vec4) - LOL_TYPE(double) LOL_TYPE(f64vec2) LOL_TYPE(f64vec3) LOL_TYPE(f64vec4) + LOL_TYPE(double) LOL_TYPE(dvec2) LOL_TYPE(dvec3) LOL_TYPE(dvec4) LOL_TYPE(uint8_t) LOL_TYPE(u8vec2) LOL_TYPE(u8vec3) LOL_TYPE(u8vec4) LOL_TYPE(int8_t) LOL_TYPE(i8vec2) LOL_TYPE(i8vec3) LOL_TYPE(i8vec4) LOL_TYPE(uint16_t) LOL_TYPE(u16vec2) LOL_TYPE(u16vec3) LOL_TYPE(u16vec4) diff --git a/src/lol/math/vector.h b/src/lol/math/vector.h index 617480ea..51a74f5f 100644 --- a/src/lol/math/vector.h +++ b/src/lol/math/vector.h @@ -43,7 +43,7 @@ namespace lol template struct tname; \ typedef tname f16##suffix; \ typedef tname suffix; \ - typedef tname f64##suffix; \ + typedef tname d##suffix; \ typedef tname i8##suffix; \ typedef tname u8##suffix; \ typedef tname i16##suffix; \ diff --git a/test/tutorial/03_fractal.cpp b/test/tutorial/03_fractal.cpp index 3d6005ce..0561a973 100644 --- a/test/tutorial/03_fractal.cpp +++ b/test/tutorial/03_fractal.cpp @@ -99,9 +99,9 @@ public: m_dirty[i] = 2; } #if defined __CELLOS_LV2__ || defined _XBOX - //m_center = f64cmplx(-.22815528839841, -1.11514249704382); - //m_center = f64cmplx(0.001643721971153, 0.822467633298876); - m_center = f64cmplx(-0.65823419062254, 0.50221777363480); + //m_center = dcmplx(-.22815528839841, -1.11514249704382); + //m_center = dcmplx(0.001643721971153, 0.822467633298876); + m_center = dcmplx(-0.65823419062254, 0.50221777363480); m_zoom_speed = -0.025; #else m_center = -0.75; @@ -187,20 +187,20 @@ public: delete m_palette; } - inline f64cmplx TexelToWorldOffset(vec2 texel) + inline dcmplx TexelToWorldOffset(vec2 texel) { double dx = (0.5 + texel.x - m_size.x / 2) * m_texel2world.x; double dy = (0.5 + m_size.y / 2 - texel.y) * m_texel2world.y; - return m_radius * f64cmplx(dx, dy); + return m_radius * dcmplx(dx, dy); } - inline f64cmplx ScreenToWorldOffset(vec2 pixel) + inline dcmplx ScreenToWorldOffset(vec2 pixel) { /* No 0.5 offset here, because we want to be able to position the * mouse at (0,0) exactly. */ double dx = pixel.x - m_window_size.x / 2; double dy = m_window_size.y / 2 - pixel.y; - return m_radius * m_window2world * f64cmplx(dx, dy); + return m_radius * m_window2world * dcmplx(dx, dy); } virtual void TickGame(float seconds) @@ -210,7 +210,7 @@ public: int prev_frame = m_frame; m_frame = (m_frame + 1) % 4; - f64cmplx worldmouse = m_center + ScreenToWorldOffset(m_mousepos); + dcmplx worldmouse = m_center + ScreenToWorldOffset(m_mousepos); ivec3 buttons = Input::GetMouseButtons(); #if !defined __CELLOS_LV2__ && !defined _XBOX @@ -259,7 +259,7 @@ public: if (m_zoom_speed || m_translate != 0.0) { - f64cmplx oldcenter = m_center; + dcmplx oldcenter = m_center; double oldradius = m_radius; double zoom = pow(2.0, seconds * 1e3f * m_zoom_speed); if (m_radius * zoom > 8.0) @@ -369,13 +369,13 @@ public: for (int j = jmin; j < jmax; j += 2) for (int i = m_frame % 2; i < m_size.x; i += 2) { - f64cmplx z0 = m_center + TexelToWorldOffset(ivec2(i, j)); - f64cmplx z1, z2, z3, r0 = z0; - //f64cmplx r0(0.28693186889504513, 0.014286693904085048); - //f64cmplx r0(0.001643721971153, 0.822467633298876); - //f64cmplx r0(-1.207205434596, 0.315432814901); - //f64cmplx r0(-0.79192956889854, -0.14632423080102); - //f64cmplx r0(0.3245046418497685, 0.04855101129280834); + dcmplx z0 = m_center + TexelToWorldOffset(ivec2(i, j)); + dcmplx z1, z2, z3, r0 = z0; + //dcmplx r0(0.28693186889504513, 0.014286693904085048); + //dcmplx r0(0.001643721971153, 0.822467633298876); + //dcmplx r0(-1.207205434596, 0.315432814901); + //dcmplx r0(-0.79192956889854, -0.14632423080102); + //dcmplx r0(0.3245046418497685, 0.04855101129280834); int iter = MAX_ITERATIONS - 4; for (;;) { @@ -600,7 +600,7 @@ private: ivec2 m_size, m_window_size, m_oldmouse; double m_window2world; - f64vec2 m_texel2world; + dvec2 m_texel2world; u8vec4 *m_pixels, *m_tmppixels, *m_palette; Shader *m_shader; @@ -619,11 +619,11 @@ private: int m_frame, m_slices, m_dirty[4]; bool m_ready, m_drag; - f64cmplx m_center, m_translate; + dcmplx m_center, m_translate; double m_zoom_speed, m_radius; vec4 m_texel_settings, m_screen_settings; mat4 m_zoom_settings; - f64cmplx m_deltashift[4]; + dcmplx m_deltashift[4]; double m_deltascale[4]; /* Worker threads */ diff --git a/test/unit/build.cpp b/test/unit/build.cpp index 3a313110..ae78dd2f 100644 --- a/test/unit/build.cpp +++ b/test/unit/build.cpp @@ -50,13 +50,13 @@ LOLUNIT_FIXTURE(BuildTest) { LOLUNIT_ASSERT_EQUAL(sizeof(double), 8); - LOLUNIT_ASSERT_EQUAL(sizeof(f64vec2), 16); - LOLUNIT_ASSERT_EQUAL(sizeof(f64vec3), 24); - LOLUNIT_ASSERT_EQUAL(sizeof(f64vec4), 32); + LOLUNIT_ASSERT_EQUAL(sizeof(dvec2), 16); + LOLUNIT_ASSERT_EQUAL(sizeof(dvec3), 24); + LOLUNIT_ASSERT_EQUAL(sizeof(dvec4), 32); - LOLUNIT_ASSERT_EQUAL(sizeof(f64mat2), 32); - LOLUNIT_ASSERT_EQUAL(sizeof(f64mat3), 72); - LOLUNIT_ASSERT_EQUAL(sizeof(f64mat4), 128); + LOLUNIT_ASSERT_EQUAL(sizeof(dmat2), 32); + LOLUNIT_ASSERT_EQUAL(sizeof(dmat3), 72); + LOLUNIT_ASSERT_EQUAL(sizeof(dmat4), 128); } LOLUNIT_TEST(TypeSizeInt8)