Changeset 295
- Timestamp:
- Jan 26, 2011, 5:48:40 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/deushax/debugsprite.cpp
r294 r295 25 25 Game *game; 26 26 int tiler; 27 float x, y, z;27 float3 pos; 28 28 }; 29 29 … … 39 39 data->tiler = Tiler::Register("art/test/character-dress.png", 40 40 32, 32, sqrtf(2)); 41 data->x = 320; 42 data->y = 206; 43 data->z = 0; 41 data->pos = float3(320, 206, 0); 44 42 } 45 43 … … 48 46 Entity::TickGame(deltams); 49 47 50 float2 axis = Input::GetAxis(0); 51 data->x += 0.1f * sqrtf(2.0f) * deltams * axis.x; 52 data->y += 0.1f * deltams * axis.y; 48 float3 move = deltams * 0.1f * (float3)Input::GetAxis(0); 49 data->pos = data->pos + move * float3(sqrtf(2.0f), 1.0f, 1.0f); 53 50 } 54 51 … … 57 54 Entity::TickDraw(deltams); 58 55 59 int x = data->x; 60 int y = data->y; 61 int z = data->z; 56 int3 pos = (int3)data->pos; 62 57 63 58 Scene::GetDefault()->AddTile((data->tiler << 16) | 31, 64 x - 16, y,z, 1);59 pos.x - 16, pos.y, pos.z, 1); 65 60 Scene::GetDefault()->AddTile((data->tiler << 16) | 15, 66 x - 16, y,z + 32, 1);61 pos.x - 16, pos.y, pos.z + 32, 1); 67 62 } 68 63 -
trunk/monsterz/board.cpp
r294 r295 70 70 data->whip = Sampler::Register(WAV_WHIP); 71 71 72 data->emitter = new Emitter(data->tiles, float3(0, -0.0003 , 0));72 data->emitter = new Emitter(data->tiles, float3(0, -0.0003f, 0)); 73 73 Ticker::Ref(data->emitter); 74 74 … … 113 113 int id = 110 + 20 * (rand() % 7); 114 114 float3 pos(RandF(500.0f), RandF(500.0f), 8.0f); 115 float3 vel(RandF(-0.1 , 0.1f), RandF(0.05f, 0.1f), 0.0f);115 float3 vel(RandF(-0.1f, 0.1f), RandF(0.05f, 0.1f), 0.0f); 116 116 data->emitter->AddParticle(id, pos, vel); 117 117 } -
trunk/src/input.cpp
r294 r295 58 58 f.y += up; 59 59 if (left && up) 60 { 61 f.x *= invsqrt2; 62 f.y *= invsqrt2; 63 } 60 f = f * invsqrt2; 64 61 65 62 return f; -
trunk/src/matrix.h
r294 r295 47 47 } 48 48 49 #define CAST_OP(elems, dest) \ 50 inline operator Vec##dest<T>() const \ 51 { \ 52 Vec##dest<T> ret; \ 53 for (int n = 0; n < elems && n < dest; n++) \ 54 ret[n] = (*this)[n]; \ 55 return ret; \ 56 } 57 49 58 #define OPERATORS(elems) \ 50 59 inline T& operator[](int n) { return *(&x + n); } \ … … 63 72 SCALAR_OP(elems, *) \ 64 73 SCALAR_OP(elems, /) \ 74 \ 75 CAST_OP(elems, 2) \ 76 CAST_OP(elems, 3) \ 77 CAST_OP(elems, 4) \ 65 78 \ 66 79 template<typename U> \ … … 85 98 return sqrtf((float)sqlen()); \ 86 99 } 100 101 template <typename T> struct Vec2; 102 template <typename T> struct Vec3; 103 template <typename T> struct Vec4; 87 104 88 105 template <typename T> struct Vec2
Note: See TracChangeset
for help on using the changeset viewer.