Display fully textured model in 3D view

Fixed prebuild to work with the inclusion of new library.

git-svn-id: https://radegast.googlecode.com/svn/trunk@498 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast.sln b/Radegast.sln
index 03f7c40..cb91627 100644 (file)
--- a/Radegast.sln
+++ b/Radegast.sln
@@ -24,6 +24,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RadSpeechLin", "plugins\Rad
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RadSpeechMac", "plugins\Radegast.Plugin.Speech\RadSpeechMac\RadSpeechMac.csproj", "{DDFA3357-938D-41A3-881E-152105641A3D}"\r
 EndProject\r
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMetaverse.Rendering.Meshmerizer", "..\libopenmetaverse\OpenMetaverse.Rendering.Meshmerizer\OpenMetaverse.Rendering.Meshmerizer.csproj", "{EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
@@ -126,6 +128,14 @@ Global
                {DDFA3357-938D-41A3-881E-152105641A3D}.Release|Any CPU.Build.0 = Release|Any CPU\r
                {DDFA3357-938D-41A3-881E-152105641A3D}.Release|x86.ActiveCfg = Release|x86\r
                {DDFA3357-938D-41A3-881E-152105641A3D}.Release|x86.Build.0 = Release|x86\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Debug|x86.ActiveCfg = Debug|x86\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Debug|x86.Build.0 = Debug|x86\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Release|Any CPU.Build.0 = Release|Any CPU\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Release|x86.ActiveCfg = Release|x86\r
+               {EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}.Release|x86.Build.0 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/Radegast/GUI/Consoles/ObjectsConsole.Designer.cs b/Radegast/GUI/Consoles/ObjectsConsole.Designer.cs
index c481770..b00bfa0 100644 (file)
--- a/Radegast/GUI/Consoles/ObjectsConsole.Designer.cs
+++ b/Radegast/GUI/Consoles/ObjectsConsole.Designer.cs
@@ -109,8 +109,8 @@ namespace Radegast
             this.lstContents = new Radegast.ListViewNoFlicker();\r
             this.invIcon = new System.Windows.Forms.ColumnHeader();\r
             this.invName = new System.Windows.Forms.ColumnHeader();\r
-            this.btnCloseContents = new System.Windows.Forms.Button();\r
             this.ctxContents = new Radegast.RadegastContextMenuStrip(this.components);\r
+            this.btnCloseContents = new System.Windows.Forms.Button();\r
             this.lstPrims = new Radegast.ListViewNoFlicker();\r
             this.columnHeader1 = new System.Windows.Forms.ColumnHeader();\r
             this.ctxMenuObjects = new Radegast.RadegastContextMenuStrip(this.components);\r
@@ -203,7 +203,7 @@ namespace Radegast
             this.btnView.Name = "btnView";\r
             this.btnView.Size = new System.Drawing.Size(77, 23);\r
             this.btnView.TabIndex = 13;\r
-            this.btnView.Text = "3D Wireframe";\r
+            this.btnView.Text = "3D View";\r
             this.btnView.UseVisualStyleBackColor = true;\r
             this.btnView.Click += new System.EventHandler(this.btnView_Click);\r
             // \r
@@ -658,6 +658,12 @@ namespace Radegast
             this.invName.Text = "";\r
             this.invName.Width = 196;\r
             // \r
+            // ctxContents\r
+            // \r
+            this.ctxContents.Name = "ctxContents";\r
+            this.ctxContents.Size = new System.Drawing.Size(61, 4);\r
+            this.ctxContents.Opening += new System.ComponentModel.CancelEventHandler(this.ctxContents_Opening);\r
+            // \r
             // btnCloseContents\r
             // \r
             this.btnCloseContents.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));\r
@@ -669,12 +675,6 @@ namespace Radegast
             this.btnCloseContents.UseVisualStyleBackColor = true;\r
             this.btnCloseContents.Click += new System.EventHandler(this.btnCloseContents_Click);\r
             // \r
