mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-20 11:28:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correctly clear imageprojections in case the base texture is not RGB

Browse Source
This commit is contained in:
Alexander Bock
2016-04-20 23:15:34 +02:00
parent 0c9c5c397e
commit def64f7c24
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/newhorizons/rendering/renderableplanetprojection.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ void RenderablePlanetProjection::loadTexture() {
if (_colorTexturePath.value() != "") {
_textureOriginal = ghoul::io::TextureReader::ref().loadTexture(_colorTexturePath);
if (_textureOriginal) {
ghoul::opengl::convertTextureFormat(Texture::Format::RGB, *_texture);
ghoul::opengl::convertTextureFormat(Texture::Format::RGB, *_textureOriginal);
_textureOriginal->uploadTexture();
_textureOriginal->setFilter(Texture::FilterMode::Linear);
modules/newhorizons/scripts/crawl_newhorizons_images.py
+8 -3
View File
@@ -35,8 +35,7 @@ def downloadPage(pageNumber):
pos = p+beginOffset
imageName = source[pos:p+imageEnd]
imageLength = len('imageName')
# imageName = source[pos:pos+imageLength]
pos = pos + imageLength + utcDateOffset
pos = p + imageEnd + utcDateOffset
utcDate = source[pos:pos+utcDateLength]
pos = pos + utcDateLength + utcTimeOffset
@@ -49,6 +48,12 @@ def downloadPage(pageNumber):
urlFirstPart = imageName[len('lor_'): len('lor_') + len('029912')]
imageURL = 'http://pluto.jhuapl.edu/soc/Pluto-Encounter/data/pluto/level2/lor/jpeg/' + urlFirstPart + '/' + imageName
print("ImageName: " + imageName)
print("UTCDate: " + utcDate)
print("UTCTime: " + utcTime)
print("Target: " + target)
print("URL: " + imageURL)
# Download image
urlretrieve(imageURL, imageName)
@@ -58,7 +63,7 @@ def downloadPage(pageNumber):
f.write('SEQUENCE_ID = "UNUSED"\n')
f.write('TARGET_NAME = "' + target + '"\n')
f.write('START_TIME = ' + utcDate + 'T' + utcTime + '.000\n')
f.write('START_TIME = ' + utcDate + 'T' + utcTime + '.005\n')
f.write('STOP_TIME = ' + utcDate + 'T' + utcTime + '.005\n')
f.write('INSTRUMENT_HOST_NAME = "NEW HORIZONS"\n')
f.write('INSTRUMENT_ID = "LORRI"\n')
f.write('DETECTOR_ID = "LORRI"\n')