Skip to content

Feat separate on model order #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bgsmase wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feat separate on model order #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1ce3cea
Layer separation based on order of models.
bgsmase Aug 4, 2014
a4f5b08
Fix interaction of vert exaggeration and offsetting
bgsmase Aug 5, 2014
b570e42
Merge branch 'master' into feat_separate_on_model_order
bgsmase Aug 5, 2014
69bc24a
Fix separation code to use appropriate axis offset
bgsmase Aug 14, 2014
a7b31f6
Copy latest changes to DailyBuild file
bgsmase Aug 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions js/EarthServerClient_DailyBuild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,7 +2464,7 @@ EarthServerGenericClient.SceneManager = function()
offSetMult = ( 2* Math.abs( models[modelIndex].xOffset -0.5 ));
cubeMult = cubeSizeX / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand All @@ -2478,15 +2478,19 @@ EarthServerGenericClient.SceneManager = function()
break;

case 1: offset = cubeSizeY/2.0;
minValue *= scale.y;
if( baseElevation[modelIndex] === undefined)
{
baseElevation[modelIndex] = scale.y;
}
minValue *= baseElevation[modelIndex];
newTrans = (value - offset- minValue);

if( models[modelIndex].isChildOf === null )
{
offSetMult = ( 2* Math.abs( models[modelIndex].yOffset -0.5 ));
cubeMult = cubeSizeY / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand All @@ -2506,7 +2510,7 @@ EarthServerGenericClient.SceneManager = function()
offSetMult = ( 2* Math.abs( models[modelIndex].zOffset -0.5 ));
cubeMult = cubeSizeZ / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand Down Expand Up @@ -2567,17 +2571,24 @@ EarthServerGenericClient.SceneManager = function()
{
value /= 10;
var axisSign = "";
var currentSliderValue;

switch( parseInt(axis) )
{
case 0: separationVector[0] = parseFloat(value);
axisSign = "X";
// Set slider value to default value
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetX(i) * EarthServerGenericClient.MainScene.getCubeSizeX();
break;
case 1: separationVector[1] = parseFloat(value);
axisSign = "Y";
// Set slider value to default valu
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetY(i) * EarthServerGenericClient.MainScene.getCubeSizeY();
break;
case 2: separationVector[2] = parseFloat(value);
axisSign = "Z";
// Set slider value to default value
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetZ(i) * EarthServerGenericClient.MainScene.getCubeSizeZ();
break;
default: console.log("EarthServerGenericClient::SceneManager::updateSeparation: Axis with value " +value+ " not known."); return;
}
Expand All @@ -2586,8 +2597,6 @@ EarthServerGenericClient.SceneManager = function()
{
if( models[i].isChildOf === null )
{
// Set slider value to default value
var currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetZ(i) * EarthServerGenericClient.MainScene.getCubeSizeZ();
var slider = document.getElementById("Model"+i+axisSign);

if(slider)
Expand Down Expand Up @@ -2642,18 +2651,8 @@ EarthServerGenericClient.SceneManager = function()
*/
this.getSeparationMultiplierForModel = function(modelIndex,axis)
{
var minModelValue = this.getMinDataValueAtAxis(modelIndex,axis);
var axisValues = this.getMinimumDataValueForAxis(axis);

var value = 1;

if( axisValues.min === axisValues.max )
{ return value; }
else
{
value += ( minModelValue - axisValues.min ) / ( axisValues.max - axisValues.min );
return value;
}
var value = modelIndex / (this.getModelCount() - 1);
return value - 0.5;
};


Expand Down Expand Up @@ -5807,7 +5806,8 @@ EarthServerGenericClient.getWCPSDemCoverage = function(callback,responseData,WCP
tmp = parseFloat(valuesList[k]);
hm[i][k] = tmp;


if (tmp !== demNoData)
{
if (responseData.maxHMvalue < tmp)
{
responseData.maxHMvalue = parseFloat(tmp);
Expand All @@ -5816,7 +5816,7 @@ EarthServerGenericClient.getWCPSDemCoverage = function(callback,responseData,WCP
{
responseData.minHMvalue = parseFloat(tmp);
}

}
}
}
if(responseData.minHMvalue!=0 && responseData.maxHMvalue!=0)
Expand Down Expand Up @@ -6297,7 +6297,8 @@ EarthServerGenericClient.requestWCSPointCloud = function(callback,WCSurl,WCSvers

EarthServerGenericClient.getPointCloudWCS(callback,data,WCSurl,WCSversion,WCScoverID,minx,maxx,miny,maxy,minh,maxh);

};//Namespace
};
//Namespace
var EarthServerGenericClient = EarthServerGenericClient || {};

/**
Expand Down
35 changes: 17 additions & 18 deletions js/SceneManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2464,7 +2464,7 @@ EarthServerGenericClient.SceneManager = function()
offSetMult = ( 2* Math.abs( models[modelIndex].xOffset -0.5 ));
cubeMult = cubeSizeX / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand All @@ -2478,15 +2478,19 @@ EarthServerGenericClient.SceneManager = function()
break;

case 1: offset = cubeSizeY/2.0;
minValue *= scale.y;
if( baseElevation[modelIndex] === undefined)
{
baseElevation[modelIndex] = scale.y;
}
minValue *= baseElevation[modelIndex];
newTrans = (value - offset- minValue);

if( models[modelIndex].isChildOf === null )
{
offSetMult = ( 2* Math.abs( models[modelIndex].yOffset -0.5 ));
cubeMult = cubeSizeY / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand All @@ -2506,7 +2510,7 @@ EarthServerGenericClient.SceneManager = function()
offSetMult = ( 2* Math.abs( models[modelIndex].zOffset -0.5 ));
cubeMult = cubeSizeZ / 10;

if( offSetMult !== 0.0 && separationVector[which] !== 1 )
if( offSetMult !== 0.0 )
{
if( newTrans >= 0)
newTrans += cubeMult * separationVector[which] * this.getSeparationMultiplierForModel(modelIndex,which);
Expand Down Expand Up @@ -2567,17 +2571,24 @@ EarthServerGenericClient.SceneManager = function()
{
value /= 10;
var axisSign = "";
var currentSliderValue;

switch( parseInt(axis) )
{
case 0: separationVector[0] = parseFloat(value);
axisSign = "X";
// Set slider value to default value
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetX(i) * EarthServerGenericClient.MainScene.getCubeSizeX();
break;
case 1: separationVector[1] = parseFloat(value);
axisSign = "Y";
// Set slider value to default valu
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetY(i) * EarthServerGenericClient.MainScene.getCubeSizeY();
break;
case 2: separationVector[2] = parseFloat(value);
axisSign = "Z";
// Set slider value to default value
currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetZ(i) * EarthServerGenericClient.MainScene.getCubeSizeZ();
break;
default: console.log("EarthServerGenericClient::SceneManager::updateSeparation: Axis with value " +value+ " not known."); return;
}
Expand All @@ -2586,8 +2597,6 @@ EarthServerGenericClient.SceneManager = function()
{
if( models[i].isChildOf === null )
{
// Set slider value to default value
var currentSliderValue = EarthServerGenericClient.MainScene.getModelOffsetZ(i) * EarthServerGenericClient.MainScene.getCubeSizeZ();
var slider = document.getElementById("Model"+i+axisSign);

if(slider)
Expand Down Expand Up @@ -2642,18 +2651,8 @@ EarthServerGenericClient.SceneManager = function()
*/
this.getSeparationMultiplierForModel = function(modelIndex,axis)
{
var minModelValue = this.getMinDataValueAtAxis(modelIndex,axis);
var axisValues = this.getMinimumDataValueForAxis(axis);

var value = 1;

if( axisValues.min === axisValues.max )
{ return value; }
else
{
value += ( minModelValue - axisValues.min ) / ( axisValues.max - axisValues.min );
return value;
}
var value = modelIndex / (this.getModelCount() - 1);
return value - 0.5;
};


Expand Down
7 changes: 4 additions & 3 deletions js/ServerRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ EarthServerGenericClient.getWCPSDemCoverage = function(callback,responseData,WCP
tmp = parseFloat(valuesList[k]);
hm[i][k] = tmp;


if (tmp !== demNoData)
{
if (responseData.maxHMvalue < tmp)
{
responseData.maxHMvalue = parseFloat(tmp);
Expand All @@ -299,7 +300,7 @@ EarthServerGenericClient.getWCPSDemCoverage = function(callback,responseData,WCP
{
responseData.minHMvalue = parseFloat(tmp);
}

}
}
}
if(responseData.minHMvalue!=0 && responseData.maxHMvalue!=0)
Expand Down Expand Up @@ -780,4 +781,4 @@ EarthServerGenericClient.requestWCSPointCloud = function(callback,WCSurl,WCSvers

EarthServerGenericClient.getPointCloudWCS(callback,data,WCSurl,WCSversion,WCScoverID,minx,maxx,miny,maxy,minh,maxh);

};
};