From b2805409566af00bc15639494f5a186fbd2f16e6 Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 20:15:42 +0000 Subject: More indenting changes --- nGenEx/Bolt.cpp | 212 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 106 insertions(+), 106 deletions(-) (limited to 'nGenEx/Bolt.cpp') diff --git a/nGenEx/Bolt.cpp b/nGenEx/Bolt.cpp index 997ee51..e71c904 100644 --- a/nGenEx/Bolt.cpp +++ b/nGenEx/Bolt.cpp @@ -1,15 +1,15 @@ /* Project nGenEx - Destroyer Studios LLC - Copyright © 1997-2004. All Rights Reserved. + Destroyer Studios LLC + Copyright © 1997-2004. All Rights Reserved. - SUBSYSTEM: nGenEx.lib - FILE: Bolt.cpp - AUTHOR: John DiCamillo + SUBSYSTEM: nGenEx.lib + FILE: Bolt.cpp + AUTHOR: John DiCamillo - OVERVIEW - ======== - 3D Bolt (Polygon) Object + OVERVIEW + ======== + 3D Bolt (Polygon) Object */ #include "MemDebug.h" @@ -23,57 +23,57 @@ void Print(const char* fmt, ...); // +--------------------------------------------------------------------+ Bolt::Bolt(double len, double wid, Bitmap* tex, int share) - : vset(4), poly(0), texture(tex), - length(len), width(wid), shade(1.0), vpn(0, 1, 0), shared(share) +: vset(4), poly(0), texture(tex), +length(len), width(wid), shade(1.0), vpn(0, 1, 0), shared(share) { - trans = true; - - loc = Vec3(0.0f, 0.0f, 1000.0f); - - vset.nverts = 4; - - vset.loc[0] = Point( width, 0, 1000); - vset.loc[1] = Point( width, -length, 1000); - vset.loc[2] = Point(-width, -length, 1000); - vset.loc[3] = Point(-width, 0, 1000); - - vset.tu[0] = 0.0f; - vset.tv[0] = 0.0f; - vset.tu[1] = 1.0f; - vset.tv[1] = 0.0f; - vset.tu[2] = 1.0f; - vset.tv[2] = 1.0f; - vset.tu[3] = 0.0f; - vset.tv[3] = 1.0f; - - Plane plane(vset.loc[0], vset.loc[1], vset.loc[2]); - - for (int i = 0; i < 4; i++) { - vset.nrm[i] = plane.normal; - } - - mtl.Ka = Color::White; - mtl.Kd = Color::White; - mtl.Ks = Color::Black; - mtl.Ke = Color::White; - mtl.tex_diffuse = texture; - mtl.tex_emissive = texture; - mtl.blend = Video::BLEND_ADDITIVE; - - poly.nverts = 4; - poly.vertex_set = &vset; - poly.material = &mtl; - poly.verts[0] = 0; - poly.verts[1] = 1; - poly.verts[2] = 2; - poly.verts[3] = 3; - - radius = (float) ((length>width) ? (length) : (width*2)); - - if (texture) { - strncpy_s(name, texture->GetFilename(), 31); - name[31] = 0; - } + trans = true; + + loc = Vec3(0.0f, 0.0f, 1000.0f); + + vset.nverts = 4; + + vset.loc[0] = Point( width, 0, 1000); + vset.loc[1] = Point( width, -length, 1000); + vset.loc[2] = Point(-width, -length, 1000); + vset.loc[3] = Point(-width, 0, 1000); + + vset.tu[0] = 0.0f; + vset.tv[0] = 0.0f; + vset.tu[1] = 1.0f; + vset.tv[1] = 0.0f; + vset.tu[2] = 1.0f; + vset.tv[2] = 1.0f; + vset.tu[3] = 0.0f; + vset.tv[3] = 1.0f; + + Plane plane(vset.loc[0], vset.loc[1], vset.loc[2]); + + for (int i = 0; i < 4; i++) { + vset.nrm[i] = plane.normal; + } + + mtl.Ka = Color::White; + mtl.Kd = Color::White; + mtl.Ks = Color::Black; + mtl.Ke = Color::White; + mtl.tex_diffuse = texture; + mtl.tex_emissive = texture; + mtl.blend = Video::BLEND_ADDITIVE; + + poly.nverts = 4; + poly.vertex_set = &vset; + poly.material = &mtl; + poly.verts[0] = 0; + poly.verts[1] = 1; + poly.verts[2] = 2; + poly.verts[3] = 3; + + radius = (float) ((length>width) ? (length) : (width*2)); + + if (texture) { + strncpy_s(name, texture->GetFilename(), 31); + name[31] = 0; + } } // +--------------------------------------------------------------------+ @@ -87,39 +87,39 @@ Bolt::~Bolt() void Bolt::Render(Video* video, DWORD flags) { - if ((flags & RENDER_ADDITIVE) == 0) - return; - - if (visible && !hidden && video && life) { - const Camera* camera = video->GetCamera(); - - Point head = loc; - Point tail = origin; - Point vtail = tail - head; - Point vcam = camera->Pos() - loc; - Point vtmp = vcam.cross(vtail); - vtmp.Normalize(); - Point vlat = vtmp * -width; - Vec3 vnrm = camera->vpn() * -1; - - vset.loc[0] = head + vlat; - vset.loc[1] = tail + vlat; - vset.loc[2] = tail - vlat; - vset.loc[3] = head - vlat; - - vset.nrm[0] = vnrm; - vset.nrm[1] = vnrm; - vset.nrm[2] = vnrm; - vset.nrm[3] = vnrm; - - ColorValue white((float) shade, (float) shade, (float) shade); - mtl.Ka = white; - mtl.Kd = white; - mtl.Ks = Color::Black; - mtl.Ke = white; - - video->DrawPolys(1, &poly); - } + if ((flags & RENDER_ADDITIVE) == 0) + return; + + if (visible && !hidden && video && life) { + const Camera* camera = video->GetCamera(); + + Point head = loc; + Point tail = origin; + Point vtail = tail - head; + Point vcam = camera->Pos() - loc; + Point vtmp = vcam.cross(vtail); + vtmp.Normalize(); + Point vlat = vtmp * -width; + Vec3 vnrm = camera->vpn() * -1; + + vset.loc[0] = head + vlat; + vset.loc[1] = tail + vlat; + vset.loc[2] = tail - vlat; + vset.loc[3] = head - vlat; + + vset.nrm[0] = vnrm; + vset.nrm[1] = vnrm; + vset.nrm[2] = vnrm; + vset.nrm[3] = vnrm; + + ColorValue white((float) shade, (float) shade, (float) shade); + mtl.Ka = white; + mtl.Kd = white; + mtl.Ks = Color::Black; + mtl.Ke = white; + + video->DrawPolys(1, &poly); + } } // +--------------------------------------------------------------------+ @@ -134,8 +134,8 @@ Bolt::Update() void Bolt::TranslateBy(const Point& ref) { - loc = loc - ref; - origin = origin - ref; + loc = loc - ref; + origin = origin - ref; } // +--------------------------------------------------------------------+ @@ -143,34 +143,34 @@ Bolt::TranslateBy(const Point& ref) void Bolt::SetOrientation(const Matrix& o) { - vpn = Point(o(2,0), o(2,1), o(2,2)); - origin = loc + (vpn * -length); + vpn = Point(o(2,0), o(2,1), o(2,2)); + origin = loc + (vpn * -length); } void Bolt::SetDirection(const Point& v) { - vpn = v; - origin = loc + (vpn * -length); + vpn = v; + origin = loc + (vpn * -length); } void Bolt::SetEndPoints(const Point& from, const Point& to) { - loc = to; - origin = from; - vpn = to - from; - length = vpn.Normalize(); - radius = (float) length; + loc = to; + origin = from; + vpn = to - from; + length = vpn.Normalize(); + radius = (float) length; } void Bolt::SetTextureOffset(double from, double to) { - vset.tu[0] = (float) from; - vset.tu[1] = (float) to; - vset.tu[2] = (float) to; - vset.tu[3] = (float) from; + vset.tu[0] = (float) from; + vset.tu[1] = (float) to; + vset.tu[2] = (float) to; + vset.tu[3] = (float) from; } -- cgit v1.1