rayzor

diff src/material.h @ 22:5380ff64e83f

minor changes from dos, and line endings cleanup
author John Tsiombikas <nuclear@member.fsf.org>
date Fri, 02 May 2014 14:32:58 +0300
parents 79609d482762
children
line diff
     1.1 --- a/src/material.h	Tue Apr 15 20:52:05 2014 +0300
     1.2 +++ b/src/material.h	Fri May 02 14:32:58 2014 +0300
     1.3 @@ -1,22 +1,22 @@
     1.4 -#ifndef MATERIAL_H_
     1.5 -#define MATERIAL_H_
     1.6 -
     1.7 -#include "vmath.h"
     1.8 -
     1.9 -class Material {
    1.10 -public:
    1.11 -	Vector3 diffuse, specular;
    1.12 -	float roughness;
    1.13 -	float reflect, refract;
    1.14 -	float ior;
    1.15 -
    1.16 -	Material()
    1.17 -		: diffuse(0.75, 0.75, 0.75), specular(1, 1, 1)
    1.18 -	{
    1.19 -		roughness = 1.0;
    1.20 -		reflect = refract = 0.0;
    1.21 -		ior = 1.0;
    1.22 -	}
    1.23 -};
    1.24 -
    1.25 -#endif	// MATERIAL_H_
    1.26 +#ifndef MATERIAL_H_
    1.27 +#define MATERIAL_H_
    1.28 +
    1.29 +#include "vmath.h"
    1.30 +
    1.31 +class Material {
    1.32 +public:
    1.33 +	Vector3 diffuse, specular;
    1.34 +	float roughness;
    1.35 +	float reflect, refract;
    1.36 +	float ior;
    1.37 +
    1.38 +	Material()
    1.39 +		: diffuse(0.75, 0.75, 0.75), specular(1, 1, 1)
    1.40 +	{
    1.41 +		roughness = 1.0;
    1.42 +		reflect = refract = 0.0;
    1.43 +		ior = 1.0;
    1.44 +	}
    1.45 +};
    1.46 +
    1.47 +#endif	// MATERIAL_H_