Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-03 16:31:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #573 from ey6es/opencv

Browse source 
Fixed pointer warning, reordered #includes.
This commit is contained in:
Andrzej Kapolka 2013-06-21 14:41:23 -07:00
commit 81d0373bdc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/Balls.cpp
View file

@ -12,11 +12,11 @@
#include <glm/glm.hpp>
#include <SharedUtil.h>
#include <Util.h>
#include "world.h"
#include "InterfaceConfig.h"
#include "Balls.h"
#include "InterfaceConfig.h"
#include "Util.h"
#include "world.h"
const float INITIAL_AREA = 0.2f;
const float BALL_RADIUS = 0.025f;
@ -31,7 +31,7 @@ Balls::Balls(int numberOfBalls) {
_balls[i].velocity = glm::vec3(0, 0, 0);
_balls[i].radius = BALL_RADIUS;
for (unsigned int j = 0; j < NUMBER_SPRINGS; ++j) {
_balls[i].links[j] = NULL;
_balls[i].links[j] = 0;
}
}
_color = INITIAL_COLOR;