mirror of
https://github.com/Misterblue/convoar.git
synced 2026-08-14 00:57:55 +00:00
Move a few more things into CommonEntities (GltfClasses, WebGLConstants, JSONHelpers).
Remove some references to 'ConvOAR.Globals' in things in CommonEntities. Update prebuild-CommonEntities to have reference to CommonEntitiesUtil. Suppress style warnings in MeshmerizerR so the source stays close to libomv. Remove old core .csproj files. Core and Standard don't have System.Drawing.
This commit is contained in:
Robert Adams
@@ -363,7 +363,7 @@ namespace org.herbal3d.cs.os.CommonEntities {
|
||||
if (asset != null) {
|
||||
if (asset.IsBinaryAsset && asset.Type == (sbyte)OMV.AssetType.Texture) {
|
||||
try {
|
||||
if (_params.P<bool>("UseOpenJPEG")) {
|
||||
// if (_params.P<bool>("UseOpenJPEG")) {
|
||||
if (OpenJPEG.DecodeToImage(asset.Data, out ManagedImage mimage, out imageDecoded)) {
|
||||
mimage = null; // 'mimage' is unused so release the reference
|
||||
}
|
||||
@@ -371,12 +371,12 @@ namespace org.herbal3d.cs.os.CommonEntities {
|
||||
// Could not decode the image. Odd.
|
||||
imageDecoded = null;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Code for using NuGet CSJ2K. Thought it might be better but noticed no difference.
|
||||
CSJ2K.Util.BitmapImageCreator.Register();
|
||||
imageDecoded = CSJ2K.J2kImage.FromBytes(asset.Data).As<Bitmap>();
|
||||
}
|
||||
// }
|
||||
// else {
|
||||
// // Code for using NuGet CSJ2K. Thought it might be better but noticed no difference.
|
||||
// CSJ2K.Util.BitmapImageCreator.Register();
|
||||
// imageDecoded = CSJ2K.J2kImage.FromBytes(asset.Data).As<Bitmap>();
|
||||
// }
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new Exception("FetchTextureAsImage: exception decoding JPEG2000 texture. ID=" + handle.ToString()
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp2.2</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CSJ2K" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Util\CommonEntitiesUtil.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="Nini">
|
||||
<HintPath>..\libs\Nini.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse">
|
||||
<HintPath>..\libs\OpenMetaverse.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.Rendering.Meshmerizer">
|
||||
<HintPath>..\libs\OpenMetaverse.Rendering.Meshmerizer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData">
|
||||
<HintPath>..\libs\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes">
|
||||
<HintPath>..\libs\OpenMetaverseTypes.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Capabilities">
|
||||
<HintPath>..\libs\OpenSim.Capabilities.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Data.Null">
|
||||
<HintPath>..\libs\OpenSim.Data.Null.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework">
|
||||
<HintPath>..\libs\OpenSim.Framework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Monitoring">
|
||||
<HintPath>..\libs\OpenSim.Framework.Monitoring.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Serialization">
|
||||
<HintPath>..\libs\OpenSim.Framework.Serialization.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Servers.HttpServer">
|
||||
<HintPath>..\libs\OpenSim.Framework.Servers.HttpServer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.CoreModules">
|
||||
<HintPath>..\libs\OpenSim.Region.CoreModules.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.Framework">
|
||||
<HintPath>..\libs\OpenSim.Region.Framework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.PhysicsModule.BasicPhysics">
|
||||
<HintPath>..\libs\OpenSim.Region.PhysicsModule.BasicPhysics.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.PhysicsModules.SharedBase">
|
||||
<HintPath>..\libs\OpenSim.Region.PhysicsModules.SharedBase.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Services.Connectors">
|
||||
<HintPath>..\libs\OpenSim.Services.Connectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Services.Interfaces">
|
||||
<HintPath>..\libs\OpenSim.Services.Interfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Tests.Common">
|
||||
<HintPath>..\libs\OpenSim.Tests.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PrimMesher">
|
||||
<HintPath>..\libs\PrimMesher.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SmartThreadPool">
|
||||
<HintPath>..\libs\SmartThreadPool.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,132 +1,288 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{C9DADDA3-1AD2-4378-9417-D681FADCA107}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>CommonEntities</RootNamespace>
|
||||
<AssemblyName>CommonEntities</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<Deterministic>true</Deterministic>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CSJ2K, Version=3.0.0.0, Culture=neutral, PublicKeyToken=0ca7be2ec378a773, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CSJ2K.3.0.0\lib\net40-client\CSJ2K.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Nini">
|
||||
<HintPath>..\libs\Nini.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse">
|
||||
<HintPath>..\libs\OpenMetaverse.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData">
|
||||
<HintPath>..\libs\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes">
|
||||
<HintPath>..\libs\OpenMetaverseTypes.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Capabilities">
|
||||
<HintPath>..\libs\OpenSim.Capabilities.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Data.Null">
|
||||
<HintPath>..\libs\OpenSim.Data.Null.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework">
|
||||
<HintPath>..\libs\OpenSim.Framework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Monitoring">
|
||||
<HintPath>..\libs\OpenSim.Framework.Monitoring.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Serialization">
|
||||
<HintPath>..\libs\OpenSim.Framework.Serialization.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Framework.Servers.HttpServer">
|
||||
<HintPath>..\libs\OpenSim.Framework.Servers.HttpServer.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.CoreModules">
|
||||
<HintPath>..\libs\OpenSim.Region.CoreModules.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.Framework">
|
||||
<HintPath>..\libs\OpenSim.Region.Framework.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.PhysicsModule.BasicPhysics">
|
||||
<HintPath>..\libs\OpenSim.Region.PhysicsModule.BasicPhysics.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.PhysicsModules.SharedBase">
|
||||
<HintPath>..\libs\OpenSim.Region.PhysicsModules.SharedBase.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Services.Connectors">
|
||||
<HintPath>..\libs\OpenSim.Services.Connectors.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Services.Interfaces">
|
||||
<HintPath>..\libs\OpenSim.Services.Interfaces.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Tests.Common">
|
||||
<HintPath>..\libs\OpenSim.Tests.Common.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="PrimMesher">
|
||||
<HintPath>..\libs\PrimMesher.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="SmartThreadPool">
|
||||
<HintPath>..\libs\SmartThreadPool.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
|
||||
<PropertyGroup>
|
||||
<ProjectType>Local</ProjectType>
|
||||
<ProductVersion>14.0.23107.0</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{E5FBCD68-0000-0000-0000-000000000000}</ProjectGuid>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<ApplicationIcon></ApplicationIcon>
|
||||
<AssemblyKeyContainerName>
|
||||
</AssemblyKeyContainerName>
|
||||
<AssemblyName>CommonEntities</AssemblyName>
|
||||
<DefaultClientScript>JScript</DefaultClientScript>
|
||||
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
|
||||
<DefaultTargetSchema>IE50</DefaultTargetSchema>
|
||||
<DelaySign>false</DelaySign>
|
||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder></AppDesignerFolder>
|
||||
<RootNamespace>CommonEntities</RootNamespace>
|
||||
<StartupObject></StartupObject>
|
||||
<StartArguments></StartArguments>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
|
||||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE;DEBUG;</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DebugSymbols>True</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>False</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<RegisterForComInterop>False</RegisterForComInterop>
|
||||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<NoWarn></NoWarn>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<Prefer32Bit>False</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
|
||||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE;</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>True</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<RegisterForComInterop>False</RegisterForComInterop>
|
||||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<NoWarn></NoWarn>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<Prefer32Bit>False</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="CSJ2K" >
|
||||
<Name>CSJ2K</Name>
|
||||
<HintPath>..\..\..\bin\CSJ2K.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="log4net" >
|
||||
<Name>log4net</Name>
|
||||
<HintPath>..\..\..\bin\log4net.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Mono.Addins" >
|
||||
<Name>Mono.Addins</Name>
|
||||
<HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Nini" >
|
||||
<Name>Nini</Name>
|
||||
<HintPath>..\..\..\bin\Nini.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse" >
|
||||
<Name>OpenMetaverse</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverse.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData" >
|
||||
<Name>OpenMetaverse.StructuredData</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes" >
|
||||
<Name>OpenMetaverseTypes</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverseTypes.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenSim.Region.PhysicsModules.BasiPhysics" >
|
||||
<Name>OpenSim.Region.PhysicsModules.BasiPhysics</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="PrimMesher" >
|
||||
<Name>PrimMesher</Name>
|
||||
<HintPath>..\..\..\bin\PrimMesher.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" >
|
||||
<Name>System</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" >
|
||||
<Name>System.Core</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" >
|
||||
<Name>System.Data</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.DataSetExtensions" >
|
||||
<Name>System.Data.DataSetExtensions</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" >
|
||||
<Name>System.Drawing</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http" >
|
||||
<Name>System.Net.Http</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection" >
|
||||
<Name>System.Reflection</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" >
|
||||
<Name>System.Xml</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\CommonEntitiesUtil\CommonEntitiesUtil.csproj">
|
||||
<Name>CommonEntitiesUtil</Name>
|
||||
<Project>{A9D65554-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Capabilities\OpenSim.Capabilities.csproj">
|
||||
<Name>OpenSim.Capabilities</Name>
|
||||
<Project>{FF56527B-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Data\Null\OpenSim.Data.Null.csproj">
|
||||
<Name>OpenSim.Data.Null</Name>
|
||||
<Project>{8D314DCC-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Framework\OpenSim.Framework.csproj">
|
||||
<Name>OpenSim.Framework</Name>
|
||||
<Project>{BCCDBB55-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Framework\Monitoring\OpenSim.Framework.Monitoring.csproj">
|
||||
<Name>OpenSim.Framework.Monitoring</Name>
|
||||
<Project>{69AB1BC7-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Framework\Serialization\OpenSim.Framework.Serialization.csproj">
|
||||
<Name>OpenSim.Framework.Serialization</Name>
|
||||
<Project>{BD63E665-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Framework\Servers\HttpServer\OpenSim.Framework.Servers.HttpServer.csproj">
|
||||
<Name>OpenSim.Framework.Servers.HttpServer</Name>
|
||||
<Project>{159EC5C2-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Region\CoreModules\OpenSim.Region.CoreModules.csproj">
|
||||
<Name>OpenSim.Region.CoreModules</Name>
|
||||
<Project>{B60B8DCD-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Region\Framework\OpenSim.Region.Framework.csproj">
|
||||
<Name>OpenSim.Region.Framework</Name>
|
||||
<Project>{C98F6D97-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Region\PhysicsModules\SharedBase\OpenSim.Region.PhysicsModules.SharedBase.csproj">
|
||||
<Name>OpenSim.Region.PhysicsModules.SharedBase</Name>
|
||||
<Project>{EFA63A0B-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Services\Connectors\OpenSim.Services.Connectors.csproj">
|
||||
<Name>OpenSim.Services.Connectors</Name>
|
||||
<Project>{B16DF9C1-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Services\Interfaces\OpenSim.Services.Interfaces.csproj">
|
||||
<Name>OpenSim.Services.Interfaces</Name>
|
||||
<Project>{08ECE473-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\OpenSim\Tests\Common\OpenSim.Tests.Common.csproj">
|
||||
<Name>OpenSim.Tests.Common</Name>
|
||||
<Project>{CC43930F-0000-0000-0000-000000000000}</Project>
|
||||
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
|
||||
<Private>False</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AssetManager.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BAttributes.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BConverterOS.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BCoordinates.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BInstance.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BScene.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="BSceneManipulation.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Displayable.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="GltfClasses.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ImageInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="JSONHelpers.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MaterialInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MeshInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MeshmerizerR.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="PersistRules.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="PrimToMesh.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Terrain.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="WebGLConstants.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="AssetManager.cs" />
|
||||
<Compile Include="BAttributes.cs" />
|
||||
<Compile Include="BConverterOS.cs" />
|
||||
<Compile Include="BCoordinates.cs" />
|
||||
<Compile Include="BInstance.cs" />
|
||||
<Compile Include="BScene.cs" />
|
||||
<Compile Include="BSceneManipulation.cs" />
|
||||
<Compile Include="Displayable.cs" />
|
||||
<Compile Include="ImageInfo.cs" />
|
||||
<Compile Include="MaterialInfo.cs" />
|
||||
<Compile Include="MeshInfo.cs" />
|
||||
<Compile Include="MeshmerizerR.cs" />
|
||||
<Compile Include="PersistRules.cs" />
|
||||
<Compile Include="PrimToMesh.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Terrain.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\CommonEntitiesUtil\CommonEntitiesUtil.csproj">
|
||||
<Project>{dab7cef5-c7c1-4dfa-85d7-267658efc466}</Project>
|
||||
<Name>CommonEntitiesUtil</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -19,14 +19,13 @@ using System.Collections.Generic;
|
||||
using System.IO;
|
||||
|
||||
using org.herbal3d.cs.CommonEntitiesUtil;
|
||||
using org.herbal3d.cs.os.CommonEntities;
|
||||
|
||||
// I hoped to keep the Gltf classes separate from the OMV requirement but
|
||||
// it doesn't make sense to copy all the mesh info into new structures.
|
||||
using OMV = OpenMetaverse;
|
||||
using OMVR = OpenMetaverse.Rendering;
|
||||
|
||||
namespace org.herbal3d.convoar {
|
||||
namespace org.herbal3d.cs.os.CommonEntities {
|
||||
|
||||
// The base class for all of the different types.
|
||||
public abstract class GltfClass {
|
||||
@@ -53,8 +52,8 @@ namespace org.herbal3d.convoar {
|
||||
|
||||
// Output messge of --LogGltfBuilding was specified
|
||||
protected void LogGltf(string msg, params Object[] args) {
|
||||
if (ConvOAR.Globals.parms.P<bool>("LogGltfBuilding")) {
|
||||
ConvOAR.Globals.log.Log(msg, args);
|
||||
if (_params.P<bool>("LogGltfBuilding")) {
|
||||
_log.Log(msg, args);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -237,7 +236,7 @@ namespace org.herbal3d.convoar {
|
||||
// After all the nodes have been added to a Gltf class, build all the
|
||||
// dependent structures
|
||||
public void BuildAccessorsAndBuffers() {
|
||||
int maxVerticesPerBuffer = ConvOAR.Globals.parms.P<int>("VerticesMaxForBuffer");
|
||||
int maxVerticesPerBuffer = _params.P<int>("VerticesMaxForBuffer");
|
||||
|
||||
// Partition the meshes into smaller groups based on number of vertices going out
|
||||
List<GltfPrimitive> partial = new List<GltfPrimitive>();
|
||||
@@ -603,13 +602,15 @@ namespace org.herbal3d.convoar {
|
||||
values = new GltfAttributes {
|
||||
{ "generator", "convoar" },
|
||||
{ "version", "2.0" },
|
||||
{ "copyright", ConvOAR.Globals.parms.P<string>("GltfCopyright") }
|
||||
{ "copyright", _params.P<string>("GltfCopyright") }
|
||||
};
|
||||
/*
|
||||
extras = new GltfAttributes {
|
||||
{ "convoarCommit", ConvOAR.Globals.gitCommit },
|
||||
{ "convoarVersion", ConvOAR.Globals.version },
|
||||
{ "convoarBuildDate", ConvOAR.Globals.buildDate },
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
||||
public override Object AsJSON() {
|
||||
@@ -804,7 +805,7 @@ namespace org.herbal3d.convoar {
|
||||
hasher.Add(prim.bHash);
|
||||
});
|
||||
bHash = hasher.Finish();
|
||||
if (ConvOAR.Globals.parms.P<bool>("AddUniqueCodes")) {
|
||||
if (_params.P<bool>("AddUniqueCodes")) {
|
||||
// Add a unique code to the extras section
|
||||
extras.Add("uniqueHash", bHash.ToString());
|
||||
}
|
||||
@@ -950,8 +951,8 @@ namespace org.herbal3d.convoar {
|
||||
transparency = surfaceColor.A;
|
||||
transparent = true;
|
||||
}
|
||||
if (ConvOAR.Globals.parms.P<bool>("DoubleSided")) {
|
||||
doubleSided = ConvOAR.Globals.parms.P<bool>("DoubleSided");
|
||||
if (_params.P<bool>("DoubleSided")) {
|
||||
doubleSided = _params.P<bool>("DoubleSided");
|
||||
}
|
||||
if (matInfo.shiny != OMV.Shininess.None) {
|
||||
shininess = (float)matInfo.shiny / 256f;
|
||||
@@ -992,7 +993,7 @@ namespace org.herbal3d.convoar {
|
||||
// Check if that is being done and find the reference to the resized image
|
||||
private ImageInfo CheckForResizedImage(ImageInfo origImage, AssetManager assetManager) {
|
||||
ImageInfo ret = origImage;
|
||||
int maxSize = ConvOAR.Globals.parms.P<int>("TextureMaxSize");
|
||||
int maxSize = _params.P<int>("TextureMaxSize");
|
||||
if (origImage.resizable && maxSize > 0 && maxSize < 10000) {
|
||||
if (origImage.xSize > maxSize || origImage.ySize > maxSize) {
|
||||
origImage.ConstrainTextureSize(maxSize);
|
||||
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
|
||||
|
||||
using OMV = OpenMetaverse;
|
||||
|
||||
namespace org.herbal3d.convoar {
|
||||
namespace org.herbal3d.cs.os.CommonEntities {
|
||||
// Some static routines for creating JSON output
|
||||
public class JSONHelpers {
|
||||
|
||||
@@ -35,7 +35,7 @@ namespace org.herbal3d.convoar {
|
||||
|
||||
public static void SimpleOutputValue(StreamWriter outt, Object val, int level) {
|
||||
if (val == null) {
|
||||
ConvOAR.Globals.log.ErrorFormat("SimpleJSONOutput: called with NULL value");
|
||||
// _log.ErrorFormat("SimpleJSONOutput: called with NULL value");
|
||||
val = "null";
|
||||
}
|
||||
if (val is string) {
|
||||
@@ -90,17 +90,17 @@ namespace org.herbal3d.convoar {
|
||||
// rather than a number and causing parsing errors. This code tells the
|
||||
// user something is wrong but puts a number in the output JSON.
|
||||
else if (val is float && Single.IsNaN((float)val)) {
|
||||
ConvOAR.Globals.log.ErrorFormat("JSONHelpers: Value is Single.NaN!!");
|
||||
// _log.ErrorFormat("JSONHelpers: Value is Single.NaN!!");
|
||||
outt.Write("0");
|
||||
}
|
||||
else if (val is double && Double.IsNaN((double)val)) {
|
||||
ConvOAR.Globals.log.ErrorFormat("JSONHelpers: Value is Double.NaN!!");
|
||||
// _log.ErrorFormat("JSONHelpers: Value is Double.NaN!!");
|
||||
outt.Write("0");
|
||||
}
|
||||
else {
|
||||
var ret = val.ToString();
|
||||
if (ret == "NaN") {
|
||||
ConvOAR.Globals.log.ErrorFormat("JSONHelpers: Value is NaN!!");
|
||||
// _log.ErrorFormat("JSONHelpers: Value is NaN!!");
|
||||
}
|
||||
else {
|
||||
outt.Write(val);
|
||||
Regular → Executable
+47
-8
@@ -43,6 +43,10 @@ using OMVR = OpenMetaverse.Rendering;
|
||||
|
||||
namespace OpenMetaverse.Rendering
|
||||
{
|
||||
// Following pragma added as we don't want to change this file too much so changes
|
||||
// in libOpenMetaverse can be tracked.
|
||||
#pragma warning disable IDE0017 // Simplify object initialization
|
||||
#pragma warning disable IDE0019 // Use pattern matching
|
||||
/// <summary>
|
||||
/// Meshing code based on the Idealist Viewer (20081213).
|
||||
/// </summary>
|
||||
@@ -60,9 +64,9 @@ namespace OpenMetaverse.Rendering
|
||||
{
|
||||
PrimMesher.PrimMesh newPrim = GeneratePrimMesh(prim, lod, false);
|
||||
if (newPrim == null)
|
||||
return null;
|
||||
|
||||
SimpleMesh mesh = new SimpleMesh();
|
||||
return null;
|
||||
|
||||
SimpleMesh mesh = new SimpleMesh();
|
||||
mesh.Path = new Path();
|
||||
mesh.Prim = prim;
|
||||
mesh.Profile = new Profile();
|
||||
@@ -422,11 +426,11 @@ namespace OpenMetaverse.Rendering
|
||||
public OMVR.FacetedMesh MeshSubMeshAsFacetedMesh(OMV.Primitive prim, byte[] compressedMeshData)
|
||||
{
|
||||
OMVR.FacetedMesh ret = null;
|
||||
OSD meshOSD = Helpers.DecompressOSD(compressedMeshData);
|
||||
OSD meshOSD = DecompressOSD(compressedMeshData);
|
||||
|
||||
if (meshOSD != null)
|
||||
{
|
||||
OSDArray meshFaces = meshOSD as OSDArray;
|
||||
{
|
||||
OSDArray meshFaces = meshOSD as OSDArray;
|
||||
if (meshFaces != null)
|
||||
{
|
||||
ret = new FacetedMesh();
|
||||
@@ -445,7 +449,7 @@ namespace OpenMetaverse.Rendering
|
||||
public OMVR.SimpleMesh MeshSubMeshAsSimpleMesh(OMV.Primitive prim, byte[] compressedMeshData)
|
||||
{
|
||||
OMVR.SimpleMesh ret = null;
|
||||
OSD meshOSD = Helpers.DecompressOSD(compressedMeshData);
|
||||
OSD meshOSD = DecompressOSD(compressedMeshData);
|
||||
|
||||
if (meshOSD != null)
|
||||
{
|
||||
@@ -462,11 +466,44 @@ namespace OpenMetaverse.Rendering
|
||||
return ret;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// decompresses a gzipped OSD object
|
||||
/// </summary>
|
||||
/// <param name="decodedOsd"></param> the OSD object
|
||||
/// <param name="meshBytes"></param>
|
||||
/// <returns></returns>
|
||||
// 20190211: imported from libOpenMetaverse.Helpers as OpenSim libomv doesn't have it
|
||||
private OSD DecompressOSD(byte[] meshBytes) {
|
||||
OSD decodedOsd = null;
|
||||
|
||||
using (MemoryStream inMs = new MemoryStream(meshBytes)) {
|
||||
using (MemoryStream outMs = new MemoryStream()) {
|
||||
using (DeflateStream decompressionStream = new DeflateStream(inMs, CompressionMode.Decompress)) {
|
||||
byte[] readBuffer = new byte[2048];
|
||||
inMs.Read(readBuffer, 0, 2); // skip first 2 bytes in header
|
||||
int readLen = 0;
|
||||
|
||||
while ((readLen = decompressionStream.Read(readBuffer, 0, readBuffer.Length)) > 0)
|
||||
outMs.Write(readBuffer, 0, readLen);
|
||||
|
||||
outMs.Flush();
|
||||
|
||||
outMs.Seek(0, SeekOrigin.Begin);
|
||||
|
||||
byte[] decompressedBuf = outMs.GetBuffer();
|
||||
|
||||
decodedOsd = OSDParser.DeserializeLLSDBinary(decompressedBuf);
|
||||
}
|
||||
}
|
||||
}
|
||||
return decodedOsd;
|
||||
}
|
||||
|
||||
public List<List<Vector3>> MeshSubMeshAsConvexHulls(OMV.Primitive prim, byte[] compressedMeshData)
|
||||
{
|
||||
List<List<Vector3>> hulls = new List<List<Vector3>>();
|
||||
try {
|
||||
OSD convexBlockOsd = Helpers.DecompressOSD(compressedMeshData);
|
||||
OSD convexBlockOsd = DecompressOSD(compressedMeshData);
|
||||
|
||||
if (convexBlockOsd != null && convexBlockOsd is OSDMap) {
|
||||
OSDMap convexBlock = convexBlockOsd as OSDMap;
|
||||
@@ -877,4 +914,6 @@ namespace OpenMetaverse.Rendering
|
||||
return terrain;
|
||||
}
|
||||
}
|
||||
#pragma warning restore IDE0019 // Use pattern matching
|
||||
#pragma warning restore IDE0017 // Simplify object initialization
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
// Derived from WebGLConstants.js from Cesium project. (Apache 2.0)
|
||||
namespace org.herbal3d.convoar {
|
||||
namespace org.herbal3d.cs.os.CommonEntities {
|
||||
|
||||
public class WebGLConstants {
|
||||
|
||||
@@ -1,65 +1,157 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{DAB7CEF5-C7C1-4DFA-85D7-267658EFC466}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>CommonEntitiesUtil</RootNamespace>
|
||||
<AssemblyName>CommonEntitiesUtil</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<Deterministic>true</Deterministic>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net">
|
||||
<HintPath>..\libs\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse">
|
||||
<HintPath>..\libs\OpenMetaverse.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData">
|
||||
<HintPath>..\libs\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes">
|
||||
<HintPath>..\libs\OpenMetaverseTypes.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
|
||||
<PropertyGroup>
|
||||
<ProjectType>Local</ProjectType>
|
||||
<ProductVersion>14.0.23107.0</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{A9D65554-0000-0000-0000-000000000000}</ProjectGuid>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<ApplicationIcon></ApplicationIcon>
|
||||
<AssemblyKeyContainerName>
|
||||
</AssemblyKeyContainerName>
|
||||
<AssemblyName>CommonEntitiesUtil</AssemblyName>
|
||||
<DefaultClientScript>JScript</DefaultClientScript>
|
||||
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
|
||||
<DefaultTargetSchema>IE50</DefaultTargetSchema>
|
||||
<DelaySign>false</DelaySign>
|
||||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder></AppDesignerFolder>
|
||||
<RootNamespace>CommonEntitiesUtil</RootNamespace>
|
||||
<StartupObject></StartupObject>
|
||||
<StartArguments></StartArguments>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
|
||||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE;DEBUG;</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DebugSymbols>True</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>False</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<RegisterForComInterop>False</RegisterForComInterop>
|
||||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<NoWarn></NoWarn>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<Prefer32Bit>False</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
|
||||
<ConfigurationOverrideFile>
|
||||
</ConfigurationOverrideFile>
|
||||
<DefineConstants>TRACE;</DefineConstants>
|
||||
<DocumentationFile></DocumentationFile>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
<FileAlignment>4096</FileAlignment>
|
||||
<Optimize>True</Optimize>
|
||||
<OutputPath>..\..\..\bin\</OutputPath>
|
||||
<RegisterForComInterop>False</RegisterForComInterop>
|
||||
<RemoveIntegerChecks>False</RemoveIntegerChecks>
|
||||
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<NoStdLib>False</NoStdLib>
|
||||
<NoWarn></NoWarn>
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<Prefer32Bit>False</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net" >
|
||||
<Name>log4net</Name>
|
||||
<HintPath>..\..\..\bin\log4net.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Mono.Addins" >
|
||||
<Name>Mono.Addins</Name>
|
||||
<HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="Nini" >
|
||||
<Name>Nini</Name>
|
||||
<HintPath>..\..\..\bin\Nini.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse" >
|
||||
<Name>OpenMetaverse</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverse.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData" >
|
||||
<Name>OpenMetaverse.StructuredData</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes" >
|
||||
<Name>OpenMetaverseTypes</Name>
|
||||
<HintPath>..\..\..\bin\OpenMetaverseTypes.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" >
|
||||
<Name>System</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Core" >
|
||||
<Name>System.Core</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data" >
|
||||
<Name>System.Data</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Data.DataSetExtensions" >
|
||||
<Name>System.Data.DataSetExtensions</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Drawing" >
|
||||
<Name>System.Drawing</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Net.Http" >
|
||||
<Name>System.Net.Http</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection" >
|
||||
<Name>System.Reflection</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" >
|
||||
<Name>System.Xml</Name>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="BHasher.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="EntityHandle.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="IParameters.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Logger.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Utilities.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="BHasher.cs" />
|
||||
<Compile Include="EntityHandle.cs" />
|
||||
<Compile Include="IParameters.cs" />
|
||||
<Compile Include="Logger.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="Utilities.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp2.2</TargetFramework>
|
||||
<RootNamespace>Util_core</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="log4net">
|
||||
<HintPath>..\libs\log4net.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse">
|
||||
<HintPath>..\libs\OpenMetaverse.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverse.StructuredData">
|
||||
<HintPath>..\libs\OpenMetaverse.StructuredData.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenMetaverseTypes">
|
||||
<HintPath>..\libs\OpenMetaverseTypes.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -43,7 +43,7 @@
|
||||
<Reference name="OpenSim.Region.PhysicsModules.BasiPhysics"/>
|
||||
<Reference name="OpenSim.Tests.Common"/>
|
||||
|
||||
<Reference name="org.herbal3d.cs.CommonEntitiesUtil" path="../../../bin/"/>
|
||||
<Reference name="CommonEntitiesUtil" path="../../../bin"/>
|
||||
|
||||
<Reference name="CSJ2K" path="../../../bin/"/>
|
||||
<Reference name="Nini" path="../../../bin/"/>
|
||||
|
||||
Reference in New Issue
Block a user