Nebula.cpp   Nebula.cpp 
skipping to change at line 58 skipping to change at line 58
float Nebula::circleScale = 1.f; float Nebula::circleScale = 1.f;
bool Nebula::drawHintProportional = false; bool Nebula::drawHintProportional = false;
bool Nebula::surfaceBrightnessUsage = false; bool Nebula::surfaceBrightnessUsage = false;
float Nebula::hintsBrightness = 0; float Nebula::hintsBrightness = 0;
Vec3f Nebula::labelColor = Vec3f(0.4,0.3,0.5); Vec3f Nebula::labelColor = Vec3f(0.4,0.3,0.5);
Vec3f Nebula::circleColor = Vec3f(0.8,0.8,0.1); Vec3f Nebula::circleColor = Vec3f(0.8,0.8,0.1);
Vec3f Nebula::galaxyColor = Vec3f(1.0,0.2,0.2); Vec3f Nebula::galaxyColor = Vec3f(1.0,0.2,0.2);
Vec3f Nebula::radioGalaxyColor = Vec3f(0.3,0.3,0.3); Vec3f Nebula::radioGalaxyColor = Vec3f(0.3,0.3,0.3);
Vec3f Nebula::activeGalaxyColor = Vec3f(0.8,0.8,0.1); Vec3f Nebula::activeGalaxyColor = Vec3f(0.8,0.8,0.1);
Vec3f Nebula::interactingGalaxyColor = Vec3f(0.8,0.8,0.1); Vec3f Nebula::interactingGalaxyColor = Vec3f(0.8,0.8,0.1);
Vec3f Nebula::brightNebulaColor = Vec3f(0.1,1.0,0.1); Vec3f Nebula::quasarColor = Vec3f(1.0,0.2,0.2);
Vec3f Nebula::nebulaColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::planetaryNebulaColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::reflectionNebulaColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::bipolarNebulaColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::emissionNebulaColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::darkNebulaColor = Vec3f(0.3,0.3,0.3); Vec3f Nebula::darkNebulaColor = Vec3f(0.3,0.3,0.3);
Vec3f Nebula::hydrogenRegionColor = Vec3f(0.1,1.0,0.1); Vec3f Nebula::hydrogenRegionColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::supernovaRemnantColor = Vec3f(0.1,1.0,0.1); Vec3f Nebula::supernovaRemnantColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::interstellarMatterColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::clusterWithNebulosityColor = Vec3f(0.1,1.0,0.1);
Vec3f Nebula::clusterColor = Vec3f(1.0,1.0,0.1); Vec3f Nebula::clusterColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::openClusterColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::globularClusterColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::stellarAssociationColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::starCloudColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::emissionObjectColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::blLacObjectColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::blazarColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::molecularCloudColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::youngStellarObjectColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::possibleQuasarColor = Vec3f(1.0,0.2,0.2);
Vec3f Nebula::possiblePlanetaryNebulaColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::protoplanetaryNebulaColor = Vec3f(1.0,1.0,0.1);
Vec3f Nebula::starColor = Vec3f(1.0,1.0,0.1);
bool Nebula::flagUsageTypeFilter = false; bool Nebula::flagUsageTypeFilter = false;
Nebula::CatalogGroup Nebula::catalogFilters = Nebula::CatalogGroup(0); Nebula::CatalogGroup Nebula::catalogFilters = Nebula::CatalogGroup(0);
Nebula::TypeGroup Nebula::typeFilters = Nebula::TypeGroup(Nebula::AllTypes) ; Nebula::TypeGroup Nebula::typeFilters = Nebula::TypeGroup(Nebula::AllTypes) ;
Nebula::Nebula() Nebula::Nebula()
: DSO_nb(0) : DSO_nb(0)
, M_nb(0) , M_nb(0)
, NGC_nb(0) , NGC_nb(0)
, IC_nb(0) , IC_nb(0)
, C_nb(0) , C_nb(0)
skipping to change at line 449 skipping to change at line 469
break; break;
case NebIGx: case NebIGx:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
color=interactingGalaxyColor; color=interactingGalaxyColor;
break; break;
case NebAGx: case NebAGx:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
color=activeGalaxyColor; color=activeGalaxyColor;
break; break;
case NebQSO: case NebQSO:
Nebula::texGalaxy->bind();
color=quasarColor;
break;
case NebPossQSO: case NebPossQSO:
Nebula::texGalaxy->bind();
color=possibleQuasarColor;
break;
case NebBLL: case NebBLL:
Nebula::texGalaxy->bind();
color=blLacObjectColor;
break;
case NebBLA: case NebBLA:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
color=blazarColor;
break; break;
case NebRGx: case NebRGx:
Nebula::texGalaxy->bind(); Nebula::texGalaxy->bind();
color=radioGalaxyColor; color=radioGalaxyColor;
break; break;
case NebOc: case NebOc:
Nebula::texOpenCluster->bind();
color=openClusterColor;
break;
case NebSA: case NebSA:
Nebula::texOpenCluster->bind();
color=stellarAssociationColor;
break;
case NebSC: case NebSC:
Nebula::texOpenCluster->bind();
color=starCloudColor;
break;
case NebCl: case NebCl:
Nebula::texOpenCluster->bind(); Nebula::texOpenCluster->bind();
color=clusterColor; color=clusterColor;
break; break;
case NebGc: case NebGc:
Nebula::texGlobularCluster->bind(); Nebula::texGlobularCluster->bind();
color=clusterColor; color=globularClusterColor;
break; break;
case NebN: case NebN:
Nebula::texDiffuseNebula->bind();
color=nebulaColor;
break;
case NebHII: case NebHII:
Nebula::texDiffuseNebula->bind();
color=hydrogenRegionColor;
break;
case NebMolCld: case NebMolCld:
Nebula::texDiffuseNebula->bind();
color=molecularCloudColor;
break;
case NebYSO: case NebYSO:
Nebula::texDiffuseNebula->bind(); Nebula::texDiffuseNebula->bind();
color=hydrogenRegionColor; color=youngStellarObjectColor;
break; break;
case NebRn: case NebRn:
Nebula::texDiffuseNebula->bind();
color=reflectionNebulaColor;
break;
case NebSNR: case NebSNR:
Nebula::texDiffuseNebula->bind(); Nebula::texDiffuseNebula->bind();
color=supernovaRemnantColor; color=supernovaRemnantColor;
break; break;
case NebBn: case NebBn:
Nebula::texDiffuseNebula->bind();
color=bipolarNebulaColor;
break;
case NebEn: case NebEn:
Nebula::texDiffuseNebula->bind(); Nebula::texDiffuseNebula->bind();
color=brightNebulaColor; color=emissionNebulaColor;
break; break;
case NebPn: case NebPn:
Nebula::texPlanetaryNebula->bind();
color=planetaryNebulaColor;
break;
case NebPossPN: case NebPossPN:
Nebula::texPlanetaryNebula->bind();
color=possiblePlanetaryNebulaColor;
break;
case NebPPN: case NebPPN:
Nebula::texPlanetaryNebula->bind(); Nebula::texPlanetaryNebula->bind();
color=brightNebulaColor; color=protoplanetaryNebulaColor;
break; break;
case NebDn: case NebDn:
Nebula::texDarkNebula->bind(); Nebula::texDarkNebula->bind();
color=darkNebulaColor; color=darkNebulaColor;
break; break;
case NebCn: case NebCn:
Nebula::texOpenClusterWithNebulosity->bind(); Nebula::texOpenClusterWithNebulosity->bind();
color=clusterColor; color=clusterWithNebulosityColor;
break;
case NebEMO:
Nebula::texCircle->bind();
color=emissionObjectColor;
break; break;
default: default:
Nebula::texCircle->bind(); Nebula::texCircle->bind();
} }
Vec3f col(color[0]*lum*hintsBrightness, color[1]*lum*hintsBrightness , color[2]*lum*hintsBrightness); Vec3f col(color[0]*lum*hintsBrightness, color[1]*lum*hintsBrightness , color[2]*lum*hintsBrightness);
if (!objectInDisplayedType()) if (!objectInDisplayedType())
col = Vec3f(0.f,0.f,0.f); col = Vec3f(0.f,0.f,0.f);
sPainter.setColor(col[0], col[1], col[2], 1); sPainter.setColor(col[0], col[1], col[2], 1);
 End of changes. 22 change blocks. 
6 lines changed or deleted 70 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/