-            // ctxContents\r
-            // \r
-            this.ctxContents.Name = "ctxContents";\r
-            this.ctxContents.Size = new System.Drawing.Size(61, 4);\r
-            this.ctxContents.Opening += new System.ComponentModel.CancelEventHandler(this.ctxContents_Opening);\r
-            // \r
             // lstPrims\r
             // \r
             this.lstPrims.AccessibleName = "Objects";\r

diff --git a/Radegast/Radegast.csproj b/Radegast/Radegast.csproj
index 3e1ae96..da1f898 100644 (file)
--- a/Radegast/Radegast.csproj
+++ b/Radegast/Radegast.csproj
@@ -77,8 +77,6 @@
   <ItemGroup>\r
     <Reference Include="fmodex-dotnet, Version=4.26.7.0, Culture=neutral, processorArchitecture=MSIL" />\r
     <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL" />\r
-    <Reference Include="OpenMetaverse.Rendering.Meshmerizer, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86" />\r
-    <Reference Include="PrimMesher, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />\r
     <Reference Include="System" />\r
     <Reference Include="System.Core">\r
       <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
@@ -1038,7 +1036,6 @@
     </None>\r
     <None Include="assemblies\fmodex-dotnet.dll">\r
     </None>\r
-    <None Include="assemblies\OpenMetaverse.Rendering.Meshmerizer.dll" />\r
     <None Include="assemblies\PrimMesher.dll" />\r
     <Content Include="openmetaverse_data\avatar_lad.xml">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
@@ -1075,6 +1072,10 @@
       <Project>{A195EB92-3AC5-4443-8D65-8052480A21DA}</Project>\r
       <Name>OpenMetaverse.Http</Name>\r
     </ProjectReference>\r
+    <ProjectReference Include="..\..\libopenmetaverse\OpenMetaverse.Rendering.Meshmerizer\OpenMetaverse.Rendering.Meshmerizer.csproj">\r
+      <Project>{EC71F06F-6DA9-4E4C-92BA-D2D52A4A14FF}</Project>\r
+      <Name>OpenMetaverse.Rendering.Meshmerizer</Name>\r
+    </ProjectReference>\r
     <ProjectReference Include="..\..\libopenmetaverse\OpenMetaverse.StructuredData\OpenMetaverse.StructuredData.csproj">\r
       <Project>{18015F8B-CE5A-4BE0-88C4-6EF8AA7743CE}</Project>\r
       <Name>OpenMetaverse.StructuredData</Name>\r

diff --git a/Radegast/assemblies/OpenMetaverse.Rendering.Meshmerizer.dll b/Radegast/assemblies/OpenMetaverse.Rendering.Meshmerizer.dll
deleted file mode 100644 (file)
index 70ff08e..0000000
Binary files a/Radegast/assemblies/OpenMetaverse.Rendering.Meshmerizer.dll and /dev/null differ

diff --git a/prebuild.xml b/prebuild.xml
index c3848ed..d63996d 100644 (file)
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -163,6 +163,32 @@
       </Files>
     </Project>
 
+    <Project name="OpenMetaverse.Rendering.Meshmerizer" path="../libopenmetaverse/OpenMetaverse.Rendering.Meshmerizer" type="Library" rootNamespace="OpenMetaverse.Http" frameworkVersion="v3_5">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../radegast/bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../radegast/bin/</OutputPath>
+          <XmlDocFile>OpenMetaverse.Rendering.Meshmerizer.XML</XmlDocFile>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../libopenmetaverse/bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="System.Drawing"/>
+      <Reference name="OpenMetaverse"/>
+      <Reference name="OpenMetaverseTypes"/>
+      <Reference name="PrimMesher" />
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <!-- Main App -->
 
     <Project name="Radegast" path="Radegast" type="WinExe" frameworkVersion="v3_5">
