Skip to content

Commit 2bd203f

Browse files
committed
fixes
1 parent 73281f2 commit 2bd203f

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

src/celengine/render.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@ void Renderer::render(const Observer& observer,
15321532
// Render stars
15331533
if ((renderFlags & ShowStars) != 0 && universe.getStarCatalog() != nullptr)
15341534
{
1535-
renderPointStars(*universe.getStarCatalog(), exposure, observer);
1535+
renderStars(*universe.getStarCatalog(), exposure, observer);
15361536
}
15371537

15381538
// Translate the camera before rendering the asterisms and boundaries
@@ -3577,9 +3577,9 @@ static float calcMaxFOV(float fovY_degrees, float aspectRatio)
35773577
}
35783578

35793579

3580-
void Renderer::renderPointStars(const StarDatabase& starDB,
3581-
float exposure,
3582-
const Observer& observer)
3580+
void Renderer::renderStars(const StarDatabase& starDB,
3581+
float exposure,
3582+
const Observer& observer)
35833583
{
35843584
Vector3d obsPos = observer.getPosition().toLy();
35853585

@@ -5067,10 +5067,7 @@ Renderer::renderSolarSystemObjects(const Observer &observer,
50675067
setPipelineState(ps);
50685068

50695069
StarVertexBuffer::enable();
5070-
if (starStyle == PointStars)
5071-
starVertexBuffer->startBasicPoints();
5072-
else
5073-
starVertexBuffer->startSprites();
5070+
starVertexBuffer->startSprites();
50745071
starVertexBuffer->render();
50755072
starVertexBuffer->finish();
50765073
StarVertexBuffer::disable();

src/celengine/render.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,7 @@ class Renderer
175175
ShowAtmospheres = 0x0000000000000100,
176176
ShowSmoothLines = 0x0000000000000200,
177177
ShowEclipseShadows = 0x0000000000000400,
178-
// the next one is unused in 1.7, kept for compatibility with 1.6
179-
ShowStarsAsPoints = 0x0000000000000800, // to remove
178+
// removed flag = 0x0000000000000800,
180179
ShowRingShadows = 0x0000000000001000,
181180
ShowBoundaries = 0x0000000000002000,
182181
// removed flag = 0x0000000000004000,
@@ -478,9 +477,9 @@ class Renderer
478477

479478
private:
480479
void setFieldOfView(float);
481-
void renderPointStars(const StarDatabase& starDB,
482-
float exposure,
483-
const Observer& observer);
480+
void renderStars(const StarDatabase& starDB,
481+
float exposure,
482+
const Observer& observer);
484483
void renderDeepSkyObjects(const Universe&,
485484
const Observer&,
486485
float exposure);

src/celengine/renderinfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// renderinfo.h
22
//
3-
// Copyright (C) 2001-present, the Celestia Development Team
3+
// Copyright (C) 2006-present, the Celestia Development Team
44
// Original version by Chris Laurel <[email protected]>
55
//
66
// This program is free software; you can redistribute it and/or

0 commit comments

Comments
 (0)