Revision: 40888
http://brlcad.svn.sourceforge.net/brlcad/?rev=40888&view=rev
Author: davidloman
Date: 2010-10-01 15:56:52 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
WS, Formatting, include organization, double newline removal, etc.
Modified Paths:
--------------
rt^3/trunk/src/GE/GED.h
rt^3/trunk/src/GE/GeometryEngine.cxx
rt^3/trunk/src/GE/GeometryEngine.h
rt^3/trunk/src/GE/libGeometry/DXFFileParser.cxx
rt^3/trunk/src/GE/libGeometry/DXFFileParser.h
rt^3/trunk/src/GE/libGeometry/Geometry.h
rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx
rt^3/trunk/src/GE/libGeometry/NFFFileParser.h
rt^3/trunk/src/GE/libGeometry/Point.cxx
rt^3/trunk/src/GE/libGeometry/Point.h
rt^3/trunk/src/GE/libGeometry/Primitive.h
rt^3/trunk/src/GE/libGeometry/RGB.cxx
rt^3/trunk/src/GE/libGeometry/RGB.h
rt^3/trunk/src/GE/libGeometry/Scene.cxx
rt^3/trunk/src/GE/libGeometry/Scene.h
rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx
rt^3/trunk/src/GE/libGeometry/SceneFactory.h
rt^3/trunk/src/GE/libGeometry/Triangle.h
rt^3/trunk/src/GE/libGeometry/Vec.cxx
rt^3/trunk/src/GE/libGeometry/Vec.h
rt^3/trunk/src/GE/libGeometry/View.cxx
rt^3/trunk/src/GE/libGeometry/View.h
rt^3/trunk/src/GE/libImage/Image.h
rt^3/trunk/src/GE/libImage/Pixel.cxx
rt^3/trunk/src/GE/libImage/Pixel.h
rt^3/trunk/src/GE/libImage/PixelImage.cxx
rt^3/trunk/src/GE/libImage/PixelImage.h
rt^3/trunk/src/GE/libRaytrace/Ray.h
rt^3/trunk/src/GE/libRaytrace/Raytrace.h
Modified: rt^3/trunk/src/GE/GED.h
===================================================================
--- rt^3/trunk/src/GE/GED.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/GED.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -26,15 +26,14 @@
#ifndef __GED_H__
#define __GED_H__
-class GED {
-
+class GED
+{
public:
GED();
virtual ~GED();
-
};
-#endif
+#endif /* __GED_H__ *
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/GeometryEngine.cxx
===================================================================
--- rt^3/trunk/src/GE/GeometryEngine.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/GeometryEngine.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -29,7 +29,6 @@
{
}
-
GeometryEngine::~GeometryEngine()
{
}
Modified: rt^3/trunk/src/GE/GeometryEngine.h
===================================================================
--- rt^3/trunk/src/GE/GeometryEngine.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/GeometryEngine.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -28,14 +28,12 @@
class GeometryEngine
{
-
public:
GeometryEngine();
virtual ~GeometryEngine();
-
};
-#endif
+#endif /* __GEOMETRYENGINE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/DXFFileParser.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/DXFFileParser.cxx 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/DXFFileParser.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -31,7 +31,6 @@
#include <stdlib.h>
#include "Geometry/Triangle.h"
-
void DXFFileParser::nextLine(char *B, FILE *FH)
{
int i= 0;
@@ -42,7 +41,6 @@
B[i-1]= 0;
}
-
Scene* DXFFileParser::parse(std::string F)
{
FILE *FH;
@@ -120,19 +118,16 @@
return scene;
}
-
DXFFileParser::DXFFileParser(std::string filename)
{
// load(filename);
}
-
DXFFileParser::~DXFFileParser()
{
// _filename = "";
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libGeometry/DXFFileParser.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/DXFFileParser.h 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/DXFFileParser.h 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -30,14 +30,12 @@
#include <iostream>
#include <vector>
-// interface headers
+/* interface headers */
#include "Geometry/Scene.h"
-
namespace Geometry {
-
- class DXFFileParser {
-
+ class DXFFileParser
+ {
private:
typedef struct {
@@ -53,9 +51,7 @@
~DXFFileParser();
Scene* parse(std::string filename);
-
};
-
}
#endif /* __DXFFILEPARSER_H__ */
Modified: rt^3/trunk/src/GE/libGeometry/Geometry.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Geometry.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Geometry.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -35,7 +35,6 @@
#include "Geometry/Scene.h"
#include "Geometry/Primitive.h"
-
#endif /* __GEOMETRY_H__ */
// Local Variables: ***
Modified: rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -32,7 +32,6 @@
#include "Geometry/Triangle.h"
#include "Geometry/View.h"
-
Scene* NFFFileParser::parse(std::string filename)
{
Scene *scene = new Scene();
@@ -192,7 +191,6 @@
return scene;
}
-
void NFFFileParser::look_from_at(Point &p) {
split(a_line, rt_tokens);
@@ -202,7 +200,6 @@
);
}
-
void NFFFileParser::look_up(Vec &v) {
split(a_line, rt_tokens);
@@ -212,21 +209,18 @@
);
}
-
void NFFFileParser::look_angle(double &angle) {
split(a_line, rt_tokens);
angle = atof(rt_tokens[1].c_str());
}
-
void NFFFileParser::look_hither(double &hither) {
split(a_line, rt_tokens);
hither = atof(rt_tokens[1].c_str());
}
-
void NFFFileParser::look_res(unsigned int &x_res, unsigned int &y_res) {
split(a_line, rt_tokens);
@@ -234,7 +228,6 @@
y_res = atoi(rt_tokens[2].c_str());
}
-
void NFFFileParser:: background_color (RGB &c) {
split(a_line, rt_tokens);
@@ -244,7 +237,6 @@
);
}
-
void NFFFileParser::pos_light_loc(Point &p, RGB &c) {
split(a_line, rt_tokens);
@@ -265,7 +257,6 @@
}
}
-
void NFFFileParser::obj_mater_prop(RGB &c, double &Kd, double &Ks, double &s,
double &T, double &ir) {
// default values
T = 0.0;
@@ -302,7 +293,6 @@
}
}
-
void NFFFileParser::polygon_prim(Point &v1, Point &v2, Point &v3) {
int p_size;
@@ -347,7 +337,6 @@
}
}
-
void NFFFileParser::split(const std::string &str, std::vector<std::string>
&tokens) {
const std::string DELIMITERS = " ";
@@ -370,12 +359,10 @@
}
}
-
NFFFileParser::NFFFileParser(std::string filename)
{
}
-
NFFFileParser::~NFFFileParser()
{
}
Modified: rt^3/trunk/src/GE/libGeometry/NFFFileParser.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/NFFFileParser.h 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/NFFFileParser.h 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -31,17 +31,15 @@
#include <fstream>
#include <vector>
-// interface headers
+/* interface header */
#include "Geometry/Scene.h"
#include "Point.h"
#include "Vec.h"
#include "RGB.h"
-
namespace Geometry {
-
- class NFFFileParser {
-
+ class NFFFileParser
+ {
private:
std::ifstream input;
std::string a_line;
@@ -67,7 +65,6 @@
Scene* parse(std::string filename);
};
-
}
#endif /* __NFFFILEPARSER_H__ */
Modified: rt^3/trunk/src/GE/libGeometry/Point.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Point.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Point.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -35,14 +35,12 @@
X = Y = Z = 0.0;
}
-
Point::Point(double x, double y, double z) {
X = x;
Y = y;
Z = z;
}
-
Vec Point::sub(Point &p, Point &q) {
Vec V;
@@ -50,7 +48,6 @@
return V;
}
-
Vec Point::add(Point &p, Point &q) {
Vec V;
@@ -58,19 +55,23 @@
return V;
}
-
void Point::setPt(double x, double y, double z) {
X = x;
Y = y;
Z = z;
}
-
-
-
Point Point::join1(Point &pt, double dist, Vec &dir) {
Point T;
T.setPt(pt.X + dist*dir.X, pt.Y + dist*dir.Y, pt.Z + dist*dir.Z);
return(T);
}
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/src/GE/libGeometry/Point.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Point.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Point.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -23,8 +23,8 @@
*
*/
-#ifndef POINT_H
-#define POINT_H
+#ifndef __POINT_H__
+#define __POINT_H__
#include <iostream>
#include "Vec.h"
@@ -32,12 +32,12 @@
using std::cout;
using std::endl;
-
/**
* Stores a point consisting of x,y, and z components; has methods to get
x,y,z values,
* to set x,y,z values and to add or subtract two points componentwise.
*/
-class Point {
+class Point
+{
public:
/** Creates a point at (0,0,0) */
Point();
@@ -48,18 +48,14 @@
return Z;
}
-
inline double getY() {
return Y;
}
-
inline double getX() {
return X;
}
-
-
#if 0
/** gets x value */
double getX();
@@ -88,4 +84,12 @@
};
#else
class Point;
-#endif //POINT_H
+#endif //__POINT_H__
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/src/GE/libGeometry/Primitive.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Primitive.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Primitive.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -29,7 +29,6 @@
#include <iostream>
namespace Geometry {
-
class Primitive
{
private:
@@ -40,10 +39,9 @@
public:
virtual bool intersect(double position[3], double direction[3], double *t,
double *u, double *v) = 0;
};
-
}
-#endif
+#endif /* __PRIMITIVE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/RGB.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/RGB.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/RGB.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -45,16 +45,19 @@
////cout << "RGB::getBlue" << endl;
return val[2];
}
+
double RGB::getGreen(){
//returns green value
//// cout << "RGB::getGreen" << endl;
return val[1];
}
+
double RGB::getRed(){
//returns red value
//// cout << "RGB::getRed" << endl;
return val[0];
}
+
void RGB::setColor(double r, double g, double b){
//sets RGB colors
val[0]=r;
@@ -62,6 +65,7 @@
val[2]=b;
//// cout << "RGB::setColor" << endl;
}
+
void RGB::add(RGB & p, RGB & q){
val[0]= p.val[0] + q.val[0];
@@ -70,6 +74,7 @@
// adds two RGBs componentwise and stores in current object
}
+
void RGB::scale(double k, RGB & p ){
val[0] = k*p.val[0];
@@ -79,10 +84,16 @@
//scales an RGB using componentwise multiplication with a scalar.
}
-
-
std::ostream&
operator<<(std::ostream& s, const RGB& rgb)
{
return s << rgb.val[0] << " " << rgb.val[1] << " " << rgb.val[2] << " ";
}
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/src/GE/libGeometry/RGB.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/RGB.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/RGB.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -23,19 +23,17 @@
*
*/
-#ifndef RGB_H
-#define RGB_H
+#ifndef __RGB_H__
+#define __RGB_H__
#include <iostream>
//using std::cout;
//using std::endl;
/** Implements methods to manipulate colors */
class RGB {
-
public:
friend std::ostream&
operator<<(std::ostream&, const RGB&);
-
RGB();
RGB(double r, double g, double b);
/** Sets red, green, and blue values */
@@ -54,8 +52,14 @@
private:
/** Stores the red-green-blue values */
double val[3];
-
};
+#endif //__RGB_H__
-#endif //RGB_H
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
Modified: rt^3/trunk/src/GE/libGeometry/Scene.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Scene.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Scene.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -23,7 +23,7 @@
*
*/
-//interface header
+/* interface header */
#include "Geometry/Scene.h"
using namespace Geometry;
@@ -32,13 +32,11 @@
{
}
-
Scene::~Scene()
{
// XXX delete the geometry and scene pointers
}
-
void Scene::add(Scene& scene)
{
for (int i=0; i < scene._geometry.size(); i++) {
@@ -51,7 +49,6 @@
}
}
-
void Scene::add(std::vector<Triangle*> geometry)
{
for (int i=0; i < geometry.size(); i++) {
@@ -61,7 +58,6 @@
// std::cout << "geometry size is " << _geometry.size() << std::endl;
}
-
void Scene::add(std::vector<View*> views)
{
for (int i=0; i < views.size(); i++) {
@@ -70,20 +66,16 @@
// std::cout << "Added " << views.size() << " views" << std::endl;
}
-
std::vector<Triangle*> Scene::getGeometry() const
{
return _geometry;
}
-
std::vector<View*> Scene::getViews() const
{
return _views;
}
-
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libGeometry/Scene.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Scene.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Scene.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -33,7 +33,6 @@
#include "Geometry/View.h"
namespace Geometry {
-
class Scene
{
private:
@@ -50,10 +49,9 @@
std::vector<Triangle*> getGeometry() const;
std::vector<View*> getViews() const;
};
-
}
-#endif
+#endif /* __SCENE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -23,16 +23,16 @@
*
*/
-// interface header
+/* interface header */
#include "Geometry/SceneFactory.h"
-// standard library
+/* standard library */
#include <algorithm>
-// external interface headers
+/* external interface headers */
#include "libutility.h"
-// library-specific headers
+/* library-specific headers */
#include "NFFFileParser.h"
#include "DXFFileParser.h"
@@ -46,13 +46,11 @@
}
}
-
SceneFactory::~SceneFactory()
{
delete _scene;
}
-
bool SceneFactory::loadFromFile(std::string filename)
{
@@ -85,7 +83,6 @@
return true;
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libGeometry/SceneFactory.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/SceneFactory.h 2010-10-01 15:20:31 UTC
(rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/SceneFactory.h 2010-10-01 15:56:52 UTC
(rev 40888)
@@ -26,15 +26,14 @@
#ifndef __SCENEFACTORY_H__
#define __SCENEFACTORY_H__
-// system headers
+/* system headers */
#include <iostream>
#include <vector>
-// interface headers
+/* interface headers */
#include "Scene.h"
namespace Geometry {
-
class SceneFactory
{
private:
@@ -57,10 +56,9 @@
return _scene;
}
};
-
}
-#endif
+#endif /* __SCENEFACTORY_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/Triangle.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Triangle.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Triangle.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -29,10 +29,9 @@
// system headers
#include <iostream>
-// interface headers
+/* interface headers */
#include "Geometry/Primitive.h"
-
#define EPSILON 0.000001
#define CROSS(dest,v1,v2) \
dest[0]=v1[1]*v2[2]-v1[2]*v2[1]; \
@@ -44,10 +43,7 @@
dest[1]=v1[1]-v2[1]; \
dest[2]=v1[2]-v2[2];
-
namespace Geometry {
-
-
// 128 uint8_ts
typedef struct _triangle
{
@@ -123,10 +119,9 @@
*t = DOT(edge2, qvec) * inv_det;
return 1;
}
-
}
-#endif
+#endif /* __TRIANGLE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/Vec.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Vec.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/Vec.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -38,30 +38,24 @@
Z= 0;
}
-
Vec::Vec(double x, double y, double z) {
X= x;
Y= y;
Z= z;
}
-
Vec::Vec(Point A, Point B) {
X= A.X-B.X;
Y= A.Y-B.Y;
Z= A.Z-B.Z;
}
-
void Vec::setVec(double x, double y, double z) {
X= x;
Y= y;
Z= z;
}
-
-
-
double Vec::dot(Vec v2) {
return(X * v2.X + Y * v2.Y + Z * v2.Z);
}
@@ -72,7 +66,6 @@
Z= v1.X * v2.Y - v1.Y * v2.X;
}
-
void Vec::unitize() {
double L;
@@ -82,7 +75,6 @@
Z/= L;
}
-
void Vec::add(Vec v1) {
X+= v1.X;
Y+= v1.Y;
@@ -96,9 +88,17 @@
Z-= v1.Z;
}
-
void Vec::mult(double s) {
X*= s;
Y*= s;
Z*= s;
}
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
+
Modified: rt^3/trunk/src/GE/libGeometry/Vec.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Vec.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/libGeometry/Vec.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -23,8 +23,8 @@
*
*/
-#ifndef VEC_H
-#define VEC_H
+#ifndef __VEC_H__
+#define __VEC_H__
#include <iostream>
#include "Point.h"
@@ -100,4 +100,14 @@
class Vec;
-#endif //VEC_H
+#endif /* __VEC_H__ */
+
+
+// Local Variables: ***
+// mode: C++ ***
+// tab-width: 8 ***
+// c-basic-offset: 2 ***
+// indent-tabs-mode: t ***
+// End: ***
+// ex: shiftwidth=2 tabstop=8
+
Modified: rt^3/trunk/src/GE/libGeometry/View.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/View.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/View.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -23,7 +23,7 @@
*
*/
-// interface header
+/* interface header */
#include "Geometry/View.h"
using namespace Geometry;
@@ -43,7 +43,6 @@
_hither = hither;
}
-
View::~View()
{
_from[0] = 0.0;
@@ -59,8 +58,6 @@
_hither = 0.0;
}
-
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libGeometry/View.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/View.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libGeometry/View.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -32,9 +32,7 @@
#include "Geometry/Triangle.h"
#include "Geometry/View.h"
-
namespace Geometry {
-
class View
{
private:
@@ -55,12 +53,10 @@
_x = x;
_y = y;
}
-
};
-
}
-#endif
+#endif /* __VIEW_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libImage/Image.h
===================================================================
--- rt^3/trunk/src/GE/libImage/Image.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/libImage/Image.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -28,14 +28,13 @@
namespace Image {
int init();
-
}
+
#include "Image/Pixel.h"
#include "Image/PixelImage.h"
+#endif /* __IMAGE_H__ */
-#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libImage/Pixel.cxx
===================================================================
--- rt^3/trunk/src/GE/libImage/Pixel.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libImage/Pixel.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -24,7 +24,7 @@
*/
-// interface header
+/* interface header */
#include "Image/Pixel.h"
using namespace Image;
@@ -33,12 +33,10 @@
{
}
-
Pixel::~Pixel()
{
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libImage/Pixel.h
===================================================================
--- rt^3/trunk/src/GE/libImage/Pixel.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/libImage/Pixel.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -28,7 +28,6 @@
namespace Image
{
-
class Pixel
{
protected:
@@ -38,13 +37,10 @@
~Pixel();
};
-
}
+#endif /* __PIXEL_H__ */
-
-#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libImage/PixelImage.cxx
===================================================================
--- rt^3/trunk/src/GE/libImage/PixelImage.cxx 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libImage/PixelImage.cxx 2010-10-01 15:56:52 UTC (rev
40888)
@@ -23,7 +23,7 @@
*
*/
-// interface header
+/* interface header */
#include "Image/PixelImage.h"
using namespace Image;
Modified: rt^3/trunk/src/GE/libImage/PixelImage.h
===================================================================
--- rt^3/trunk/src/GE/libImage/PixelImage.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libImage/PixelImage.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -62,7 +62,7 @@
}
-#endif
+#endif /* __PIXELIMAGE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libRaytrace/Ray.h
===================================================================
--- rt^3/trunk/src/GE/libRaytrace/Ray.h 2010-10-01 15:20:31 UTC (rev 40887)
+++ rt^3/trunk/src/GE/libRaytrace/Ray.h 2010-10-01 15:56:52 UTC (rev 40888)
@@ -31,7 +31,6 @@
#include "Ray.h"
namespace Geometry {
-
class Ray
{
private:
@@ -43,7 +42,6 @@
~Ray();
};
-
Ray::Ray(double position[3], double direction[3])
{
_position[0] = position[0];
@@ -54,7 +52,6 @@
_direction[1] = direction[0];
_direction[0] = direction[0];
}
-
}
Modified: rt^3/trunk/src/GE/libRaytrace/Raytrace.h
===================================================================
--- rt^3/trunk/src/GE/libRaytrace/Raytrace.h 2010-10-01 15:20:31 UTC (rev
40887)
+++ rt^3/trunk/src/GE/libRaytrace/Raytrace.h 2010-10-01 15:56:52 UTC (rev
40888)
@@ -32,9 +32,8 @@
#include "Raytrace/Ray.h"
+#endif /* __RAYTRACE_H__ */
-#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
