Skip to content
Snippets Groups Projects
Commit 7da9ca05 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

views bugfix and earth is now transparent 0.2 in its view

parent a3dc56af
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,9 @@ function restoreMiniSpheres(){
}
function restorePlanets(){
if(show_earth){
earth.visible=true;
earth.material.opacity = 1;
earth.material.transparent = false;
//earth.visible=true;
}
if(show_sun){
sun.visible=true;
......@@ -63,15 +65,21 @@ function changeView(view_mode){
camera.up = new THREE.Vector3(0,1,0);
break;
case "Earth"://Earth
earth.visible = false;
if(show_earth){
//earth.visible = false;
earth.material.opacity = 0.2;
earth.material.transparent = true;
}
camera.up = new THREE.Vector3(0,0,1);
camera.position = earth.position.clone().normalize().multiplyScalar(getCamDistance());
camera.position = value_earth.clone().normalize().multiplyScalar(getCamDistance());
break;
case "Sun"://Sun
sun.visible = false;
sunGlow.visible=false;
if(show_sun){
sun.visible = false;
sunGlow.visible=false;
}
camera.up = new THREE.Vector3(0,0,1);
camera.position = sun.position.clone().normalize().multiplyScalar(getCamDistance());
camera.position = value_sun.clone().normalize().multiplyScalar(getCamDistance());
break;
case "S/C-XYZ"://Spacecraft
camera.position = init_sc_dir_xyz.clone().applyQuaternion(spacecraft.quaternion.clone().normalize()).multiplyScalar(getCamDistance());
......@@ -124,10 +132,10 @@ function onWindowResize() {
function updateView() {
switch(selected_view){
case "Earth"://Earth
camera.position = earth.position.clone().normalize().multiplyScalar(getCamDistance());
camera.position = value_earth.clone().normalize().multiplyScalar(getCamDistance());
break;
case "Sun"://Sun
camera.position = sun.position.clone().normalize().multiplyScalar(getCamDistance());
camera.position = value_sun.clone().normalize().multiplyScalar(getCamDistance());
break;
case "S/C-XYZ"://Spacecraft
camera.position = init_sc_dir_xyz.clone().applyQuaternion(spacecraft.quaternion.clone().normalize()).multiplyScalar(getCamDistance());
......
......@@ -50,12 +50,12 @@
android:inputType="number"
android:maxLength="1"
android:numeric="integer" />
<CheckBoxPreference
<!-- <CheckBoxPreference
android:key="@string/pref_key_sun_simple_glow"
android:summary="@string/pref_summary_sun_simple_glow"
android:title="@string/pref_title_sun_simple_glow"
android:dependency="@string/pref_key_show_sun"
android:defaultValue="true" />
android:defaultValue="true" /> -->
<CheckBoxPreference
android:key="@string/pref_key_show_sun_line"
android:summary="@string/pref_summary_show_sun_line"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment