mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update ghoul

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-20 10:28:53 -04:00
parent a068ca2030
commit cb49805b07
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/ghoul

Submodule ext/ghoul updated: ba88e7fb74...ef1063b4af

2
modules/base/shaders/screnspace_fs.glsl
View File

@@ -39,7 +39,7 @@ Fragment getFragment(){
// power scale coordinates for depth. w value is set to 1.0.
float depth = (1.0 + log(abs(OcclusionDepth) + 1/pow(k, 1.0))/log(k)) / 27.0;
frag.color = texture(texture1, vs_st);
frag.color = texture(texture1, vec2(vs_st.s, 1-vs_st.t));
frag.color.a = (frag.color.a != 0.0f) ? Alpha : frag.color.a;
if(frag.color.a == 0.0f){
discard;

2
modules/iswa/rendering/dataplane.cpp
View File

@@ -376,7 +376,7 @@ void DataPlane::loadTexture() {
void DataPlane::updateTexture(){
_memorybuffer = "";
std::shared_ptr<DownloadManager::FileFuture> future = ISWAManager::ref().downloadDataToMemory(2, _memorybuffer);
std::shared_ptr<DownloadManager::FileFuture> future = ISWAManager::ref().downloadDataToMemory(-_data->id, _memorybuffer);
if(future){
_futureData = future;

2
modules/iswa/shaders/cygnetplane_fs.glsl
View File

@@ -35,7 +35,7 @@ Fragment getFragment() {
vec4 position = vs_position;
float depth = pscDepth(position);
vec4 diffuse;
diffuse = texture(texture1, vs_st);
diffuse = texture(texture1, vec2(vs_st.s, 1-vs_st.t));
//vec4 diffuse = vec4(1,vs_st,1);
//vec4 diffuse = vec4(1,0,0,1);

2
modules/iswa/shaders/dataplane_fs.glsl
View File

@@ -41,7 +41,7 @@ Fragment getFragment() {
float depth = pscDepth(position);
vec4 diffuse;
// diffuse = top;
diffuse = texture(texture1, vs_st);
diffuse = texture(texture1, vec2(vs_st.s, 1-vs_st.t));
//float v = texture(texture1, vs_st).r;
//float x = tfValues.x;
//float y = tfValues.y;

6
modules/iswa/util/iswamanager.cpp
View File

@@ -219,10 +219,10 @@ namespace openspace{
void ISWAManager::update(){
for (auto it = _metaFutures.begin(); it != _metaFutures.end(); ){
if((*it)->isFinished) {
if((*it)->type == "TEXTURE"){
createPlane((*it)->id,(*it)->json,std::string("TexturePlane"));
}else{
if((*it)->type == "DATA"){
createPlane((*it)->id,(*it)->json,std::string("DataPlane"));
}else{
createPlane((*it)->id,(*it)->json,std::string("TexturePlane"));
}
it = _metaFutures.erase( it );