Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
struct BallSocketConstraint : Component
{ // Create constraint between these entities
{
// Create constraint between these entities
EntityID EntityA;
EntityID EntityB;
// The pivot point in local coordinates
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct Bounds : Component
{ //Axis Aligned Bounding Box
{
//Axis Aligned Bounding Box
glm::vec3 Origin;
glm::vec3 VolumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
};
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct BoxShape : Component
{ float Height;
{
float Height;
float Width;
float Depth;
};
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct Camera : Component
{ Camera() : FOV(glm::radians(45.f)), NearClip(0.1f), FarClip(100.f) { }
{
Camera() : FOV(glm::radians(45.f)), NearClip(0.1f), FarClip(100.f) { }
float FOV;
float NearClip;
+2 -1
View File
@@ -9,7 +9,8 @@ namespace Components
{
struct Collision : Component
{ Collision() : Phantom(false), Interested(false) { }
{
Collision() : Phantom(false), Interested(false) { }
bool Phantom;
bool Interested;
+2 -1
View File
@@ -8,7 +8,8 @@ namespace Components
{
struct CustomShape : Component
{ std::string fileName;
{
std::string fileName;
};
}
+2 -1
View File
@@ -8,7 +8,8 @@ namespace Components
{
struct DirectionalLight : Component
{ float Intensity;
{
float Intensity;
float MaxRange;
float SpecularIntensity;
Color Color;
+2 -1
View File
@@ -6,7 +6,8 @@
namespace Components
{
struct FreeSteering : Component
{ float Speed = 35;
{
float Speed = 35;
};
}
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
struct HingeConstraint : Component
{ // Create constraint between these entities
{
// Create constraint between these entities
EntityID EntityA;
EntityID EntityB;
// The pivot point in local coordinates
+2 -1
View File
@@ -11,7 +11,8 @@ namespace Components
{
struct Input : Component
{ std::array<int, GLFW_KEY_LAST+1> KeyState;
{
std::array<int, GLFW_KEY_LAST+1> KeyState;
std::array<int, GLFW_KEY_LAST+1> LastKeyState;
std::array<int, GLFW_MOUSE_BUTTON_LAST+1> MouseState;
std::array<int, GLFW_MOUSE_BUTTON_LAST+1> LastMouseState;
+2 -1
View File
@@ -6,7 +6,8 @@
namespace Components
{
struct MeshShape : Component
{ std::string Filename;
{
std::string Filename;
};
}
+2 -1
View File
@@ -10,7 +10,8 @@ namespace Components
{
struct Model : Component
{ Model() : Visible(true), ShadowCaster(true) { }
{
Model() : Visible(true), ShadowCaster(true) { }
std::string ModelFile;
Color Color;
bool Visible;
+2 -1
View File
@@ -9,7 +9,8 @@ namespace Components
{
struct ParticleEmitter : Component
{ int ParticleTemplate;
{
int ParticleTemplate;
float SpawnFrequency;
int SpawnCount;
std::vector<Color> ColorSpectrum;
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct Physics : Component
{ float Mass = 0;
{
float Mass = 0;
float Friction = 0;
glm::vec3 Gravity = glm::vec3(0, -9.82f, 0);
};
+2 -1
View File
@@ -8,7 +8,8 @@ namespace Components
{
struct PointLight : Component
{ float Intensity;
{
float Intensity;
float MaxRange;
glm::vec3 Specular;
glm::vec3 Diffuse;
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct PowerUp : Component
{ float Speed;
{
float Speed;
};
}
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
// http://bulletphysics.org/mediawiki-1.5.8/index.php/Constraints
struct SliderConstraint : Component
{ // Create constraint between these entities
{
// Create constraint between these entities
EntityID EntityA;
EntityID EntityB;
};
+2 -1
View File
@@ -9,7 +9,8 @@ namespace Components
{
struct SoundEmitter : Component
{ float Gain = 1.f;
{
float Gain = 1.f;
float MaxDistance = 1.f;
float ReferenceDistance = 1.f;
float Pitch = 1.f;
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct SphereShape : Component
{ float Radius;
{
float Radius;
float RollingFriction;
};
+2 -1
View File
@@ -10,7 +10,8 @@ namespace Components
{
struct Sprite : Component
{ std::string SpriteFile;
{
std::string SpriteFile;
Color Color;
};
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct Stat : Component
{ float Health;
{
float Health;
bool Destroyable;
};
+2 -1
View File
@@ -6,7 +6,8 @@
namespace Components
{
struct StaticMeshShape : Component
{ std::string Filename;
{
std::string Filename;
};
}
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Components
{
struct Transform : Component
{ Transform()
{
Transform()
: Scale(glm::vec3(1.f)) { }
glm::vec3 Position;