-
Notifications
You must be signed in to change notification settings - Fork 0
/
diff.txt
263 lines (239 loc) · 21.9 KB
/
diff.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
diff --git a/Chapter 3 DOD/Components.h b/Chapter 3 DOD/Components.h
index 2776781..c933c47 100644
--- a/Chapter 3 DOD/Components.h
+++ b/Chapter 3 DOD/Components.h
@@ -1,5 +1,6 @@
#pragma once
#include <vector>
+#include <set>
#include "Math.h"
struct SpriteData {
@@ -38,17 +39,18 @@ struct CircleData {
struct ShootData {
int shootKey;
- float shootCooldown;
+ float shootCooldown = 0.0f;
};
struct EntityIndices {
int shipIndex = 0;
+ int shipOffset = 1;
size_t asteroidOffset = 1;
- size_t laserOffset = 1; // ship it's index 0
std::vector<int> asteroidIndices;
std::vector<int> laserIndices;
- std::vector<int> destroyAsteroidIndices;
- std::vector<int> destroyLaserIndices;
+ std::vector<int> freeLaserIndices;
+ std::set<int> destroyAsteroidIndices;
+ std::set<int> destroyLaserIndices;
};
struct Registry {
diff --git a/Chapter 3 DOD/Game.cpp b/Chapter 3 DOD/Game.cpp
index f4fb447..80ecac9 100644
--- a/Chapter 3 DOD/Game.cpp
+++ b/Chapter 3 DOD/Game.cpp
@@ -102,7 +102,8 @@ void Update(GameData& gd, Registry& r)
UpdateGame(r, deltaTime);
- CollisionSystem(r, deltaTime);
+ CollisionSystem(r, deltaTime);
+ RemoveEntities(r);
}
void GenerateOutput(GameData& gd, Registry& r)
@@ -177,26 +178,42 @@ void LoadData(GameData& gd, Registry& r)
r.entityIndices.shipIndex = 0;
+ SDL_Texture* asteroidTex = GetTexture("Assets/Asteroid.png", gd.renderer);
+ SDL_QueryTexture(asteroidTex, nullptr, nullptr, &width, &height);
const int numAsteroids = 20;
for (int i = 0; i < numAsteroids; ++i) {
- SDL_Texture* asteroidTex = GetTexture("Assets/Asteroid.png", gd.renderer);
- SDL_QueryTexture(asteroidTex, nullptr, nullptr, &width, &height);
-
- spriteData.textures.push_back(asteroidTex);
- spriteData.texWidths.push_back(width);
- spriteData.texHeights.push_back(height);
+ spriteData.textures.emplace_back(asteroidTex);
+ spriteData.texWidths.emplace_back(width);
+ spriteData.texHeights.emplace_back(height);
Vector2 randPos = Random::GetVector(Vector2::Zero, Vector2(1024.0f, 768.0f));
- r.transformData.pos.push_back({ randPos.x,randPos.y });
- r.transformData.rot.push_back(Random::GetFloatRange(0.0f, Math::TwoPi));
+ r.transformData.pos.emplace_back( randPos.x,randPos.y );
+ r.transformData.rot.emplace_back(Random::GetFloatRange(0.0f, Math::TwoPi));
+
+ r.moveData.angularSpeed.emplace_back(0.0f);
+ r.moveData.forwardSpeed.emplace_back(150.0f);
- r.moveData.angularSpeed.push_back(0.0f);
- r.moveData.forwardSpeed.push_back(150.0f);
+ r.circleData.radius.emplace_back(40.0f);
- r.circleData.radius.push_back(40.0f);
+ r.entityIndices.asteroidIndices.emplace_back(i);
+ r.entityIndices.asteroidOffset++;
+ }
- r.entityIndices.asteroidIndices.push_back(i + 1); // Ship is at 0, asteroids start at 1
- r.entityIndices.laserOffset++;
+ SDL_Texture* laser_tex = GetTexture("Assets/Laser.png", gd.renderer);
+ SDL_QueryTexture(laser_tex, nullptr, nullptr, &width, &height);
+ const int numLasers = 23;
+ for (int i = 0; i < numLasers; ++i)
+ {
+ r.moveData.angularSpeed.emplace_back(0.0f);
+ r.moveData.forwardSpeed.emplace_back(800.0f);
+ r.transformData.pos.emplace_back(0,0);
+ r.transformData.rot.emplace_back(0);
+ r.laserData.life.emplace_back(0);
+ r.laserData.radius.emplace_back(0);
+ r.spriteData.textures.emplace_back(laser_tex);
+ r.spriteData.texWidths.emplace_back(width);
+ r.spriteData.texHeights.emplace_back(height);
+ r.entityIndices.freeLaserIndices.emplace_back(i);
}
}
diff --git a/Chapter 3 DOD/Systems.cpp b/Chapter 3 DOD/Systems.cpp
index 1a92f75..c075d5d 100644
--- a/Chapter 3 DOD/Systems.cpp
+++ b/Chapter 3 DOD/Systems.cpp
@@ -29,22 +29,17 @@ void ProcessInput(Registry& r, const Uint8* state)
void ShootingSystem(Registry& r, SDL_Renderer* renderer, const Uint8* state) {
if(state[r.shootData.shootKey] && r.shootData.shootCooldown < 0.0f) {
- // laserIndicesStart = player + asteroidCount
+
const auto& shipPos = r.transformData.pos[r.entityIndices.shipIndex];
const auto& shipRot = r.transformData.rot[r.entityIndices.shipIndex];
- r.entityIndices.laserIndices.emplace_back(21 + static_cast<int>(r.entityIndices.laserIndices.size()));
- r.moveData.angularSpeed.emplace_back(0.0f);
- r.moveData.forwardSpeed.emplace_back(800.0f);
- r.transformData.pos.emplace_back(shipPos.x, shipPos.y);
- r.transformData.rot.emplace_back(shipRot);
- r.laserData.life.emplace_back(11.0f);
- r.laserData.radius.emplace_back(1.0f);
- SDL_Texture* tex = GetTexture("Assets/Laser.png", renderer);
- int width, height;
- SDL_QueryTexture(tex,nullptr,nullptr,&width,&height);
- r.spriteData.textures.emplace_back(tex);
- r.spriteData.texWidths.emplace_back(width);
- r.spriteData.texHeights.emplace_back(height);
+
+ int index = r.entityIndices.freeLaserIndices.back();
+ r.entityIndices.freeLaserIndices.pop_back();
+ int transformIndex = index + r.entityIndices.asteroidOffset;
+ r.entityIndices.laserIndices.push_back(index);
+ r.transformData.pos[transformIndex] = shipPos;
+ r.transformData.rot[transformIndex] = shipRot;
+ r.laserData.life[index] = 11.0f;
r.shootData.shootCooldown = 0.5f;
}
}
@@ -53,12 +48,19 @@ void UpdateGame(Registry& r, float deltaTime)
{
r.shootData.shootCooldown -= deltaTime;
+ for (const auto& laserIndex : r.entityIndices.laserIndices) {
+ r.laserData.life[laserIndex] -= deltaTime;
+ if (r.laserData.life[laserIndex] < 0.0f) {
+ r.entityIndices.destroyLaserIndices.emplace(laserIndex);
+ }
+ }
+
for (size_t i = 0; i < r.moveData.angularSpeed.size(); ++i) {
- if (!Math::NearZero(r.moveData.angularSpeed[i])) {
+ if (not Math::NearZero(r.moveData.angularSpeed[i])) {
r.transformData.rot[i] += r.moveData.angularSpeed[i] * deltaTime;
}
- if (!Math::NearZero(r.moveData.forwardSpeed[i])) {
+ if (not Math::NearZero(r.moveData.forwardSpeed[i])) {
Vector2 pos(r.transformData.pos[i].x, r.transformData.pos[i].y);
Vector2 forward(Math::Cos(r.transformData.rot[i]), -Math::Sin(r.transformData.rot[i]));
@@ -74,8 +76,9 @@ void UpdateGame(Registry& r, float deltaTime)
}
}
-void RenderSprite(size_t index, Registry& r, SDL_Renderer* renderer) {
+void RenderSprite(size_t index, int indexOffset, Registry& r, SDL_Renderer* renderer) {
SDL_Rect rec;
+ index += indexOffset;
rec.w = static_cast<int>(r.spriteData.texWidths[index]);
rec.h = static_cast<int>(r.spriteData.texHeights[index]);
rec.x = static_cast<int>(r.transformData.pos[index].x - rec.w / 2);
@@ -87,14 +90,14 @@ void RenderGame(SDL_Renderer* renderer, Registry& r) {
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
SDL_RenderClear(renderer);
- RenderSprite(r.entityIndices.shipIndex, r, renderer);
+ RenderSprite(r.entityIndices.shipIndex,0, r, renderer);
for (size_t asteroidIndex : r.entityIndices.asteroidIndices)
{
- RenderSprite(asteroidIndex, r, renderer);
+ RenderSprite(asteroidIndex, 1, r, renderer);
}
for (size_t laserIndex : r.entityIndices.laserIndices) {
- RenderSprite(laserIndex, r, renderer);
+ RenderSprite(laserIndex, r.entityIndices.asteroidOffset, r, renderer);
}
SDL_RenderPresent(renderer);
}
@@ -102,33 +105,51 @@ void RenderGame(SDL_Renderer* renderer, Registry& r) {
void CollisionSystem(Registry& r, float deltaTime)
{
r.shootData.shootCooldown -= deltaTime;
- for (size_t laserIdx = 0; laserIdx <r.entityIndices.laserIndices.size(); ++laserIdx) {
- size_t laserIndex = r.entityIndices.laserIndices[laserIdx];
- size_t laserDataIndex = laserIndex - r.entityIndices.laserOffset;
- float laserX = r.transformData.pos[laserIndex].x;
- float laserY = r.transformData.pos[laserIndex].y;
- float laserRadius = r.laserData.radius[laserDataIndex];
-
- for (size_t asteroidIdx = 0; asteroidIdx <r.entityIndices.asteroidIndices.size(); ++asteroidIdx) {
- int asteroidEntity = r.entityIndices.asteroidIndices[asteroidIdx];
- size_t circleDataIndex = asteroidEntity - r.entityIndices.asteroidOffset;
- float asteroidX = r.transformData.pos[asteroidEntity].x;
- float asteroidY = r.transformData.pos[asteroidEntity].y;
- float asteroidRadius = r.circleData.radius[circleDataIndex];
+ for (const auto& laserIndex : r.entityIndices.laserIndices) {
+ int transformIndex = laserIndex + r.entityIndices.asteroidOffset;
+ float laserX = r.transformData.pos[transformIndex].x;
+ float laserY = r.transformData.pos[transformIndex].y;
+ float laserRadius = r.laserData.radius[laserIndex];
+
+ for (const auto& asteroidEntityIndex : r.entityIndices.asteroidIndices) {
+ size_t asteroidTransformIndex = asteroidEntityIndex + r.entityIndices.shipOffset;
+ float asteroidX = r.transformData.pos[asteroidTransformIndex].x;
+ float asteroidY = r.transformData.pos[asteroidTransformIndex].y;
+ float asteroidRadius = r.circleData.radius[asteroidEntityIndex];
float distSq = (laserX - asteroidX) * (laserX - asteroidX) + (laserY - asteroidY) * (laserY - asteroidY);
float radiiSq = (laserRadius + asteroidRadius) * (laserRadius + asteroidRadius);
if (distSq <= radiiSq) {
- r.entityIndices.destroyAsteroidIndices.push_back(asteroidIdx);
- r.entityIndices.destroyLaserIndices.push_back(laserIdx);
- break;
+ r.entityIndices.destroyAsteroidIndices.emplace(asteroidEntityIndex);
+ r.entityIndices.destroyLaserIndices.emplace(laserIndex);
+ break;
}
}
}
}
-void RemoveEntities(Registry& r)
+void RemoveEntities(Registry& r)
{
- // std::sort(entityIndices.destroyIndices.rbegin(),r.entityIndices.destroyIndices.rend());
-}
+ for (const auto& find_index : r.entityIndices.destroyLaserIndices)
+ {
+ auto it = std::find(r.entityIndices.laserIndices.begin(), r.entityIndices.laserIndices.end(), find_index);
+ if (it != r.entityIndices.laserIndices.end())
+ {
+ r.entityIndices.freeLaserIndices.push_back(*it);
+ r.entityIndices.laserIndices.erase(it);
+ }
+ }
+
+ for (const auto& find_index : r.entityIndices.destroyAsteroidIndices)
+ {
+ auto it = std::find(r.entityIndices.asteroidIndices.begin(), r.entityIndices.asteroidIndices.end(), find_index);
+ if (it != r.entityIndices.asteroidIndices.end())
+ {
+ r.entityIndices.asteroidIndices.erase(it);
+ }
+ }
+
+ r.entityIndices.destroyLaserIndices.clear();
+ r.entityIndices.destroyAsteroidIndices.clear();
+}
\ No newline at end of file