mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-22 08:03:45 +00:00
missing some file
This commit is contained in:
Anis A. Hireche
LuisAntonRebollo
parent
09b6a06bbc
commit
18213a7fa9
12 changed files with 562 additions and 38 deletions
|
|
@ -20,3 +20,228 @@
|
|||
// IN THE SOFTWARE.
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Sample grass
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
singleton Material(TerrainFX_grass1)
|
||||
{
|
||||
mapTo = "grass1";
|
||||
footstepSoundId = 0;
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
effectColor[0] = "0.42 0.42 0 1";
|
||||
effectColor[1] = "0.42 0.42 0 1";
|
||||
impactSoundId = "0";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "grass1";
|
||||
diffuseMap = "art/terrains/Example/grass1";
|
||||
detailMap = "art/terrains/Example/grass1_d";
|
||||
detailSize = "10";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "200";
|
||||
normalMap = "art/terrains/Example/grass1_n";
|
||||
detailDistance = "1000";
|
||||
};
|
||||
|
||||
singleton Material(TerrainFX_grass2)
|
||||
{
|
||||
mapTo = "grass2";
|
||||
footstepSoundId = 0;
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
effectColor[0] = "0.42 0.42 0 1";
|
||||
effectColor[1] = "0.42 0.42 0 1";
|
||||
impactSoundId = "0";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "grass2";
|
||||
diffuseMap = "art/terrains/Example/grass2";
|
||||
detailMap = "art/terrains/Example/grass2_d";
|
||||
detailSize = "10";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "200";
|
||||
};
|
||||
|
||||
singleton Material(TerrainFX_grass1dry)
|
||||
{
|
||||
mapTo = "grass1_dry";
|
||||
footstepSoundId = 0;
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
effectColor[0] = "0.63 0.55 0 1";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "grass1_dry";
|
||||
diffuseMap = "art/terrains/Example/grass1_dry";
|
||||
detailMap = "art/terrains/Example/grass1_dry_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "250";
|
||||
detailStrength = "2";
|
||||
normalMap = "art/terrains/Example/grass1_dry_n";
|
||||
};
|
||||
|
||||
singleton Material(TerrainFX_dirt_grass)
|
||||
{
|
||||
mapTo = "dirt_grass";
|
||||
footstepSoundId = 0;
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
effectColor[0] = "0.63 0.55 0 1";
|
||||
diffuseMap = "art/terrains/Example/dirt_grass";
|
||||
diffuseSize = "200";
|
||||
normalMap = "art/terrains/Example/dirt_grass_n";
|
||||
detailMap = "art/terrains/Example/dirt_grass_d";
|
||||
detailDistance = "100";
|
||||
internalName = "dirt_grass";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
enabled = "1";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "dirt_grass";
|
||||
diffuseMap = "art/terrains/Example/dirt_grass";
|
||||
detailMap = "art/terrains/Example/dirt_grass_d";
|
||||
detailSize = "5";
|
||||
detailDistance = "100";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "200";
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Sample rock
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
singleton Material(TerrainFX_rocktest)
|
||||
{
|
||||
mapTo = "rocktest";
|
||||
footstepSoundId = "1";
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
impactSoundId = "1";
|
||||
effectColor[0] = "0.25 0.25 0.25 1";
|
||||
effectColor[1] = "0.25 0.25 0.25 0";
|
||||
diffuseMap = "art/terrains/Example/rocktest";
|
||||
diffuseSize = "400";
|
||||
normalMap = "art/terrains/Example/rocktest_n";
|
||||
detailMap = "art/terrains/Example/rocktest_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
internalName = "rocktest";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
enabled = "1";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "rocktest";
|
||||
diffuseMap = "art/terrains/Example/rocktest";
|
||||
detailMap = "art/terrains/Example/rocktest_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "400";
|
||||
};
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Sample rock
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
singleton Material(TerrainFX_stone)
|
||||
{
|
||||
mapTo = "stone";
|
||||
footstepSoundId = "1";
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
impactSoundId = "1";
|
||||
effectColor[0] = "0.25 0.25 0.25 1";
|
||||
effectColor[1] = "0.25 0.25 0.25 0";
|
||||
diffuseMap = "art/terrains/Example/stone";
|
||||
diffuseSize = "400";
|
||||
normalMap = "art/terrains/Example/stone_n";
|
||||
detailMap = "art/terrains/Example/stone_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
internalName = "stone";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
enabled = "1";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "stone";
|
||||
diffuseMap = "art/terrains/Example/stone";
|
||||
detailMap = "art/terrains/Example/stone_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "400";
|
||||
useSideProjection = "0";
|
||||
};
|
||||
// ----------------------------------------------------------------------------
|
||||
// Sample sand
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
singleton Material(TerrainFX_sand)
|
||||
{
|
||||
mapTo = "sand";
|
||||
footstepSoundId = "3";
|
||||
terrainMaterials = "1";
|
||||
ShowDust = "1";
|
||||
showFootprints = "1";
|
||||
materialTag0 = "Terrain";
|
||||
specularPower[0] = "1";
|
||||
effectColor[0] = "0.84 0.71 0.5 1";
|
||||
effectColor[1] = "0.84 0.71 0.5 0.349";
|
||||
};
|
||||
|
||||
new TerrainMaterial()
|
||||
{
|
||||
internalName = "sand";
|
||||
diffuseMap = "art/terrains/Example/sand";
|
||||
detailMap = "art/terrains/Example/sand_d";
|
||||
detailSize = "10";
|
||||
detailDistance = "100";
|
||||
isManaged = "1";
|
||||
detailBrightness = "1";
|
||||
Enabled = "1";
|
||||
diffuseSize = "200";
|
||||
normalMap = "art/terrains/Example/sand_n";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ float calcBlend( float texId, vec2 layerCoord, float layerSize, vec4 layerSample
|
|||
vec4 diff = clamp( abs( layerSample - texId ), 0.0, 1.0 );
|
||||
float noBlend = float(any( bvec4(1 - diff) ));
|
||||
|
||||
// Use step to see if any of the layer samples
|
||||
// match the current texture id.
|
||||
vec4 factors = step( texId, layerSample );
|
||||
|
||||
vec4 factors = vec4(0);
|
||||
for(int i = 0; i < 4; i++)
|
||||
if(layerSample[i] == texId)
|
||||
factors[i] = 1;
|
||||
|
||||
// This is a custom bilinear filter.
|
||||
|
||||
vec2 uv = layerCoord * layerSize;
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "270 3";
|
||||
position = "250 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "262 5";
|
||||
Position = "242 5";
|
||||
Extent = "256 50";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -370,7 +370,7 @@
|
|||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "525 3";
|
||||
position = "495 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
|
|
@ -382,7 +382,7 @@
|
|||
Profile = "ToolsGuiTransparentProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
position = "540 5";
|
||||
position = "510 5";
|
||||
Extent = "120 50";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -454,6 +454,53 @@
|
|||
bitmap = "tools/gui/images/dropslider";
|
||||
};
|
||||
};
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "618 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
};
|
||||
|
||||
new GuiControl(LerpBlendCheckButtonContainer,EditorGuiGroup) {
|
||||
position = "628 5";
|
||||
extent = "70 50";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiTransparentProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiCheckBoxCtrl() {
|
||||
text = " LerpBlend";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "0 2";
|
||||
extent = "140 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
command = "ETerrainEditor.toggleBlendType($ThisControl);";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "LerpBlendCheckBox";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -634,4 +681,3 @@ new GuiMouseEventCtrl(PaintBrushSoftnessSliderCtrlContainer,EditorGuiGroup) {
|
|||
value = "0";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
HorizSizing = "center";
|
||||
VertSizing = "center";
|
||||
position = "221 151";
|
||||
Extent = "394 432";
|
||||
MinExtent = "358 432";
|
||||
Extent = "394 452";
|
||||
MinExtent = "358 452";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
HorizSizing = "left";
|
||||
VertSizing = "height";
|
||||
position = "202 26";
|
||||
Extent = "185 363";
|
||||
Extent = "185 383";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -439,7 +439,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "bottom";
|
||||
position = "6 295";
|
||||
Extent = "185 50";
|
||||
Extent = "185 80";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -621,6 +621,78 @@
|
|||
sinkAllKeyEvents = "0";
|
||||
passwordMask = "*";
|
||||
};
|
||||
new GuiSliderCtrl(TerrainMaterialDlgBlendDepthSlider) {
|
||||
range = "0.01 0.99";
|
||||
ticks = "0";
|
||||
snap = "0";
|
||||
value = "0.5";
|
||||
position = "39 61";
|
||||
extent = "70 14";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiSliderProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "blendDepthSliderCtrl";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
text = "Blend Depth";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "115 61";
|
||||
extent = "58 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiTextProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextEditCtrl(TerrainMaterialDlgBlendDepthTextEdit) {
|
||||
historySize = "0";
|
||||
tabComplete = "0";
|
||||
sinkAllKeyEvents = "0";
|
||||
password = "0";
|
||||
passwordMask = "*";
|
||||
text = "0.3";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "0";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "0";
|
||||
anchorRight = "0";
|
||||
position = "1 59";
|
||||
extent = "35 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "blendDepthTextEditCtrl";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
|
|
@ -1260,7 +1332,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "6 42";
|
||||
Extent = "189 373";
|
||||
Extent = "189 393";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -1274,7 +1346,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "0 0";
|
||||
Extent = "189 374";
|
||||
Extent = "189 394";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -1333,7 +1405,7 @@
|
|||
Profile = "ToolsGuiButtonProfile";
|
||||
HorizSizing = "left";
|
||||
VertSizing = "top";
|
||||
position = "202 394";
|
||||
position = "202 414";
|
||||
Extent = "98 22";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -1352,7 +1424,7 @@
|
|||
Profile = "ToolsGuiButtonProfile";
|
||||
HorizSizing = "left";
|
||||
VertSizing = "top";
|
||||
position = "307 394";
|
||||
position = "307 414";
|
||||
Extent = "80 22";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -1372,7 +1444,7 @@
|
|||
HorizSizing = "left";
|
||||
VertSizing = "height";
|
||||
position = "199 23";
|
||||
Extent = "190 267";
|
||||
Extent = "190 287";
|
||||
isContainer = true;
|
||||
Visible = false;
|
||||
bitmap = "tools/gui/images/inactive-overlay";
|
||||
|
|
@ -1389,4 +1461,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -222,6 +222,8 @@ function EPainter::setup( %this, %matIndex )
|
|||
ETerrainEditor.setAction( ETerrainEditor.currentAction );
|
||||
EditorGuiStatusBar.setInfo(ETerrainEditor.currentActionDesc);
|
||||
ETerrainEditor.renderVertexSelection = true;
|
||||
|
||||
EWTerrainPainterToolbar-->LerpBlendCheckBox.setValue($Pref::Terrain::LerpBlend);
|
||||
}
|
||||
|
||||
function onNeedRelight()
|
||||
|
|
@ -257,6 +259,11 @@ function TerrainEditor::toggleBrushType( %this, %brush )
|
|||
%this.setBrushType( %brush.internalName );
|
||||
}
|
||||
|
||||
function TerrainEditor::toggleBlendType( %this, %check )
|
||||
{
|
||||
$Pref::Terrain::LerpBlend = %check.getValue();
|
||||
}
|
||||
|
||||
function TerrainEditor::offsetBrush(%this, %x, %y)
|
||||
{
|
||||
%curPos = %this.getBrushPos();
|
||||
|
|
|
|||
|
|
@ -401,6 +401,9 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
|
|||
%this-->detDistanceCtrl.setText( %mat.detailDistance );
|
||||
%this-->sideProjectionCtrl.setValue( %mat.useSideProjection );
|
||||
%this-->parallaxScaleCtrl.setText( %mat.parallaxScale );
|
||||
%blendDepth = mFloor(%mat.blendDepth * 1000)/1000;
|
||||
%this-->blendDepthTextEditCtrl.setText( %blendDepth );
|
||||
%this-->blendDepthSliderCtrl.setValue( %mat.blendDepth );
|
||||
|
||||
%this-->macroSizeCtrl.setText( %mat.macroSize );
|
||||
%this-->macroStrengthCtrl.setText( %mat.macroStrength );
|
||||
|
|
@ -454,6 +457,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%detailDistance = %this-->detDistanceCtrl.getText();
|
||||
%useSideProjection = %this-->sideProjectionCtrl.getValue();
|
||||
%parallaxScale = %this-->parallaxScaleCtrl.getText();
|
||||
%blendDepth = %this-->blendDepthTextEditCtrl.getText();
|
||||
|
||||
%macroSize = %this-->macroSizeCtrl.getText();
|
||||
%macroStrength = %this-->macroStrengthCtrl.getText();
|
||||
|
|
@ -475,7 +479,8 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%mat.macroSize == %macroSize &&
|
||||
%mat.macroStrength == %macroStrength &&
|
||||
%mat.macroDistance == %macroDistance &&
|
||||
%mat.parallaxScale == %parallaxScale )
|
||||
%mat.parallaxScale == %parallaxScale &&
|
||||
%mat.blendDepth == %blendDepth)
|
||||
return;
|
||||
|
||||
// Make sure the material name is unique.
|
||||
|
|
@ -509,6 +514,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%mat.macroDistance = %macroDistance;
|
||||
%mat.useSideProjection = %useSideProjection;
|
||||
%mat.parallaxScale = %parallaxScale;
|
||||
%mat.blendDepth = %blendDepth;
|
||||
|
||||
// Mark the material as dirty and needing saving.
|
||||
|
||||
|
|
@ -554,6 +560,7 @@ function TerrainMaterialDlg::snapshotMaterials( %this )
|
|||
macroDistance = %mat.macroDistance;
|
||||
useSideProjection = %mat.useSideProjection;
|
||||
parallaxScale = %mat.parallaxScale;
|
||||
blendDepth = %mat.blendDepth;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -588,6 +595,7 @@ function TerrainMaterialDlg::restoreMaterials( %this )
|
|||
%mat.macroDistance = %obj.macroDistance;
|
||||
%mat.useSideProjection = %obj.useSideProjection;
|
||||
%mat.parallaxScale = %obj.parallaxScale;
|
||||
%mat.blendDepth = %obj.blendDepth;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -623,3 +631,17 @@ function TerrainMaterialDlg::_selectTextureFileDialog( %this, %defaultFileName )
|
|||
|
||||
return %file;
|
||||
}
|
||||
|
||||
function TerrainMaterialDlgBlendDepthSlider::onMouseDragged(%this)
|
||||
{
|
||||
%value = mFloor(%this.value * 1000)/1000;
|
||||
TerrainMaterialDlgBlendDepthTextEdit.setText(%value);
|
||||
TerrainMaterialDlg.activeMat.blendDepth = %this.value;
|
||||
|
||||
}
|
||||
|
||||
function TerrainMaterialDlgBlendDepthTextEdit::onValidate(%this)
|
||||
{
|
||||
TerrainMaterialDlgBlendDepthSlider.setValue(%this.getText());
|
||||
TerrainMaterialDlg.activeMat.blendDepth = %this.getText();
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ new TerrainMaterial()
|
|||
Enabled = "1";
|
||||
diffuseSize = "200";
|
||||
normalMap = "art/terrains/Example/grass1_n";
|
||||
detailDistance = "1000";
|
||||
};
|
||||
|
||||
singleton Material(TerrainFX_grass2)
|
||||
|
|
|
|||
|
|
@ -32,10 +32,12 @@ float calcBlend( float texId, vec2 layerCoord, float layerSize, vec4 layerSample
|
|||
vec4 diff = clamp( abs( layerSample - texId ), 0.0, 1.0 );
|
||||
float noBlend = float(any( bvec4(1 - diff) ));
|
||||
|
||||
// Use step to see if any of the layer samples
|
||||
// match the current texture id.
|
||||
vec4 factors = step( texId, layerSample );
|
||||
|
||||
vec4 factors = vec4(0);
|
||||
for(int i = 0; i < 4; i++)
|
||||
if(layerSample[i] == texId)
|
||||
factors[i] = 1;
|
||||
|
||||
// This is a custom bilinear filter.
|
||||
|
||||
vec2 uv = layerCoord * layerSize;
|
||||
|
|
|
|||
|
|
@ -210,7 +210,7 @@
|
|||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "270 3";
|
||||
position = "250 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
|
|
@ -222,7 +222,7 @@
|
|||
Profile = "ToolsGuiDefaultProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
Position = "262 5";
|
||||
Position = "242 5";
|
||||
Extent = "256 50";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -370,7 +370,7 @@
|
|||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "525 3";
|
||||
position = "495 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
|
|
@ -382,7 +382,7 @@
|
|||
Profile = "ToolsGuiTransparentProfile";
|
||||
HorizSizing = "right";
|
||||
VertSizing = "bottom";
|
||||
position = "540 5";
|
||||
position = "510 5";
|
||||
Extent = "120 50";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -454,6 +454,53 @@
|
|||
bitmap = "tools/gui/images/dropslider";
|
||||
};
|
||||
};
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
Enabled = "1";
|
||||
Profile = "ToolsGuiDefaultProfile";
|
||||
position = "618 3";
|
||||
Extent = "2 26";
|
||||
MinExtent = "1 1";
|
||||
bitmap = "tools/gui/images/separator-h.png";
|
||||
};
|
||||
|
||||
new GuiControl(LerpBlendCheckButtonContainer,EditorGuiGroup) {
|
||||
position = "628 5";
|
||||
extent = "70 50";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiTransparentProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
|
||||
new GuiCheckBoxCtrl() {
|
||||
text = " LerpBlend";
|
||||
groupNum = "-1";
|
||||
buttonType = "ToggleButton";
|
||||
useMouseEvents = "0";
|
||||
position = "0 2";
|
||||
extent = "140 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiCheckBoxProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
command = "ETerrainEditor.toggleBlendType($ThisControl);";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "LerpBlendCheckBox";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -634,4 +681,3 @@ new GuiMouseEventCtrl(PaintBrushSoftnessSliderCtrlContainer,EditorGuiGroup) {
|
|||
value = "0";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
HorizSizing = "center";
|
||||
VertSizing = "center";
|
||||
position = "221 151";
|
||||
Extent = "394 432";
|
||||
MinExtent = "358 432";
|
||||
Extent = "394 452";
|
||||
MinExtent = "358 452";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
tooltipprofile = "ToolsGuiToolTipProfile";
|
||||
|
|
@ -106,7 +106,7 @@
|
|||
HorizSizing = "left";
|
||||
VertSizing = "height";
|
||||
position = "202 26";
|
||||
Extent = "185 363";
|
||||
Extent = "185 383";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -439,7 +439,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "bottom";
|
||||
position = "6 295";
|
||||
Extent = "185 50";
|
||||
Extent = "185 80";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -621,6 +621,78 @@
|
|||
sinkAllKeyEvents = "0";
|
||||
passwordMask = "*";
|
||||
};
|
||||
new GuiSliderCtrl(TerrainMaterialDlgBlendDepthSlider) {
|
||||
range = "0.01 0.99";
|
||||
ticks = "0";
|
||||
snap = "0";
|
||||
value = "0.5";
|
||||
position = "39 61";
|
||||
extent = "70 14";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiSliderProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "blendDepthSliderCtrl";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextCtrl() {
|
||||
text = "Blend Depth";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "1";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "1";
|
||||
anchorRight = "0";
|
||||
position = "115 61";
|
||||
extent = "58 15";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "GuiTextProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "GuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "1";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
new GuiTextEditCtrl(TerrainMaterialDlgBlendDepthTextEdit) {
|
||||
historySize = "0";
|
||||
tabComplete = "0";
|
||||
sinkAllKeyEvents = "0";
|
||||
password = "0";
|
||||
passwordMask = "*";
|
||||
text = "0.3";
|
||||
maxLength = "1024";
|
||||
margin = "0 0 0 0";
|
||||
padding = "0 0 0 0";
|
||||
anchorTop = "0";
|
||||
anchorBottom = "0";
|
||||
anchorLeft = "0";
|
||||
anchorRight = "0";
|
||||
position = "1 59";
|
||||
extent = "35 18";
|
||||
minExtent = "8 2";
|
||||
horizSizing = "right";
|
||||
vertSizing = "bottom";
|
||||
profile = "ToolsGuiTextEditProfile";
|
||||
visible = "1";
|
||||
active = "1";
|
||||
tooltipProfile = "ToolsGuiToolTipProfile";
|
||||
hovertime = "1000";
|
||||
isContainer = "0";
|
||||
internalName = "blendDepthTextEditCtrl";
|
||||
canSave = "1";
|
||||
canSaveDynamicFields = "0";
|
||||
};
|
||||
};
|
||||
|
||||
new GuiBitmapCtrl() {
|
||||
|
|
@ -1260,7 +1332,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "6 42";
|
||||
Extent = "189 373";
|
||||
Extent = "189 393";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -1274,7 +1346,7 @@
|
|||
HorizSizing = "width";
|
||||
VertSizing = "height";
|
||||
position = "0 0";
|
||||
Extent = "189 374";
|
||||
Extent = "189 394";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
Visible = "1";
|
||||
|
|
@ -1333,7 +1405,7 @@
|
|||
Profile = "ToolsGuiButtonProfile";
|
||||
HorizSizing = "left";
|
||||
VertSizing = "top";
|
||||
position = "202 394";
|
||||
position = "202 414";
|
||||
Extent = "98 22";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -1352,7 +1424,7 @@
|
|||
Profile = "ToolsGuiButtonProfile";
|
||||
HorizSizing = "left";
|
||||
VertSizing = "top";
|
||||
position = "307 394";
|
||||
position = "307 414";
|
||||
Extent = "80 22";
|
||||
MinExtent = "8 2";
|
||||
canSave = "1";
|
||||
|
|
@ -1372,7 +1444,7 @@
|
|||
HorizSizing = "left";
|
||||
VertSizing = "height";
|
||||
position = "199 23";
|
||||
Extent = "190 267";
|
||||
Extent = "190 287";
|
||||
isContainer = true;
|
||||
Visible = false;
|
||||
bitmap = "tools/gui/images/inactive-overlay";
|
||||
|
|
@ -1389,4 +1461,4 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
//--- OBJECT WRITE END ---
|
||||
//--- OBJECT WRITE END ---
|
||||
|
|
@ -222,6 +222,8 @@ function EPainter::setup( %this, %matIndex )
|
|||
ETerrainEditor.setAction( ETerrainEditor.currentAction );
|
||||
EditorGuiStatusBar.setInfo(ETerrainEditor.currentActionDesc);
|
||||
ETerrainEditor.renderVertexSelection = true;
|
||||
|
||||
EWTerrainPainterToolbar-->LerpBlendCheckBox.setValue($Pref::Terrain::LerpBlend);
|
||||
}
|
||||
|
||||
function onNeedRelight()
|
||||
|
|
@ -257,6 +259,11 @@ function TerrainEditor::toggleBrushType( %this, %brush )
|
|||
%this.setBrushType( %brush.internalName );
|
||||
}
|
||||
|
||||
function TerrainEditor::toggleBlendType( %this, %check )
|
||||
{
|
||||
$Pref::Terrain::LerpBlend = %check.getValue();
|
||||
}
|
||||
|
||||
function TerrainEditor::offsetBrush(%this, %x, %y)
|
||||
{
|
||||
%curPos = %this.getBrushPos();
|
||||
|
|
|
|||
|
|
@ -401,6 +401,9 @@ function TerrainMaterialDlg::setActiveMaterial( %this, %mat )
|
|||
%this-->detDistanceCtrl.setText( %mat.detailDistance );
|
||||
%this-->sideProjectionCtrl.setValue( %mat.useSideProjection );
|
||||
%this-->parallaxScaleCtrl.setText( %mat.parallaxScale );
|
||||
%blendDepth = mFloor(%mat.blendDepth * 1000)/1000;
|
||||
%this-->blendDepthTextEditCtrl.setText( %blendDepth );
|
||||
%this-->blendDepthSliderCtrl.setValue( %mat.blendDepth );
|
||||
|
||||
%this-->macroSizeCtrl.setText( %mat.macroSize );
|
||||
%this-->macroStrengthCtrl.setText( %mat.macroStrength );
|
||||
|
|
@ -454,6 +457,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%detailDistance = %this-->detDistanceCtrl.getText();
|
||||
%useSideProjection = %this-->sideProjectionCtrl.getValue();
|
||||
%parallaxScale = %this-->parallaxScaleCtrl.getText();
|
||||
%blendDepth = %this-->blendDepthTextEditCtrl.getText();
|
||||
|
||||
%macroSize = %this-->macroSizeCtrl.getText();
|
||||
%macroStrength = %this-->macroStrengthCtrl.getText();
|
||||
|
|
@ -475,7 +479,8 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%mat.macroSize == %macroSize &&
|
||||
%mat.macroStrength == %macroStrength &&
|
||||
%mat.macroDistance == %macroDistance &&
|
||||
%mat.parallaxScale == %parallaxScale )
|
||||
%mat.parallaxScale == %parallaxScale &&
|
||||
%mat.blendDepth == %blendDepth)
|
||||
return;
|
||||
|
||||
// Make sure the material name is unique.
|
||||
|
|
@ -509,6 +514,7 @@ function TerrainMaterialDlg::saveDirtyMaterial( %this, %mat )
|
|||
%mat.macroDistance = %macroDistance;
|
||||
%mat.useSideProjection = %useSideProjection;
|
||||
%mat.parallaxScale = %parallaxScale;
|
||||
%mat.blendDepth = %blendDepth;
|
||||
|
||||
// Mark the material as dirty and needing saving.
|
||||
|
||||
|
|
@ -554,6 +560,7 @@ function TerrainMaterialDlg::snapshotMaterials( %this )
|
|||
macroDistance = %mat.macroDistance;
|
||||
useSideProjection = %mat.useSideProjection;
|
||||
parallaxScale = %mat.parallaxScale;
|
||||
blendDepth = %mat.blendDepth;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -588,6 +595,7 @@ function TerrainMaterialDlg::restoreMaterials( %this )
|
|||
%mat.macroDistance = %obj.macroDistance;
|
||||
%mat.useSideProjection = %obj.useSideProjection;
|
||||
%mat.parallaxScale = %obj.parallaxScale;
|
||||
%mat.blendDepth = %obj.blendDepth;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -623,3 +631,17 @@ function TerrainMaterialDlg::_selectTextureFileDialog( %this, %defaultFileName )
|
|||
|
||||
return %file;
|
||||
}
|
||||
|
||||
function TerrainMaterialDlgBlendDepthSlider::onMouseDragged(%this)
|
||||
{
|
||||
%value = mFloor(%this.value * 1000)/1000;
|
||||
TerrainMaterialDlgBlendDepthTextEdit.setText(%value);
|
||||
TerrainMaterialDlg.activeMat.blendDepth = %this.value;
|
||||
|
||||
}
|
||||
|
||||
function TerrainMaterialDlgBlendDepthTextEdit::onValidate(%this)
|
||||
{
|
||||
TerrainMaterialDlgBlendDepthSlider.setValue(%this.getText());
|
||||
TerrainMaterialDlg.activeMat.blendDepth = %this.getText();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue