diff options
Diffstat (limited to 'Stars45/StarSystem.cpp')
| -rw-r--r-- | Stars45/StarSystem.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Stars45/StarSystem.cpp b/Stars45/StarSystem.cpp index d1558d7..9d8e377 100644 --- a/Stars45/StarSystem.cpp +++ b/Stars45/StarSystem.cpp @@ -11,7 +11,6 @@ Various Heavenly Bodies */ -#include "MemDebug.h" #include "StarSystem.h" #include "Galaxy.h" #include "Sky.h" @@ -88,7 +87,7 @@ active_region(0), instantiated(false), ambient(0,0,0), sun_color(255,255,255), sun_scale(1), point_stars(0), poly_stars(0), nebula(0), haze(0) { - center = new(__FILE__,__LINE__) Orbital(this, "CG", Orbital::NOTHING, 1.0e35f, 0.0f, 0.0f, 0); + center = new Orbital(this, "CG", Orbital::NOTHING, 1.0e35f, 0.0f, 0.0f, 0); radius = 0.0f; } @@ -137,7 +136,7 @@ StarSystem::Load() return; } - Parser parser(new(__FILE__,__LINE__) BlockReader((const char*) block)); + Parser parser(new BlockReader((const char*) block)); Term* term = parser.ParseTerm(); @@ -351,7 +350,7 @@ StarSystem::ParseStar(TermStruct* val) } } - OrbitalBody* star = new(__FILE__,__LINE__) OrbitalBody(this, star_name, Orbital::STAR, mass, radius, orbit, center); + OrbitalBody* star = new OrbitalBody(this, star_name, Orbital::STAR, mass, radius, orbit, center); star->map_name = map_name; star->tex_name = img_name; star->light = light; @@ -487,7 +486,7 @@ StarSystem::ParsePlanet(TermStruct* val) } } - OrbitalBody* planet = new(__FILE__,__LINE__) OrbitalBody(this, pln_name, Orbital::PLANET, mass, radius, orbit, primary_star); + OrbitalBody* planet = new OrbitalBody(this, pln_name, Orbital::PLANET, mass, radius, orbit, primary_star); planet->map_name = map_name; planet->tex_name = img_name; planet->tex_high_res = hi_name; @@ -604,7 +603,7 @@ StarSystem::ParseMoon(TermStruct* val) } } - OrbitalBody* moon = new(__FILE__,__LINE__) OrbitalBody(this, pln_name, Orbital::MOON, mass, radius, orbit, primary_planet); + OrbitalBody* moon = new OrbitalBody(this, pln_name, Orbital::MOON, mass, radius, orbit, primary_planet); moon->map_name = map_name; moon->tex_name = img_name; moon->tex_high_res = hi_name; @@ -657,7 +656,7 @@ StarSystem::ParseRegion(TermStruct* val) else if (pdef->name()->value() == "link") { GetDefText(lnk_name, pdef, filename); if (lnk_name[0]) { - links.append(new(__FILE__,__LINE__) Text(lnk_name)); + links.append(new Text(lnk_name)); } } @@ -685,7 +684,7 @@ StarSystem::ParseRegion(TermStruct* val) if (!primary) primary = primary_planet; if (!primary) primary = primary_star; - OrbitalRegion* region = new(__FILE__,__LINE__) OrbitalRegion(this, rgn_name, 0, size, orbit, primary); + OrbitalRegion* region = new OrbitalRegion(this, rgn_name, 0, size, orbit, primary); region->grid = grid; region->inclination = inclination; region->asteroids = asteroids; @@ -871,7 +870,7 @@ StarSystem::ParseTerrain(TermStruct* val) else { if (!region) - region = new(__FILE__,__LINE__) TerrainRegion(this, rgn_name, size, primary); + region = new TerrainRegion(this, rgn_name, size, primary); TermStruct* val = pdef->term()->isStruct(); ParseLayer(region, val); @@ -881,7 +880,7 @@ StarSystem::ParseTerrain(TermStruct* val) } if (!region) - region = new(__FILE__,__LINE__) TerrainRegion(this, rgn_name, size, primary); + region = new TerrainRegion(this, rgn_name, size, primary); region->grid = grid; region->inclination = inclination; @@ -970,7 +969,7 @@ StarSystem::Create() // poly star shell: if (sky_poly_stars.length()) { - poly_stars = new(__FILE__,__LINE__) Solid; + poly_stars = new Solid; poly_stars->Load(sky_poly_stars, 120); poly_stars->SetLuminous(true); poly_stars->SetInfinite(true); @@ -981,14 +980,14 @@ StarSystem::Create() if (sky_stars) { Print("Point Stars: %d\n", sky_stars); - point_stars = new(__FILE__,__LINE__) Stars(sky_stars); + point_stars = new Stars(sky_stars); } loader->SetDataPath(datapath); // nebula: if (sky_nebula.length()) { - nebula = new(__FILE__,__LINE__) Solid; + nebula = new Solid; nebula->Load(sky_nebula, 100); nebula->SetLuminous(true); nebula->SetInfinite(true); @@ -1000,7 +999,7 @@ StarSystem::Create() // atmospheric haze: if (sky_haze.length()) { loader->SetDataPath(datapath); - haze = new(__FILE__,__LINE__) TerrainHaze(); + haze = new TerrainHaze(); haze->Load(sky_haze, 120); haze->SetInfinite(true); @@ -1045,7 +1044,7 @@ StarSystem::CreateBody(OrbitalBody& body) Point starloc = body.loc; starloc = starloc.OtherHand(); - PlanetRep* rep = new(__FILE__,__LINE__) PlanetRep(body.tex_name, + PlanetRep* rep = new PlanetRep(body.tex_name, 0, body.radius, starloc, @@ -1058,7 +1057,7 @@ StarSystem::CreateBody(OrbitalBody& body) sun_brightness = body.light; sun_color = body.color; - Light* sun_light = new(__FILE__,__LINE__) Light(1.1f); + Light* sun_light = new Light(1.1f); sun_light->SetColor(sun_color); sun_light->SetShadow(true); sun_light->MoveTo(body.loc); @@ -1068,7 +1067,7 @@ StarSystem::CreateBody(OrbitalBody& body) body.light_rep = sun_light; if (body.back != Color::Black) { - Light* back_light = new(__FILE__,__LINE__) Light(0.6f); + Light* back_light = new Light(0.6f); back_light->SetColor(body.back); back_light->SetShadow(false); back_light->MoveTo(body.loc * -1); @@ -1103,7 +1102,7 @@ StarSystem::CreateBody(OrbitalBody& body) glow = body.tex_glow_high_res; } - PlanetRep* rep = new(__FILE__,__LINE__) PlanetRep(surface, + PlanetRep* rep = new PlanetRep(surface, glow, body.radius, planetloc, |