Skip to content

Commit 94c3b72

Browse files
committed
Added emission, fixed BVH crash bug. Finished save system optics integration. Other smaller changes and additions
1 parent c3c768e commit 94c3b72

File tree

15 files changed

+1224
-305
lines changed

15 files changed

+1224
-305
lines changed

GalaxyEngine/include/Particles/particlesSpawning.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,11 @@ class ParticlesSpawning {
3535

3636
void particlesInitialConditions(Quadtree* quadtree, Physics& physics, UpdateVariables& myVar, UpdateParameters& myParam);
3737

38-
void copyPaste(std::vector<ParticlePhysics>& pParticles, std::vector<ParticleRendering>& rParticles,
39-
bool& isDragging, SceneCamera& myCamera, std::vector<ParticlePhysics>& pParticlesSelected, Physics& physics,
40-
UpdateVariables& myVar, UpdateParameters& myParam);
41-
4238
void predictTrajectory(const std::vector<ParticlePhysics>& actualParticles,
4339
SceneCamera& myCamera, Physics physics,
4440
Quadtree* quadtree, UpdateVariables& myVar, Slingshot& slingshot);
4541

4642
private:
47-
glm::vec2 avgPos = { 0.0f, 0.0f };
48-
std::vector<ParticlePhysics> pParticlesCopied;
49-
std::vector<ParticleRendering> rParticlesCopied;
50-
51-
std::vector<ParticleConstraint> constraintsCopied;
5243

5344
float heavyParticleInitMass = 300000000000000.0f;
5445
};

0 commit comments

Comments
 (0)