@@ -193,6 +219,7 @@
       <Reference name="OpenMetaverseTypes" localCopy="false"/>
       <Reference name="OpenMetaverse.StructuredData" localCopy="false"/>
       <Reference name="OpenMetaverse.Http" localCopy="false"/>
+      <Reference name="OpenMetaverse.Rendering.Meshmerizer" localCopy="false" />
 
       <Reference name="assemblies/fmodex-dotnet.dll" localCopy="true"/>
       <Reference name="assemblies/Tao.OpenGl.dll" localCopy="true"/>
@@ -200,9 +227,6 @@
       <Reference name="assemblies/Tools.dll" localCopy="true" />
       <Reference name="assemblies/log4net.dll" localCopy="true" />
 
-      <Reference name="assemblies/PrimMesher.dll" localCopy="true" />
-      <Reference name="assemblies/OpenMetaverse.Rendering.Meshmerizer.dll" localCopy="true" />
-
       <Reference name="../../libopenmetaverse/bin/XMLRPC.dll" localCopy="true" />
 
       <Files>
@@ -211,11 +235,12 @@
         </Match>
         <Match path="Properties" pattern="*.cs"  recurse="true"  subType="Form"/>
         <Match pattern="*.resx" buildAction="EmbeddedResource" recurse="true"/>
-        <Match path="." pattern="*.config" recurse="true" buildAction="Content" copyToOutput="Always"/>
-        <Match path="." pattern="*.so" recurse="true" buildAction="Content" copyToOutput="Always"/>
-        <Match path="." pattern="*.dylib" recurse="true" buildAction="Content" copyToOutput="Always"/>
-        <Match path="." pattern="fmodex.*" recurse="true" buildAction="Content" copyToOutput="Always"/>
-        <Match path="." pattern="*.html" recurse="true" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="openjpeg-dotnet*" recurse="false" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="*.config" recurse="false" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="*.so" recurse="false" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="*.dylib" recurse="false" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="fmodex.*" recurse="false" buildAction="Content" copyToOutput="Always"/>
+        <Match path="." pattern="*.html" recurse="false" buildAction="Content" copyToOutput="Always"/>
       </Files>
     </Project>
 
@@ -313,7 +338,7 @@
       <Reference name="OpenMetaverseTypes" localCopy="false"/>
       <Reference name="OpenMetaverse.StructuredData"/>
 
-      <Reference name="Radegast.exe" />
+      <Reference name="Radegast.exe" localCopy="false" />
       <Reference name="fmodex-dotnet.dll" />
       <Reference name="System" />
       <Reference name="System.Core"/>
@@ -347,7 +372,7 @@
       <Reference name="OpenMetaverseTypes" localCopy="false"/>\
       <Reference name="OpenMetaverse.StructuredData"/>
 
-      <Reference name="Radegast" />
+      <Reference name="Radegast.exe" localCopy="false" />
       <Reference name="Radegast.Plugin.Speech" />
       <Reference name="System" />
       <Reference name="System.Core"/>
@@ -377,7 +402,7 @@
       <Reference name="OpenMetaverseTypes" localCopy="false"/>
       <Reference name="OpenMetaverse.StructuredData"/>
 
-      <Reference name="Radegast" />
+      <Reference name="Radegast.exe" localCopy="false" />
       <Reference name="Radegast.Plugin.Speech" />
       <Reference name="Radegast.exe" />
       <Reference name="System" />
@@ -410,7 +435,7 @@
       <Reference name="OpenMetaverseTypes" localCopy="false"/>
       <Reference name="OpenMetaverse.StructuredData"/>
 
-      <Reference name="Radegast" />
+      <Reference name="Radegast.exe" localCopy="false" />
       <Reference name="Radegast.Plugin.Speech" />
       <Reference name="Assemblies/Monobjc.dll" />
       <Reference name="Assemblies/Monobjc.Cocoa.dll" />