mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change tabs to spaces

Browse Source
This commit is contained in:
Alexander Bock
2016-12-03 01:21:54 +01:00
parent afd60683a3
commit 777e6c628f
8 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/scene/atmosphereearth/atmosphereearth.mod
View File

@@ -20,7 +20,7 @@ return {
Renderable = {
Type = "RenderablePlanet",
Frame = "IAU_EARTH",
Body = "EARTH",
Body = "EARTH",
Geometry = {
Type = "SimpleSphere",
Radius = { 6.371, 6 },
@@ -43,7 +43,7 @@ return {
Textures = {
Type = "simple",
Color = "textures/earth_bluemarble.jpg",
Night = "textures/earth_night.jpg",
Night = "textures/earth_night.jpg",
--Height = "textures/earth_bluemarble_height.jpg",
-- Depth = "textures/earth_depth.png",
Reflectance = "textures/earth_reflectance.png",
@@ -133,7 +133,7 @@ return {
Texture = "textures/marker.png",
BlendMode = "Additive"
},
Ephemeris = {
Ephemeris = {
Type = "Static",
Position = {0, 0, 0, 5}
}

2
data/scene/earth/earth.mod
View File

@@ -82,7 +82,7 @@ return {
Texture = "textures/marker.png",
BlendMode = "Additive"
},
Ephemeris = {
Ephemeris = {
Type = "Static",
Position = {0, 0, 0, 5}
}

4
modules/base/shaders/path_fs.glsl
View File

@@ -30,8 +30,8 @@ in vec4 vs_pointColor;
Fragment getFragment() {
if (vs_pointColor.a < 0.01)
discard;
if (vs_pointColor.a < 0.01)
discard;
Fragment frag;
frag.color = vs_pointColor;
frag.depth = vs_positionScreenSpace.w;

2
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -73,7 +73,7 @@ namespace globebrowsing {
properties::BoolProperty("showChunkEdges", "show chunk edges", false),
properties::BoolProperty("showChunkBounds", "show chunk bounds", false),
properties::BoolProperty("showChunkAABB", "show chunk AABB", false),
properties::BoolProperty("showHeightResolution", "show height resolution", false),
properties::BoolProperty("showHeightResolution", "show height resolution", false),
properties::BoolProperty("showHeightIntensities", "show height intensities", false),
properties::BoolProperty("performFrustumCulling", "perform frustum culling", true),
properties::BoolProperty("performHorizonCulling", "perform horizon culling", true),

24
modules/globebrowsing/shaders/pointglobe_fs.glsl
View File

@@ -31,23 +31,23 @@ in vec4 vs_positionClipSpace;
Fragment getFragment() {
vec2 pointCoord = (gl_PointCoord.xy - vec2(0.5)) * 2;
pointCoord.y = -pointCoord.y; // y should point up in cam space
if(length(pointCoord) > 1) // Outside of circle radius?
discard;
vec2 pointCoord = (gl_PointCoord.xy - vec2(0.5)) * 2;
pointCoord.y = -pointCoord.y; // y should point up in cam space
if(length(pointCoord) > 1) // Outside of circle radius?
discard;
// z_coord of sphere
float zCoord = sqrt(1 - pow(length(pointCoord),2));
// z_coord of sphere
float zCoord = sqrt(1 - pow(length(pointCoord),2));
// Light calculations
vec3 normal = normalize(vec3(pointCoord, zCoord));
float cosTerm = max(dot(directionToSunViewSpace, normal), 0);
// Light calculations
vec3 normal = normalize(vec3(pointCoord, zCoord));
float cosTerm = max(dot(directionToSunViewSpace, normal), 0);
vec3 color = vec3(1,1,1) * 0.7;
vec3 shadedColor = cosTerm * color;
vec3 color = vec3(1,1,1) * 0.7;
vec3 shadedColor = cosTerm * color;
Fragment frag;
frag.color = vec4(shadedColor,1);
frag.color = vec4(shadedColor,1);
frag.depth = vs_positionClipSpace.w;
return frag;
}

2
modules/globebrowsing/tile/chunktile.h
View File

@@ -42,7 +42,7 @@ namespace globebrowsing {
};
struct ChunkTilePile {
std::vector<ChunkTile> chunkTiles;
std::vector<ChunkTile> chunkTiles;
};
} // namespace globebrowsing

2
modules/globebrowsing/tile/tilepile.cpp
View File

@@ -44,7 +44,7 @@ namespace globebrowsing {
}
void TilePile::bind(ProgramObject* programObject){
}*/
} // namespace globebrowsing

4
src/util/gpudata.cpp
View File

@@ -35,12 +35,12 @@
#include <memory>
namespace {
const std::string _loggerCat = "GPUData";
const std::string _loggerCat = "GPUData";
}
namespace openspace {
void UniformLocation::bind(ProgramObject* program, const std::string& name){
void UniformLocation::bind(ProgramObject* program, const std::string& name){
_uniformLocation = program->uniformLocation(name);
LDEBUG(name);
}