Module
/
OpenSim.Modules.Warp3DCachedImageModule
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove unaviable funktion

master
Christopher 2020-01-04 02:47:10 +01:00
parent 857e62abda
commit 514f78e6a1
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/OpenSim.Modules.Warp3DCachedImageModule.csproj
View File

@ -1,7 +1,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.30729</ProductVersion>
<ProductVersion>14.0.23107.0</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{D5EA1308-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -13,7 +13,7 @@
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder>
<RootNamespace>OpenSim.Modules.Warp3DCachedImageModule</RootNamespace>
@ -28,7 +28,7 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DefineConstants>TRACE;DEBUG;</DefineConstants>
<DocumentationFile></DocumentationFile>
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
@ -41,6 +41,7 @@
<NoStdLib>False</NoStdLib>
<NoWarn></NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
@ -48,7 +49,7 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants>TRACE;</DefineConstants>
<DocumentationFile></DocumentationFile>
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
@ -61,6 +62,7 @@
<NoStdLib>False</NoStdLib>
<NoWarn></NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Axiom.MathLib.dll" >
@ -204,7 +206,7 @@
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>

8
src/Warp3DImageModule.cs
View File

@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
warp_Material waterColorMaterial = new warp_Material(ConvertColor(WATER_COLOR));
waterColorMaterial.setReflectivity(0); // match water color with standard map module thanks lkalif
waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
//waterColorMaterial.setTransparency((byte)((1f - WATER_COLOR.A) * 255f));
renderer.Scene.addMaterial("WaterColor", waterColorMaterial);
for (int x = 0; x < m_scene.RegionInfo.RegionSizeX / 256; x++)
@ -702,8 +702,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
return name;
renderer.AddMaterial(name, ConvertColor(color));
if (color.A < 1f)
renderer.Scene.material(name).setTransparency((byte)((1f - color.A) * 255f));
//if (color.A < 1f)
//renderer.Scene.material(name).setTransparency((byte)((1f - color.A) * 255f));
return name;
}
@ -716,7 +716,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
renderer.AddMaterial(materialName, ConvertColor(faceColor));
if (faceColor.A < 1f)
{
renderer.Scene.material(materialName).setTransparency((byte) ((1f - faceColor.A)*255f));
//renderer.Scene.material(materialName).setTransparency((byte) ((1f - faceColor.A)*255f));
}
warp_Texture texture = GetTexture(textureID);
if (texture != null)