Crystal Space 3D SDK

Revision: 24998
Author:   res2002
Date:     2006-07-29 18:46:58 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24998&view=rev

Log Message:
-----------
Fix copy'n'paste issues

Modified Paths:
--------------
    CS/trunk/data/shader/std_lighting_detail.xml
Modified: CS/trunk/data/shader/std_lighting_detail.xml
===================================================================
--- CS/trunk/data/shader/std_lighting_detail.xml	2006-07-30 01:45:58 UTC (rev 24997)
+++ CS/trunk/data/shader/std_lighting_detail.xml	2006-07-30 01:46:58 UTC (rev 24998)
@@ -120,15 +120,14 @@
     return V2F;
   }
   
-  float4 FragmentMain (VertToFrag V2F, uniform sampler2D texGlow) : COLOR
+  float4 FragmentMain (VertToFrag V2F, uniform sampler2D texDetail) : COLOR
   {
     V2F.framework.SetupFrag();
 
     float4 color = V2F.surfClassic.GetDiffuse () * 
       float4 (V2F.lightClassic.IllumDiffuse(), GetMixmodeAlpha());
     // Apply detail
-    color.rgb *= 2 * tex2D (texDetail, 
-      V2F.tcDetail + V2F.parallax.GetTCOffset()).rgb;
+    color.rgb *= 2 * tex2D (texDetail, V2F.tcDetail).rgb;
     
     if (V2F.fog.HasFog())
     {
@@ -137,7 +136,7 @@
     return color;
   }
   <?Endtemplate?>
-  <?WriteShaderTechnique 100?>
+  <?WriteShaderTechnique 250?>
 
   <?WriteShaderVars?>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24967
Author:   funkiedamouse
Date:     2006-07-25 18:26:51 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24967&view=rev

Log Message:
-----------
	- David Bronke added a patch from contingencyplan (Brian DeVries) which
	  adds a copy constructor and an assignment operator to csVariant, which
	  allows it to be used in a csHash, among other things.

Modified Paths:
--------------
    CS/trunk/docs/history.txt
    CS/trunk/include/iutil/pluginconfig.h
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt	2006-07-25 22:53:20 UTC (rev 24966)
+++ CS/trunk/docs/history.txt	2006-07-26 01:26:51 UTC (rev 24967)
@@ -19,6 +19,9 @@
 	  issue was solved in a different way. RTLD_GLOBAL is at least needed
 	  for python as well.
 	- mdmkolbe converted plugins/culling/dynavis/ to the new SCF.
+	- David Bronke added a patch from contingencyplan (Brian DeVries) which
+	  adds a copy constructor and an assignment operator to csVariant, which
+	  allows it to be used in a csHash, among other things.
 24-Jul-2006
 	- Jorrit documented the new -cfgfile and -cfgset commandline
 	  options and also added documentation for a few other commonly

Modified: CS/trunk/include/iutil/pluginconfig.h
===================================================================
--- CS/trunk/include/iutil/pluginconfig.h	2006-07-25 22:53:20 UTC (rev 24966)
+++ CS/trunk/include/iutil/pluginconfig.h	2006-07-26 01:26:51 UTC (rev 24967)
@@ -65,6 +65,27 @@
 public:
   csVariant () { type = CSVAR_LONG; memset (&v, 0, sizeof (v)); }
   ~csVariant () { Clear(); }
+
+  /// Copy constructor - only IncRef's the String, should our type be a string
+  csVariant (const csVariant& var)
+  {
+    memset (&v, 0, sizeof (v));
+    
+    type = var.type;
+    v = var.v;
+    if ((type == CSVAR_STRING) && (v.s != 0)) v.s->IncRef(); 
+  }
+
+  /// Assignment operator. As with the copy-ctor, only IncRef's the string
+  const csVariant& operator = (const csVariant& var)
+  {
+    Clear ();
+    type = var.type;
+    v = var.v;
+    if ((type == CSVAR_STRING) && (v.s != 0)) v.s->IncRef ();
+    return var;
+  }
+  
   /// Assign a long
   void SetLong (long l)
   {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24995
Author:   res2002
Date:     2006-07-29 10:54:23 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24995&view=rev

Log Message:
-----------
Rename some shader snippet includes.
Move handling of mixmode alpha from surface into std_lighting.
Renamed SV "detail texture color" to "tex detail color".

Modified Paths:
--------------
    CS/trunk/data/shader/std_lighting.xml
    CS/trunk/data/shader/std_lighting_detail_alpha.xml
    CS/trunk/data/shader/std_lighting_detail_alpha_scroll.xml

Added Paths:
-----------
    CS/trunk/data/shader/fog/cg-fog-sector.inc
    CS/trunk/data/shader/lighting/cg-light-classic.inc
    CS/trunk/data/shader/surface/cg-parallax.inc
    CS/trunk/data/shader/surface/cg-surface-classic.inc

Removed Paths:
-------------
    CS/trunk/data/shader/fog/cg-fog-sector.cginc
    CS/trunk/data/shader/lighting/cg-light-classic.cginc
    CS/trunk/data/shader/surface/cg-parallax.cginc
    CS/trunk/data/shader/surface/cg-surface-classic.cginc
Deleted: CS/trunk/data/shader/fog/cg-fog-sector.cginc
===================================================================
--- CS/trunk/data/shader/fog/cg-fog-sector.cginc	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/fog/cg-fog-sector.cginc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -1,137 +0,0 @@
-<!--
-  Copyright (C) 2006 by Frank Richter
-	    (C) 2006 by Jorrit Tyberghein
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public
-  License along with this library; if not, write to the Free
-  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<include>
-  
-<?Template SectorFog_Code?>
-#ifndef __CS_SHADER_SECTORFOG_CG__
-#define __CS_SHADER_SECTORFOG_CG__
-
-struct Vert_FogSector
-{
-  uniform float4 fogPlaneS;
-  uniform float4 fogPlaneT;
-  uniform float4x4 ModelView : state.matrix.modelview;
-  varying float4 Position : POSITION;
-//<?if vars."fog density".float &gt; 0 ?>
-//<?endif?>
-};
-Vert_FogSector fogSectorVert;
-
-struct Frag_FogSector
-{
-  uniform sampler2D fogTex;
-  uniform float4 fogColor;
-};
-Frag_FogSector fogSectorFrag;
-
-struct FogSector
-{
-<?if vars."fog density".float &gt; 0 ?>
-  float2 fogTC;
-<?endif?>
-
-  void SetupVert()
-  {
-  <?if vars."fog density".float &gt; 0 ?>
-    float4 eyePos = mul (fogSectorVert.ModelView, fogSectorVert.Position);
-    fogTC.x = dot (eyePos, fogSectorVert.fogPlaneS);
-    fogTC.y = dot (eyePos, fogSectorVert.fogPlaneT);
-  <?endif?>
-  }
-
-  bool HasFog()
-  {
-  <?if vars."fog density".float &gt; 0 ?>
-    return true;
-  <?else?>
-    return false;
-  <?endif?>
-  }
-  
-  float GetIntensity()
-  {
-    float intens = 0;
-  <?if vars."fog density".float &gt; 0 ?>
-    intens = tex2D (fogSectorFrag.fogTex, fogTC).a;
-  <?endif?>
-    return intens;
-  }
-  
-  float3 GetColor()
-  {
-    float3 fogcol = float3(0,0,0);
-  <?if vars."fog density".float &gt; 0 ?>
-    fogcol = fogSectorFrag.fogColor.rgb;
-  <?endif?>
-    return fogcol;
-  }
-};
-
-#endif // __CS_SHADER_SECTORFOG_CG__
-<?Endtemplate?>
-
-<?CgAddSnippet SectorFog_Code?>
-
-<?BeginGlue SectorFog?>
-  <?Template Pass_SectorFog ?>
-    <?if vars."fog density".float &gt; 0 ?>
-      <!-- We need the fog lookup texture -->
-      <texture name="standardtex fog" destination="fogSectorFrag.fogTex" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList PassMappings Pass_SectorFog ?>
-
-  <?Template VariableMap_SectorFog ?>
-    <?if vars."fog density".float &gt; 0 ?>
-      <variablemap variable="fog color" destination="fogSectorFrag.fogColor" />
-      <!-- See the glshader_fixed plugin source for a detailed explanation 
-	   of the formular below. -->
-      <?if vars."fogplane".z &gt; 0 ?>
-	<variablemap destination="fogSectorVert.fogPlaneS" type="expr">
-	  <sexp>
-	  (make-vector 
-	    0 
-	    0 
-	    "fog density" 
-	    (- (min (max (* (elt4 fogplane) "fog density") -1) 0) (* 0.1 "fog density"))
-	  )</sexp>
-	</variablemap>
-	<variablemap destination="fogSectorVert.fogPlaneT" type="expr">
-	  <sexp>
-	  (make-vector
-	    (/ (* (elt1 fogplane) "fog density") (elt3 fogplane))
-	    (/ (* (elt2 fogplane) "fog density") (elt3 fogplane))
-	    "fog density"
-	    (+ (min (max (pow (+ 1 (* (elt4 fogplane) 0.2)) 5) 0) 1)
-	       (* "fog density" (- (/ (elt4 fogplane) (elt3 fogplane)) 0.1)))
-	  )
-	  </sexp>
-	</variablemap>
-      <?else?>
-	<variablemap destination="fogSectorVert.fogPlaneS" type="expr">
-	  <sexp>(make-vector 0 0 "fog density" (* -0.1 "fog density"))</sexp>
-	</variablemap>
-	<variablemap destination="fogSectorVert.fogPlaneT" type="vector4">0,0,0,1</variablemap>
-      <?endif?>
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList ProgramMappings VariableMap_SectorFog ?>
-<?EndGlue?>
-    
-</include>

Copied: CS/trunk/data/shader/fog/cg-fog-sector.inc (from rev 24992, CS/trunk/data/shader/fog/cg-fog-sector.cginc)
===================================================================
--- CS/trunk/data/shader/fog/cg-fog-sector.inc	                        (rev 0)
+++ CS/trunk/data/shader/fog/cg-fog-sector.inc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -0,0 +1,137 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+  
+<?Template SectorFog_Code?>
+#ifndef __CS_SHADER_SECTORFOG_CG__
+#define __CS_SHADER_SECTORFOG_CG__
+
+struct Vert_FogSector
+{
+  uniform float4 fogPlaneS;
+  uniform float4 fogPlaneT;
+  uniform float4x4 ModelView : state.matrix.modelview;
+  varying float4 Position : POSITION;
+//<?if vars."fog density".float &gt; 0 ?>
+//<?endif?>
+};
+Vert_FogSector fogSectorVert;
+
+struct Frag_FogSector
+{
+  uniform sampler2D fogTex;
+  uniform float4 fogColor;
+};
+Frag_FogSector fogSectorFrag;
+
+struct FogSector
+{
+<?if vars."fog density".float &gt; 0 ?>
+  float2 fogTC;
+<?endif?>
+
+  void SetupVert()
+  {
+  <?if vars."fog density".float &gt; 0 ?>
+    float4 eyePos = mul (fogSectorVert.ModelView, fogSectorVert.Position);
+    fogTC.x = dot (eyePos, fogSectorVert.fogPlaneS);
+    fogTC.y = dot (eyePos, fogSectorVert.fogPlaneT);
+  <?endif?>
+  }
+
+  bool HasFog()
+  {
+  <?if vars."fog density".float &gt; 0 ?>
+    return true;
+  <?else?>
+    return false;
+  <?endif?>
+  }
+  
+  float GetIntensity()
+  {
+    float intens = 0;
+  <?if vars."fog density".float &gt; 0 ?>
+    intens = tex2D (fogSectorFrag.fogTex, fogTC).a;
+  <?endif?>
+    return intens;
+  }
+  
+  float3 GetColor()
+  {
+    float3 fogcol = float3(0,0,0);
+  <?if vars."fog density".float &gt; 0 ?>
+    fogcol = fogSectorFrag.fogColor.rgb;
+  <?endif?>
+    return fogcol;
+  }
+};
+
+#endif // __CS_SHADER_SECTORFOG_CG__
+<?Endtemplate?>
+
+<?CgAddSnippet SectorFog_Code?>
+
+<?BeginGlue SectorFog?>
+  <?Template Pass_SectorFog ?>
+    <?if vars."fog density".float &gt; 0 ?>
+      <!-- We need the fog lookup texture -->
+      <texture name="standardtex fog" destination="fogSectorFrag.fogTex" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList PassMappings Pass_SectorFog ?>
+
+  <?Template VariableMap_SectorFog ?>
+    <?if vars."fog density".float &gt; 0 ?>
+      <variablemap variable="fog color" destination="fogSectorFrag.fogColor" />
+      <!-- See the glshader_fixed plugin source for a detailed explanation 
+	   of the formular below. -->
+      <?if vars."fogplane".z &gt; 0 ?>
+	<variablemap destination="fogSectorVert.fogPlaneS" type="expr">
+	  <sexp>
+	  (make-vector 
+	    0 
+	    0 
+	    "fog density" 
+	    (- (min (max (* (elt4 fogplane) "fog density") -1) 0) (* 0.1 "fog density"))
+	  )</sexp>
+	</variablemap>
+	<variablemap destination="fogSectorVert.fogPlaneT" type="expr">
+	  <sexp>
+	  (make-vector
+	    (/ (* (elt1 fogplane) "fog density") (elt3 fogplane))
+	    (/ (* (elt2 fogplane) "fog density") (elt3 fogplane))
+	    "fog density"
+	    (+ (min (max (pow (+ 1 (* (elt4 fogplane) 0.2)) 5) 0) 1)
+	       (* "fog density" (- (/ (elt4 fogplane) (elt3 fogplane)) 0.1)))
+	  )
+	  </sexp>
+	</variablemap>
+      <?else?>
+	<variablemap destination="fogSectorVert.fogPlaneS" type="expr">
+	  <sexp>(make-vector 0 0 "fog density" (* -0.1 "fog density"))</sexp>
+	</variablemap>
+	<variablemap destination="fogSectorVert.fogPlaneT" type="vector4">0,0,0,1</variablemap>
+      <?endif?>
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList ProgramMappings VariableMap_SectorFog ?>
+<?EndGlue?>
+    
+</include>

Deleted: CS/trunk/data/shader/lighting/cg-light-classic.cginc
===================================================================
--- CS/trunk/data/shader/lighting/cg-light-classic.cginc	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/lighting/cg-light-classic.cginc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -1,81 +0,0 @@
-<!--
-  Copyright (C) 2006 by Frank Richter
-	    (C) 2006 by Jorrit Tyberghein
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public
-  License along with this library; if not, write to the Free
-  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<include>
-
-<?CgUseShared primaryColor ?>
-<?CgUseShared primaryColorV2F?>
-
-<?Template LightingClassic_Code?>
-#ifndef __CS_SHADER_LIGHT_CLASSIC_CG__
-#define __CS_SHADER_LIGHT_CLASSIC_CG__
-  
-struct Vert_LightingClassic
-{
-  varying float2 texCoordLM;
-};
-Vert_LightingClassic lightingClassicVert;
-
-struct Frag_LightingClassic
-{
-  uniform sampler2D lightmap;
-};
-Frag_LightingClassic lightingClassicFrag;
-
-struct LightingClassic
-{
-<?if vars."tex lightmap".texture ?>
-  float2 texCoordLM;
-<?endif?>
-
-  void SetupVert ()
-  {
-  <?if vars."tex lightmap".texture ?>
-    texCoordLM = lightingClassicVert.texCoordLM;
-  <?endif?>
-  }
-  
-  float3 IllumDiffuse ()
-  {
-    float3 light_diffuse;
-  <?if vars."tex lightmap".texture ?>
-    light_diffuse = 2 * tex2D (lightingClassicFrag.lightmap, 
-      texCoordLM).rgb;
-  <?else?>
-    light_diffuse = primaryColor.rgb;
-  <?endif?>
-    return light_diffuse;
-  }
-};
-
-#endif // __CS_SHADER_LIGHT_CLASSIC_CG__
-<?Endtemplate?>
-
-<?CgAddSnippet LightingClassic_Code?>
-
-<?BeginGlue LightingClassic?>
-  <?Template Pass_LightingClassic ?>
-    <?if vars."tex lightmap".texture?>
-      <texture name="tex lightmap" destination="lightingClassicFrag.lightmap" />
-      <buffer source="texture coordinate lightmap" 
-	destination="lightingClassicVert.texCoordLM" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList PassMappings Pass_LightingClassic ?>
-<?EndGlue?>
-</include>

Copied: CS/trunk/data/shader/lighting/cg-light-classic.inc (from rev 24992, CS/trunk/data/shader/lighting/cg-light-classic.cginc)
===================================================================
--- CS/trunk/data/shader/lighting/cg-light-classic.inc	                        (rev 0)
+++ CS/trunk/data/shader/lighting/cg-light-classic.inc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -0,0 +1,81 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+
+<?CgUseShared primaryColor ?>
+<?CgUseShared primaryColorV2F?>
+
+<?Template LightingClassic_Code?>
+#ifndef __CS_SHADER_LIGHT_CLASSIC_CG__
+#define __CS_SHADER_LIGHT_CLASSIC_CG__
+  
+struct Vert_LightingClassic
+{
+  varying float2 texCoordLM;
+};
+Vert_LightingClassic lightingClassicVert;
+
+struct Frag_LightingClassic
+{
+  uniform sampler2D lightmap;
+};
+Frag_LightingClassic lightingClassicFrag;
+
+struct LightingClassic
+{
+<?if vars."tex lightmap".texture ?>
+  float2 texCoordLM;
+<?endif?>
+
+  void SetupVert ()
+  {
+  <?if vars."tex lightmap".texture ?>
+    texCoordLM = lightingClassicVert.texCoordLM;
+  <?endif?>
+  }
+  
+  float3 IllumDiffuse ()
+  {
+    float3 light_diffuse;
+  <?if vars."tex lightmap".texture ?>
+    light_diffuse = 2 * tex2D (lightingClassicFrag.lightmap, 
+      texCoordLM).rgb;
+  <?else?>
+    light_diffuse = primaryColor.rgb;
+  <?endif?>
+    return light_diffuse;
+  }
+};
+
+#endif // __CS_SHADER_LIGHT_CLASSIC_CG__
+<?Endtemplate?>
+
+<?CgAddSnippet LightingClassic_Code?>
+
+<?BeginGlue LightingClassic?>
+  <?Template Pass_LightingClassic ?>
+    <?if vars."tex lightmap".texture?>
+      <texture name="tex lightmap" destination="lightingClassicFrag.lightmap" />
+      <buffer source="texture coordinate lightmap" 
+	destination="lightingClassicVert.texCoordLM" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList PassMappings Pass_LightingClassic ?>
+<?EndGlue?>
+</include>

Modified: CS/trunk/data/shader/std_lighting.xml
===================================================================
--- CS/trunk/data/shader/std_lighting.xml	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/std_lighting.xml	2006-07-29 17:54:23 UTC (rev 24995)
@@ -3,11 +3,13 @@
 
   <?Include /shader/snippets/shaderframework-cg.inc ?>
 
-  <?Include /shader/surface/cg-surface-classic.cginc ?>
-  <?Include /shader/lighting/cg-light-classic.cginc ?>
-  <?Include /shader/fog/cg-fog-sector.cginc ?>
-  <?Include /shader/surface/cg-parallax.cginc ?>
+  <?Include /shader/surface/cg-surface-classic.inc ?>
+  <?Include /shader/lighting/cg-light-classic.inc ?>
+  <?Include /shader/fog/cg-fog-sector.inc ?>
+  <?Include /shader/surface/cg-parallax.inc ?>
 
+  <?CgUseShared primaryColor ?>
+  <?CgUseShared primaryColorV2F?>
   <?CgUseSharedCond texCoord "vars.\"tex glow\".texture" ?>
   <?CgUseSharedCond texCoordV2F "vars.\"tex glow\".texture" ?>
 
@@ -68,9 +70,10 @@
   float4 FragmentMain (VertToFrag V2F, uniform sampler2D texGlow) : COLOR
   {
     V2F.framework.SetupFrag();
-    
+
+    float mixmodeAlpha = primaryColor.a;
     float4 color = V2F.surfClassic.GetDiffuse (V2F.parallax.GetTCOffset()) * 
-      float4 (V2F.lightClassic.IllumDiffuse(), 1);
+      float4 (V2F.lightClassic.IllumDiffuse(), mixmodeAlpha);
     if (V2F.fog.HasFog())
     {
       color.rgb = lerp(color.rgb, V2F.fog.GetColor(), V2F.fog.GetIntensity());

Modified: CS/trunk/data/shader/std_lighting_detail_alpha.xml
===================================================================
--- CS/trunk/data/shader/std_lighting_detail_alpha.xml	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/std_lighting_detail_alpha.xml	2006-07-29 17:54:23 UTC (rev 24995)
@@ -19,7 +19,7 @@
           <texmatrix layer="0">
             <scale type="shadervar">tex detail scale</scale>
           </texmatrix>
-          <constantcolor layer="1" type="shadervar">detail texture color</constantcolor>
+          <constantcolor layer="1" type="shadervar">tex detail color</constantcolor>
         </fixedvp>
       </vp>
       <fp plugin="glfixed">
@@ -87,9 +87,9 @@
       <vp plugin="glfixed">
         <fixedvp>
           <texmatrix layer="0">
-            <scale type="shadervar">detail texture scale</scale>
+            <scale type="shadervar">tex detail scale</scale>
           </texmatrix>
-          <constantcolor layer="0" type="shadervar">detail texture color</constantcolor>
+          <constantcolor layer="0" type="shadervar">tex detail color</constantcolor>
         </fixedvp>
       </vp>
       <fp plugin="glfixed">

Modified: CS/trunk/data/shader/std_lighting_detail_alpha_scroll.xml
===================================================================
--- CS/trunk/data/shader/std_lighting_detail_alpha_scroll.xml	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/std_lighting_detail_alpha_scroll.xml	2006-07-29 17:54:23 UTC (rev 24995)
@@ -31,7 +31,7 @@
 	      </make-vector>
 	    </translate>
           </texmatrix>
-          <constantcolor layer="1" type="shadervar">detail texture color</constantcolor>
+          <constantcolor layer="1" type="shadervar">tex detail color</constantcolor>
         </fixedvp>
       </vp>
       <fp plugin="glfixed">
@@ -118,7 +118,7 @@
 				      </make-vector>
 				    </translate>
           </texmatrix>
-          <constantcolor layer="0" type="shadervar">detail texture color</constantcolor>
+          <constantcolor layer="0" type="shadervar">tex detail color</constantcolor>
         </fixedvp>
       </vp>
       <fp plugin="glfixed">

Deleted: CS/trunk/data/shader/surface/cg-parallax.cginc
===================================================================
--- CS/trunk/data/shader/surface/cg-parallax.cginc	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/surface/cg-parallax.cginc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -1,108 +0,0 @@
-<!--
-  Copyright (C) 2006 by Frank Richter
-	    (C) 2006 by Jorrit Tyberghein
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public
-  License along with this library; if not, write to the Free
-  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<include>
-
-<?CgUseShared texCoord?>
-<?CgUseShared texCoordV2F?>
-  
-<?Template Parallax_Code?>
-#ifndef __CS_SHADER_PARALLAX_CGINC__
-#define __CS_SHADER_PARALLAX_CGINC__
-
-<?Include /shader/snippets/cg-common.cginc?>
-  
-struct Vert_Parallax
-{
-  varying float4 Position : POSITION;
-  uniform float4x4 ModelViewIT : state.matrix.modelview.invtrans;
-  /* @@@ FIXME Question: Undoubtedly, other components will use the 
-   * normal/tangent/binormal as well in the future. How to share that? Ie all 
-   * instances of use should use the *same* vertex attribute. */
-  varying float3 Normal;
-  varying float3 Tangent;
-  varying float3 BiNormal;
-};
-Vert_Parallax parallaxVert;
-
-struct Frag_Parallax
-{
-  uniform sampler2D heightTex;
-  uniform float2 tcScale;
-};
-Frag_Parallax parallaxFrag;
-
-struct Parallax
-{
-<?if vars."tex height".texture ?>
-  float3 eyeVec;
-<?endif?>
-
-  void SetupVert ()
-  {
-  <?if vars."tex height".texture ?>
-    float3x3 obj2tang;
-    obj2tang[0] = parallaxVert.Tangent;
-    obj2tang[1] = parallaxVert.BiNormal;
-    obj2tang[2] = parallaxVert.Normal;
-    float3 eyeVecObj = parallaxVert.ModelViewIT[3] - parallaxVert.Position;
-    eyeVec =  mul (obj2tang, eyeVecObj);
-  <?endif?>
-  }
-  float2 GetTCOffset ()
-  {
-    float2 offset = float2 (0, 0);
-  <?if vars."tex height".texture ?>
-    float2 tc = texCoord * parallaxFrag.tcScale;
-    offset = ComputeParallaxOffset (parallaxFrag.heightTex, tc, 
-      normalize (eyeVec), 0.04);
-  <?endif?>
-    return offset;
-  }
-};
-
-#endif // __CS_SHADER_PARALLAX_CGINC__
-<?Endtemplate?>
-
-<?CgAddSnippet Parallax_Code?>
-
-<?BeginGlue Parallax?>
-  <?Template Pass_Parallax?>
-    <?if vars."tex height".texture ?>
-      <texture name="tex height" destination="parallaxFrag.heightTex" />
-      <buffer source="normal" destination="parallaxVert.Normal" />
-      <buffer source="tangent" destination="parallaxVert.Tangent" />
-      <buffer source="binormal" destination="parallaxVert.BiNormal" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList PassMappings Pass_Parallax?>
-  
-  <?Template VariableMap_Parallax ?>
-    <?if vars."tex height".texture?>
-      <variablemap variable="tex height scale" 
-	destination="parallaxFrag.tcScale" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList ProgramMappings VariableMap_Parallax?>
-  
-  <?Template ShaderVar_Parallax?>
-    <shadervar name="tex height scale" type="vector2">1,1</shadervar>
-  <?Endtemplate?>
-  <?AddToList ShaderVars ShaderVar_Parallax?>
-<?EndGlue?>
-</include>
\ No newline at end of file

Copied: CS/trunk/data/shader/surface/cg-parallax.inc (from rev 24992, CS/trunk/data/shader/surface/cg-parallax.cginc)
===================================================================
--- CS/trunk/data/shader/surface/cg-parallax.inc	                        (rev 0)
+++ CS/trunk/data/shader/surface/cg-parallax.inc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -0,0 +1,108 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+
+<?CgUseShared texCoord?>
+<?CgUseShared texCoordV2F?>
+  
+<?Template Parallax_Code?>
+#ifndef __CS_SHADER_PARALLAX_CGINC__
+#define __CS_SHADER_PARALLAX_CGINC__
+
+<?Include /shader/snippets/cg-common.cginc?>
+  
+struct Vert_Parallax
+{
+  varying float4 Position : POSITION;
+  uniform float4x4 ModelViewIT : state.matrix.modelview.invtrans;
+  /* @@@ FIXME Question: Undoubtedly, other components will use the 
+   * normal/tangent/binormal as well in the future. How to share that? Ie all 
+   * instances of use should use the *same* vertex attribute. */
+  varying float3 Normal;
+  varying float3 Tangent;
+  varying float3 BiNormal;
+};
+Vert_Parallax parallaxVert;
+
+struct Frag_Parallax
+{
+  uniform sampler2D heightTex;
+  uniform float2 tcScale;
+};
+Frag_Parallax parallaxFrag;
+
+struct Parallax
+{
+<?if vars."tex height".texture ?>
+  float3 eyeVec;
+<?endif?>
+
+  void SetupVert ()
+  {
+  <?if vars."tex height".texture ?>
+    float3x3 obj2tang;
+    obj2tang[0] = parallaxVert.Tangent;
+    obj2tang[1] = parallaxVert.BiNormal;
+    obj2tang[2] = parallaxVert.Normal;
+    float3 eyeVecObj = parallaxVert.ModelViewIT[3] - parallaxVert.Position;
+    eyeVec =  mul (obj2tang, eyeVecObj);
+  <?endif?>
+  }
+  float2 GetTCOffset ()
+  {
+    float2 offset = float2 (0, 0);
+  <?if vars."tex height".texture ?>
+    float2 tc = texCoord * parallaxFrag.tcScale;
+    offset = ComputeParallaxOffset (parallaxFrag.heightTex, tc, 
+      normalize (eyeVec), 0.04);
+  <?endif?>
+    return offset;
+  }
+};
+
+#endif // __CS_SHADER_PARALLAX_CGINC__
+<?Endtemplate?>
+
+<?CgAddSnippet Parallax_Code?>
+
+<?BeginGlue Parallax?>
+  <?Template Pass_Parallax?>
+    <?if vars."tex height".texture ?>
+      <texture name="tex height" destination="parallaxFrag.heightTex" />
+      <buffer source="normal" destination="parallaxVert.Normal" />
+      <buffer source="tangent" destination="parallaxVert.Tangent" />
+      <buffer source="binormal" destination="parallaxVert.BiNormal" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList PassMappings Pass_Parallax?>
+  
+  <?Template VariableMap_Parallax ?>
+    <?if vars."tex height".texture?>
+      <variablemap variable="tex height scale" 
+	destination="parallaxFrag.tcScale" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList ProgramMappings VariableMap_Parallax?>
+  
+  <?Template ShaderVar_Parallax?>
+    <shadervar name="tex height scale" type="vector2">1,1</shadervar>
+  <?Endtemplate?>
+  <?AddToList ShaderVars ShaderVar_Parallax?>
+<?EndGlue?>
+</include>
\ No newline at end of file

Deleted: CS/trunk/data/shader/surface/cg-surface-classic.cginc
===================================================================
--- CS/trunk/data/shader/surface/cg-surface-classic.cginc	2006-07-29 12:40:18 UTC (rev 24994)
+++ CS/trunk/data/shader/surface/cg-surface-classic.cginc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -1,90 +0,0 @@
-<!--
-  Copyright (C) 2006 by Frank Richter
-	    (C) 2006 by Jorrit Tyberghein
-
-  This library is free software; you can redistribute it and/or
-  modify it under the terms of the GNU Library General Public
-  License as published by the Free Software Foundation; either
-  version 2 of the License, or (at your option) any later version.
-
-  This library is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Library General Public License for more details.
-
-  You should have received a copy of the GNU Library General Public
-  License along with this library; if not, write to the Free
-  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
--->
-<include>
-
-<?CgUseShared primaryColor ?>
-<?CgUseShared primaryColorV2F?>
-<?CgUseShared texCoord?>
-<?CgUseShared texCoordV2F?>
-
-<?Template SurfaceClassic_Code?>
-#ifndef __CS_SHADER_SURFACE_CLASSIC_CG__
-#define __CS_SHADER_SURFACE_CLASSIC_CG__
-
-/*struct Vert_SurfaceClassic
-{
-};
-Vert_SurfaceClassic surfaceClassicVert;*/
-
-struct Frag_SurfaceClassic
-{
-  uniform sampler2D texture;
-  uniform float4 flatColor;
-};
-Frag_SurfaceClassic surfaceClassicFrag;
-
-struct SurfaceClassic
-{
-  void SetupVert ()
-  {
-  }
-
-  float4 GetDiffuse ()
-  {
-    float4 diffuse;
-    <?if vars."tex diffuse".texture?>
-      diffuse = tex2D (surfaceClassicFrag.texture, texCoord);
-    <?else?>
-      diffuse = surfaceClassicFrag.flatColor;
-    <?endif?>
-    diffuse.a *= primaryColor.a;
-    return diffuse;
-  }
-  float4 GetDiffuse (float2 offset)
-  {
-    <?if vars."tex diffuse".texture?>
-      return tex2D (surfaceClassicFrag.texture, texCoord + offset);
-    <?else?>
-      return surfaceClassicFrag.flatColor;
-    <?endif?>
-  }
-};
-
-#endif // __CS_SHADER_SURFACE_CLASSIC_CG__
-<?Endtemplate?>
-
-<?CgAddSnippet SurfaceClassic_Code?>
-
-<?BeginGlue SurfaceClassic?>
-  <?Template Pass_Surface_Classic ?>
-    <?if vars."tex diffuse".texture?>
-      <texture name="tex diffuse" destination="surfaceClassicFrag.texture" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList PassMappings Pass_Surface_Classic ?>
-  
-  <?Template VariableMap_Surface ?>
-    <?if !vars."tex diffuse".texture?>
-      <variablemap variable="mat flatcolor" 
-	destination="surfaceClassicFrag.flatColor" />
-    <?endif?>
-  <?Endtemplate?>
-  <?AddToList ProgramMappings VariableMap_Surface ?>
-<?EndGlue?>
-</include>

Copied: CS/trunk/data/shader/surface/cg-surface-classic.inc (from rev 24992, CS/trunk/data/shader/surface/cg-surface-classic.cginc)
===================================================================
--- CS/trunk/data/shader/surface/cg-surface-classic.inc	                        (rev 0)
+++ CS/trunk/data/shader/surface/cg-surface-classic.inc	2006-07-29 17:54:23 UTC (rev 24995)
@@ -0,0 +1,87 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+
+<?CgUseShared texCoord?>
+<?CgUseShared texCoordV2F?>
+
+<?Template SurfaceClassic_Code?>
+#ifndef __CS_SHADER_SURFACE_CLASSIC_CG__
+#define __CS_SHADER_SURFACE_CLASSIC_CG__
+
+/*struct Vert_SurfaceClassic
+{
+};
+Vert_SurfaceClassic surfaceClassicVert;*/
+
+struct Frag_SurfaceClassic
+{
+  uniform sampler2D texture;
+  uniform float4 flatColor;
+};
+Frag_SurfaceClassic surfaceClassicFrag;
+
+struct SurfaceClassic
+{
+  void SetupVert ()
+  {
+  }
+
+  float4 GetDiffuse ()
+  {
+    float4 diffuse;
+    <?if vars."tex diffuse".texture?>
+      diffuse = tex2D (surfaceClassicFrag.texture, texCoord);
+    <?else?>
+      diffuse = surfaceClassicFrag.flatColor;
+    <?endif?>
+    return diffuse;
+  }
+  float4 GetDiffuse (float2 offset)
+  {
+    <?if vars."tex diffuse".texture?>
+      return tex2D (surfaceClassicFrag.texture, texCoord + offset);
+    <?else?>
+      return surfaceClassicFrag.flatColor;
+    <?endif?>
+  }
+};
+
+#endif // __CS_SHADER_SURFACE_CLASSIC_CG__
+<?Endtemplate?>
+
+<?CgAddSnippet SurfaceClassic_Code?>
+
+<?BeginGlue SurfaceClassic?>
+  <?Template Pass_Surface_Classic ?>
+    <?if vars."tex diffuse".texture?>
+      <texture name="tex diffuse" destination="surfaceClassicFrag.texture" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList PassMappings Pass_Surface_Classic ?>
+  
+  <?Template VariableMap_Surface ?>
+    <?if !vars."tex diffuse".texture?>
+      <variablemap variable="mat flatcolor" 
+	destination="surfaceClassicFrag.flatColor" />
+    <?endif?>
+  <?Endtemplate?>
+  <?AddToList ProgramMappings VariableMap_Surface ?>
+<?EndGlue?>
+</include>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24994
Author:   karseny
Date:     2006-07-29 05:40:18 -0700 (Sat, 29 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24994&view=rev

Log Message:
-----------
renderers (WIP)

Modified Paths:
--------------
    CS/branches/soc/terrain/data/terraini/heightmap.png
    CS/branches/soc/terrain/data/terraini/shader_base.xml
    CS/branches/soc/terrain/data/terraini/shader_splat.xml
    CS/branches/soc/terrain/data/terraini/world
    CS/branches/soc/terrain/include/iterrain/terraincell.h
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.cpp
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.h
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/simplerenderer.cpp

Added Paths:
-----------
    CS/branches/soc/terrain/data/terraini/geomorph.cgvp
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.cpp
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.h
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/readme.txt
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.cpp
    CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.h
Added: CS/branches/soc/terrain/data/terraini/geomorph.cgvp
===================================================================
--- CS/branches/soc/terrain/data/terraini/geomorph.cgvp	                        (rev 0)
+++ CS/branches/soc/terrain/data/terraini/geomorph.cgvp	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,32 @@
+<cgvp>
+<program>
+<![CDATA[
+
+struct app2vertex {
+	float4 Position : POSITION;
+	float2 TexCoord : TEXCOORD0;
+};
+
+struct vertex2fragment { 
+	float4 Hposition : POSITION;
+	float2 TexCoord0 : TEXCOORD0;
+	float2 TexCoord1 : TEXCOORD1;
+	float4 Color : COLOR0;
+};
+
+vertex2fragment main (app2vertex IN,
+	uniform float4x4 ModelViewProj : state.matrix.mvp)
+{
+	vertex2fragment OUT;
+
+	OUT.Hposition = mul (ModelViewProj, IN.Position);
+	OUT.TexCoord0 = IN.TexCoord;
+	OUT.TexCoord1 = IN.TexCoord;
+	OUT.Color = 1;
+	
+	return OUT;
+}
+
+]]>
+</program>
+</cgvp>

Modified: CS/branches/soc/terrain/data/terraini/heightmap.png
===================================================================
(Binary files differ)

Modified: CS/branches/soc/terrain/data/terraini/shader_base.xml
===================================================================
--- CS/branches/soc/terrain/data/terraini/shader_base.xml	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/data/terraini/shader_base.xml	2006-07-29 12:40:18 UTC (rev 24994)
@@ -8,6 +8,37 @@
       </mixmode>
 
       <buffer source="texture coordinate 0" destination="texture coordinate 0" />
+      <vp plugin="glcg" file="/data/terraini/geomorph.cgvp" />
+      <texture destination="unit 0" name="tex diffuse" />
+      <texture destination="unit 1" name="splat alpha map" />
+      <fp plugin="glfixed">
+        <fixedfp>
+          <layer>
+            <colorsource num="0" source="primary color" modifier="color" />
+            <colorsource num="1" source="texture" modifier="color" />
+            <coloroperation operation="modulate" />
+          </layer>
+          <layer>
+            <colorsource num="0" source="previous layer" modifier="color" />
+            <colorsource num="1" source="texture" modifier="color" />
+            <coloroperation operation="modulate" />
+            <alphasource num="0" source="texture" modifier="color" />
+            <alphaoperation operation="replace" />
+          </layer>
+        </fixedfp>
+      </fp>
+    </pass>
+  </technique>
+  
+  <technique priority="50">
+    <tag>terrain_splatting</tag>
+
+    <pass>
+      <mixmode>
+        <copy />
+      </mixmode>
+
+      <buffer source="texture coordinate 0" destination="texture coordinate 0" />
       <buffer source="texture coordinate 0" destination="texture coordinate 1" />
       <vp plugin="glfixed">
        <fixedvp>

Modified: CS/branches/soc/terrain/data/terraini/shader_splat.xml
===================================================================
--- CS/branches/soc/terrain/data/terraini/shader_splat.xml	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/data/terraini/shader_splat.xml	2006-07-29 12:40:18 UTC (rev 24994)
@@ -8,6 +8,34 @@
       </mixmode>
 
       <buffer source="texture coordinate 0" destination="texture coordinate 0" />
+      <vp plugin="glcg" file="/data/terraini/geomorph.cgvp" />
+      <texture destination="unit 0" name="tex diffuse" />
+      <texture destination="unit 1" name="splat alpha map" />
+      <fp plugin="glfixed">
+        <fixedfp>
+          <layer>
+            <colorsource num="0" source="primary color" modifier="color" />
+            <colorsource num="1" source="texture" modifier="color" />
+            <coloroperation operation="modulate" />
+          </layer>
+          <layer>
+            <colorsource num="0" source="previous layer" modifier="color" />
+            <colorsource num="1" source="texture" modifier="color" />
+            <coloroperation operation="modulate" />
+          </layer>
+        </fixedfp>
+      </fp>
+    </pass>
+  </technique>
+  <technique priority="50">
+    <tag>terrain_splatting</tag>
+
+    <pass>
+      <mixmode>
+        <add />
+      </mixmode>
+
+      <buffer source="texture coordinate 0" destination="texture coordinate 0" />
       <buffer source="texture coordinate 0" destination="texture coordinate 1" />
       <vp plugin="glfixed">
        <fixedvp>

Modified: CS/branches/soc/terrain/data/terraini/world
===================================================================
--- CS/branches/soc/terrain/data/terraini/world	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/data/terraini/world	2006-07-29 12:40:18 UTC (rev 24994)
@@ -72,20 +72,20 @@
       <collider>crystalspace.mesh.object.terrainimproved.simplecollider</collider>
 
       <cells>
-        <cell name="main">
-          <grid_size x="513" y="513" />
+<!--        <cell name="main">
+          <grid_size x="512" y="512" />
           <material_size x="64" y="64" />
           <position x="-256" y="-256" />
-          <size x="512" y="512" z="64" />
+          <size x="512" y="512" z="150" />
 
           <feeder>
             <plugin>crystalspace.mesh.object.terrainimproved.simpledatafeeder</plugin>
             <param name="heightmap source" value="/lev/terraini/heightmap.png" />
             <param name="materialmap source" value="/lev/terraini/material_blank.png" />
           </feeder>
-        </cell>
+        </cell>-->
 
-<!--        <cell>
+        <cell>
           <grid_size x="33" y="33" />
           <material_size x="32" y="32" />
           <position x="48" y="48" />
@@ -153,8 +153,8 @@
         <factory>TerrainFact</factory>
         <materialpalette>
           <material>Lava</material>
-<!--          <material>Stone</material>
-          <material>Grass</material>-->
+          <material>Stone</material>
+          <material>Grass</material>
         </materialpalette>
       </params>
       <move> 

Modified: CS/branches/soc/terrain/include/iterrain/terraincell.h
===================================================================
--- CS/branches/soc/terrain/include/iterrain/terraincell.h	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/include/iterrain/terraincell.h	2006-07-29 12:40:18 UTC (rev 24994)
@@ -68,6 +68,8 @@
   virtual int GetGridWidth () const = 0;
   virtual int GetGridHeight () const = 0;
 
+  virtual csLockedHeightData GetHeightData () = 0;
+  
   virtual csLockedHeightData LockHeightData (const csRect& rectangle) = 0;
   virtual void UnlockHeightData () = 0;
 

Modified: CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.cpp
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.cpp	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.cpp	2006-07-29 12:40:18 UTC (rev 24994)
@@ -48,9 +48,17 @@
   this->parent = parent;
   
   this->name = name;
+
+  // Here we do grid width/height correction. The height map will be a
+  // square with size 2^n + 1
+
+  int maxsize = MAX(grid_width, grid_height) - 1;
+  int temp = 1;
+
+  while (temp < maxsize) temp *= 2;
   
-  this->grid_width = grid_width;
-  this->grid_height = grid_height;
+  this->grid_width = temp + 1;
+  this->grid_height = temp + 1;
   
   this->material_width = material_width;
   this->material_height = material_height;
@@ -164,6 +172,16 @@
   return grid_height;
 }
 
+csLockedHeightData csTerrainCell::GetHeightData ()
+{
+	csLockedHeightData data;
+	data.data = heightmap.GetArray ();
+	data.pitch = grid_width;
+
+	return data;
+}
+
+
 csLockedHeightData csTerrainCell::LockHeightData (const csRect& rectangle)
 {
   locked_height_rect = rectangle;

Modified: CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.h
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.h	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/cell.h	2006-07-29 12:40:18 UTC (rev 24994)
@@ -113,6 +113,8 @@
   virtual int GetGridWidth () const;
   virtual int GetGridHeight () const;
 
+  virtual csLockedHeightData GetHeightData ();
+
   virtual csLockedHeightData LockHeightData (const csRect& rectangle);
   virtual void UnlockHeightData ();
 

Added: CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.cpp
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.cpp	                        (rev 0)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.cpp	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,957 @@
+/*
+    Copyright (C) 2006 by Kapoulkine Arseny
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "cssysdef.h"
+
+#include "simplerenderer.h"
+
+#include "ivideo/rendermesh.h"
+#include "csgfx/renderbuffer.h"
+
+#include "csgfx/shadervarcontext.h"
+
+#include "iengine.h"
+
+#include "iterrain/terraincell.h"
+
+#include "csutil/objreg.h"
+
+#include "csgfx/shadervar.h"
+
+#include "csgfx/rgbpixel.h"
+#include "csgfx/memimage.h"
+
+#include "csutil/refarr.h"
+
+#include "ivideo/txtmgr.h"
+
+#include "cstool/rbuflock.h"
+
+#include <windows.h>
+
+CS_PLUGIN_NAMESPACE_BEGIN(ImprovedTerrain)
+{
+
+SCF_IMPLEMENT_FACTORY (csTerrainSimpleRenderer)
+
+struct csSimpleTerrainRenderData;
+
+/**
+ * This is one block in the terrain.
+ */
+class csTerrBlock : public csRefCount
+{
+public:
+  CS_LEAKGUARD_DECLARE (csTerrBlock);
+
+  csRef<iRenderBuffer> mesh_vertices;
+  csVector3 *vertex_data;
+  csRef<iRenderBuffer> mesh_texcoords;
+  csVector2 *texcoord_data;
+  csRef<csRenderBufferHolder> bufferHolder;
+
+  csVector2 center;
+  csVector2 size;
+  int res;
+
+  // for this kind of grid:
+  // . _ .
+  // _ _ _
+  // . _ .
+  // left = top = 0, right = bottom = 2,
+  // step = 2
+  int left, top, right, bottom;
+  int step;
+
+  bool built;
+
+  csSimpleTerrainRenderData *rdata;
+
+  //          0
+  //      ---------
+  //      | 0 | 1 |
+  //    2 |-------| 1
+  //      | 2 | 3 |
+  //      ---------
+  //          3
+
+  csTerrBlock* parent;
+  csRef<csTerrBlock> children[4];
+  csTerrBlock* neighbours[4];
+  int child;
+
+  static int tris;
+
+  csBox3 bbox;
+
+public:
+
+  csTerrBlock (csSimpleTerrainRenderData *data);
+  ~csTerrBlock ();
+
+  /// Load data from Former
+  void LoadData ();
+
+  /// Generate mesh
+  void SetupMesh ();
+
+  /// Detach the node from the tree
+  void Detach ();
+
+  /// Split block in 4 children
+  void Split ();
+
+  /// Merge block
+  void Merge ();
+
+  /// Checks if something needs to be merged or split
+  void CalcLOD ();
+
+  /// Returns true if this node is a leaf
+  bool IsLeaf ()  const
+  { return children[0] == 0; }
+
+  void DrawTest (iGraphics3D* g3d, iRenderView *rview, uint32 frustum_mask,
+                 csReversibleTransform &transform, iMovable *movable,
+                 csDirtyAccessArray<csRenderMesh*>& meshes);
+
+  bool detach;
+};
+
+static void FillEdge (bool halfres, int res, uint16* indices, int &indexcount,
+               int offs, int add)
+{
+  if (!halfres) return;
+  
+  int x;
+  // This triangulation scheme could probably be better.
+  for (x=0; x<res; x+=2)
+  {
+    // 
+    // a - c - e - g - i
+    //   b   d   f   h
+    // ok, having 2 triangles for each crease is not cool
+    // though without that I doubt that it's possible to
+    // make correct orientation. Is it?
+    indices[indexcount++] = offs + x * add;
+    indices[indexcount++] = offs + (x+1) * add;
+    indices[indexcount++] = offs + (x+2) * add;
+    indices[indexcount++] = offs + x * add;
+    indices[indexcount++] = offs + (x+2) * add;
+    indices[indexcount++] = offs + (x+1) * add;
+  }
+}
+/*static void FillEdge (bool halfres, int res, uint16* indices, int &indexcount,
+               int offs, int xadd, int zadd)
+{
+  int x;
+  // This triangulation scheme could probably be better.
+  for (x=0; x<res; x+=2)
+  {
+    // 
+    // a   c   e   g   i
+    //   b   d   f   h
+    if (x>0)
+    {
+      indices[indexcount++] = offs+x*xadd+zadd;
+      indices[indexcount++] = offs+x*xadd;
+    }
+    else
+    {
+      indices[indexcount++] = offs+x*xadd;
+      indices[indexcount++] = offs+x*xadd;
+      indices[indexcount++] = offs+x*xadd;
+    }
+
+    indices[indexcount++] = offs+(x+1)*xadd+zadd;
+    if (!halfres)
+      indices[indexcount++] = offs+(x+1)*xadd;
+    else
+      indices[indexcount++] = offs+x*xadd;
+
+    if (x<res-2)
+    {
+      indices[indexcount++] = offs+(x+2)*xadd+zadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+    }
+    else
+    {
+      indices[indexcount++] = offs+(x+2)*xadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+    }
+  }
+}*/
+
+struct csSimpleTerrainRenderData: public csRefCount
+{
+  csRef<csTerrBlock> rootblock;
+
+  csRef<iMaterialWrapper> material;
+  
+  csRenderMeshHolder* rm_holder;
+
+  csPlane3* planes;
+
+  csRefArray<iMaterialWrapper>* material_palette;
+  csArray<csRef<csShaderVariableContext> > sv_context;
+  
+  csArray<csRef<iTextureHandle> > alpha_map;
+
+  unsigned int primitive_count;
+
+  int block_res, block_minsize;
+  float lod_lcoeff;
+
+  csRef<iRenderBuffer> mesh_indices[16];
+  int numindices[16];
+  
+  csReversibleTransform tr_o2c;
+
+  bool initialized;
+
+  iTerrainCell* cell;
+
+  csSimpleTerrainRenderData(iTerrainCell* cell)
+  {
+    this->cell = cell;
+
+    initialized = false;
+
+//        <lodvalue name="block resolution">16</lodvalue>
+    block_res = 16;
+
+//        <lodvalue name="minimum block size">32</lodvalue>
+    block_minsize = 32;
+    
+    lod_lcoeff = 16;
+
+//    <variable name="LodM" value="-0.00666667" />
+//    <variable name="LodA" value="1.33333" />
+//        <lodvalue name="splatting distance">200</lodvalue>
+//        <lodvalue name="block split distance">8</lodvalue>
+//        <lodvalue name="cd resolution">256</lodvalue>
+  }
+
+  void SetupObject(iGraphics3D* g3d)
+  {
+    if (!initialized)
+    {
+      initialized = true;
+  
+      for (int t=0; t<=1; t++)
+      {
+        for (int r=0; r<=1; r++)
+        {
+          for (int l=0; l<=1; l++)
+          {
+            for (int b=0; b<=1; b++)
+            {
+              int idx = t+(r<<1)+(l<<2)+(b<<3);
+              mesh_indices[idx] = 
+  	      csRenderBuffer::CreateIndexRenderBuffer (
+                (block_res*block_res*2 + 4*block_res)*3, 
+                CS_BUF_STATIC, CS_BUFCOMP_UNSIGNED_SHORT,
+                0, (block_res+1) * (block_res+1) - 1);
+              uint16 *indices = 
+                (uint16*)mesh_indices[idx]->Lock (CS_BUF_LOCK_NORMAL);
+  
+              numindices[idx] = 0;
+              int x, z;
+/*              for (z=1; z<(block_res-1); z++)
+              {
+                indices[numindices[idx]++] = 1+z*(block_res+1);
+                indices[numindices[idx]++] = 1+z*(block_res+1);
+                for (x=1; x<(block_res); x++)
+                { 
+                  indices[numindices[idx]++] = x+(z+0)*(block_res+1);
+                  indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                }
+                indices[numindices[idx]++] = x-1+(z+1)*(block_res+1);
+                indices[numindices[idx]++] = x-1+(z+1)*(block_res+1);
+              }*/
+              for (z=0; z<block_res; z++)
+              {
+                  for (x=0; x<block_res; x++)
+                  { 
+                      indices[numindices[idx]++] = x+(z+0)*(block_res+1);
+                      indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                      indices[numindices[idx]++] = x+1+(z+0)*(block_res+1);
+                      
+                      indices[numindices[idx]++] = x+1+(z+0)*(block_res+1);
+                      indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                      indices[numindices[idx]++] = x+1+(z+1)*(block_res+1);
+                  }
+              }
+  
+              /*FillEdge (t==1,
+                block_res, indices, numindices[idx], 
+                0, 1, (block_res+1));
+  
+              FillEdge (r==1,
+                block_res, indices, numindices[idx],
+                block_res, (block_res+1), -1);
+
+              FillEdge (l==1,
+                block_res, indices, numindices[idx], 
+               block_res*(block_res+1), -(block_res+1), 1);
+
+              FillEdge (b==1, 
+                block_res, indices, numindices[idx],
+                block_res*(block_res+1)+block_res, -1, -(block_res+1));*/
+                
+              FillEdge (t==1,
+                  block_res, indices, numindices[idx], 
+                  0, 1);
+
+              FillEdge (r==1,
+                  block_res, indices, numindices[idx],
+                  block_res, block_res + 1);
+
+              FillEdge (l==1,
+                  block_res, indices, numindices[idx], 
+                  0, block_res + 1);
+
+              FillEdge (b==1, 
+                  block_res, indices, numindices[idx],
+                  block_res*(block_res+1), 1);
+
+              mesh_indices[idx]->Release ();
+            }
+          }
+        }
+      }
+
+      rootblock.AttachNew (new csTerrBlock (this));
+      csVector2 center = cell->GetPosition () + csVector2 (cell->GetSize ().x,
+        cell->GetSize ().y)/2;
+      rootblock->center = center;
+      rootblock->size = csVector2(cell->GetSize ().x, cell->GetSize ().y);
+      
+      rootblock->left = rootblock->top = 0;
+      rootblock->right = cell->GetGridWidth () - 1;
+      rootblock->bottom = cell->GetGridHeight () - 1;
+
+      // so, we're going to take block_res steps of size step to reach 
+      // from left to right, that is
+      // left + step * block_res = right
+      // beware! block_res and right should be 2^n !
+      rootblock->step = rootblock->right / block_res;
+
+      rootblock->SetupMesh ();
+    }
+  }
+};
+
+csTerrBlock::csTerrBlock (csSimpleTerrainRenderData* data)
+{
+  parent = 0;
+  child = 0;
+  children[0] = children[1] = children[2] = children[3] = 0;
+  neighbours[0] =  neighbours[1] = neighbours[2] = neighbours[3] = 0;
+
+  vertex_data = 0;
+  texcoord_data = 0;
+
+  built = false;
+
+  bufferHolder.AttachNew (new csRenderBufferHolder);
+
+  detach = false;
+
+  rdata = data;
+}
+
+csTerrBlock::~csTerrBlock ()
+{
+  delete [] vertex_data;
+  delete [] texcoord_data;
+}
+
+void csTerrBlock::Detach ()
+{
+  detach = true;
+
+  if (!IsLeaf ())
+  {
+    children[0]->Detach ();
+    children[1]->Detach ();
+    children[2]->Detach ();
+    children[3]->Detach ();
+    children[0] = children[1] = children[2] = children[3] = 0;
+  }
+
+  if (parent)
+  {
+    if (neighbours[0])
+    {
+      if (child == 0 || child == 1)
+      {
+        neighbours[0]->neighbours[3] = parent;
+      }
+    }
+    if (neighbours[1])
+    {
+      if (child == 1 || child == 3)
+      {
+        neighbours[1]->neighbours[2] = parent;
+      }
+    }
+    if (neighbours[2])
+    {
+      if (child == 0 || child == 2)
+      {
+        neighbours[2]->neighbours[1] = parent;
+      }
+    }
+    if (neighbours[3])
+    {
+      if (child == 2 || child == 3)
+      {
+        neighbours[3]->neighbours[0] = parent;
+      }
+    }
+  }
+}
+
+void csTerrBlock::LoadData ()
+{
+  res = rdata->block_res + 1;
+
+  delete[] vertex_data;
+  vertex_data = new csVector3[res * res];
+  delete[] texcoord_data;
+  texcoord_data = new csVector2[res * res];
+
+  const csVector2& pos = rdata->cell->GetPosition();
+  const csVector3& cell_size = rdata->cell->GetSize();
+  
+  csLockedHeightData data = rdata->cell->GetHeightData ();
+  
+  for (int y = 0; y < res; ++y)
+    for (int x = 0; x < res; ++x)
+    {
+      unsigned int index = y * res + x;
+       
+      float x_centered = (float)x / (float)(res - 1) - 0.5f;
+      float y_centered = (float)y / (float)(res - 1) - 0.5f;
+       
+      float real_x = x_centered * size.x + center.x;
+      float real_y = y_centered * size.y + center.y;
+       
+      float height = data.data[data.pitch * (top + y * step) + (left + x * step)];
+      
+      vertex_data[index] = csVector3(real_x, height, real_y);
+      
+      texcoord_data[index] = csVector2((real_x - pos.x) / cell_size.x, (real_y - pos.y) / cell_size.y);
+    }
+}
+
+void csTerrBlock::SetupMesh ()
+{
+  
+  //@@@ have a method to set this from world
+  res = rdata->block_res + 1;
+  
+  LoadData ();
+  
+  bbox.Empty ();
+  
+  int totres = res * res;
+  bbox.StartBoundingBox (vertex_data[0]);
+  for (int i = 1 ; i < totres ; i++)
+  {
+    bbox.AddBoundingVertexSmart (vertex_data[i]);
+  }
+  built = true;
+}
+
+void csTerrBlock::Split ()
+{
+  int i;
+  for (i=0; i<4; i++)
+  {
+    if (neighbours[i] && neighbours[i]->step>step && neighbours[i]->IsLeaf ())
+      neighbours[i]->Split ();
+  }
+
+  int half_right = left + (right - left) / 2;
+  int half_bottom = top + (bottom - top) / 2;
+
+  children[0].AttachNew (new csTerrBlock (rdata));
+  children[0]->parent = this;
+  children[0]->size = size/2.0;
+  children[0]->center = center + csVector2 (-size.x/4.0, -size.y/4.0);
+  children[0]->child = 0;
+  children[0]->step = step / 2;
+  children[0]->left = left;
+  children[0]->right = half_right;
+  children[0]->top = top;
+  children[0]->bottom = half_bottom;
+
+  children[1].AttachNew (new csTerrBlock (rdata));
+  children[1]->parent = this;
+  children[1]->size = size/2.0;
+  children[1]->center = center + csVector2 ( size.x/4.0, -size.y/4.0);
+  children[1]->child = 1;
+  children[1]->step = step / 2;
+  children[1]->left = half_right;
+  children[1]->right = right;
+  children[1]->top = top;
+  children[1]->bottom = half_bottom;
+
+  children[2].AttachNew (new csTerrBlock (rdata));
+  children[2]->parent = this;
+  children[2]->size = size/2.0;
+  children[2]->center = center + csVector2 (-size.x/4.0, size.y/4.0);
+  children[2]->child = 2;
+  children[2]->step = step / 2;
+  children[2]->left = left;
+  children[2]->right = half_right;
+  children[2]->top = half_bottom;
+  children[2]->bottom = bottom;
+
+  children[3].AttachNew (new csTerrBlock (rdata));
+  children[3]->parent = this;
+  children[3]->size = size/2.0;
+  children[3]->center = center + csVector2 ( size.x/4.0, size.y/4.0);
+  children[3]->child = 3;
+  children[3]->step = step / 2;
+  children[3]->left = half_right;
+  children[3]->right = right;
+  children[3]->top = half_bottom;
+  children[3]->bottom = bottom;
+
+  if (neighbours[0])
+    if (!neighbours[0]->IsLeaf ())
+    {
+      children[0]->neighbours[0] = neighbours[0]->children[2];
+      children[1]->neighbours[0] = neighbours[0]->children[3];
+      children[0]->neighbours[0]->neighbours[3] = children[0];
+      children[1]->neighbours[0]->neighbours[3] = children[1];
+    }
+    else
+    {
+      children[0]->neighbours[0] = neighbours[0];
+      children[1]->neighbours[0] = neighbours[0];
+      neighbours[0]->neighbours[3] = this;
+    }
+  if (neighbours[1])
+    if (!neighbours[1]->IsLeaf ())
+    {
+      children[1]->neighbours[1] = neighbours[1]->children[0];
+      children[3]->neighbours[1] = neighbours[1]->children[2];
+      children[1]->neighbours[1]->neighbours[2] = children[1];
+      children[3]->neighbours[1]->neighbours[2] = children[3];
+    }
+    else
+    {
+      children[1]->neighbours[1] = neighbours[1];
+      children[3]->neighbours[1] = neighbours[1];
+      neighbours[1]->neighbours[2] = this;
+    }
+  if (neighbours[2])
+    if (!neighbours[2]->IsLeaf ())
+    {
+      children[0]->neighbours[2] = neighbours[2]->children[1];
+      children[2]->neighbours[2] = neighbours[2]->children[3];
+      children[0]->neighbours[2]->neighbours[1] = children[0];
+      children[2]->neighbours[2]->neighbours[1] = children[2];
+    }
+    else
+    {
+      children[0]->neighbours[2] = neighbours[2];
+      children[2]->neighbours[2] = neighbours[2];
+      neighbours[2]->neighbours[1] = this;
+    }
+  if (neighbours[3])
+    if (!neighbours[3]->IsLeaf ())
+    {
+      children[2]->neighbours[3] = neighbours[3]->children[0];
+      children[3]->neighbours[3] = neighbours[3]->children[1];
+      children[2]->neighbours[3]->neighbours[0] = children[2];
+      children[3]->neighbours[3]->neighbours[0] = children[3];
+    }
+    else
+    {
+      children[2]->neighbours[3] = neighbours[3];
+      children[3]->neighbours[3] = neighbours[3];
+      neighbours[3]->neighbours[0] = this;
+    }
+  children[0]->neighbours[1] = children[1];
+  children[0]->neighbours[3] = children[2];
+
+  children[1]->neighbours[2] = children[0];
+  children[1]->neighbours[3] = children[3];
+
+  children[2]->neighbours[0] = children[0];
+  children[2]->neighbours[1] = children[3];
+
+  children[3]->neighbours[0] = children[1];
+  children[3]->neighbours[2] = children[2];
+
+  children[0]->SetupMesh ();
+  children[1]->SetupMesh ();
+  children[2]->SetupMesh ();
+  children[3]->SetupMesh ();
+}
+
+void csTerrBlock::Merge ()
+{
+  if (IsLeaf ())
+    return;
+  if (neighbours[0] && (!neighbours[0]->IsLeaf () && 
+                       (!neighbours[0]->children[2]->IsLeaf () ||
+                        !neighbours[0]->children[3]->IsLeaf ())))
+      return;
+  if (neighbours[1] && (!neighbours[1]->IsLeaf () && 
+                       (!neighbours[1]->children[0]->IsLeaf () ||
+                        !neighbours[1]->children[2]->IsLeaf ())))
+    return;
+  if (neighbours[2] && (!neighbours[2]->IsLeaf () && 
+                       (!neighbours[2]->children[1]->IsLeaf () ||
+                        !neighbours[2]->children[3]->IsLeaf ())))
+    return;
+  if (neighbours[3] && (!neighbours[3]->IsLeaf () && 
+                       (!neighbours[3]->children[0]->IsLeaf () ||
+                        !neighbours[3]->children[1]->IsLeaf ())))
+    return;
+
+  children[0]->Detach ();
+  children[1]->Detach ();
+  children[2]->Detach ();
+  children[3]->Detach ();
+  children[0] = children[1] = children[2] = children[3] = 0;
+}
+
+void csTerrBlock::CalcLOD ()
+{
+  int res = rdata->block_res;
+
+  csVector3 cam = rdata->tr_o2c.GetOrigin ();
+  csBox3 cambox (bbox.Min ()-cam, bbox.Max ()-cam);
+  /*csVector3 radii = (bbox.Max ()-bbox.Min ())*0.5;
+  radii *= (1.0/res)*terr->lod_lcoeff;
+  float maxradius = MAX(MAX(radii.x, radii.y), radii.z);
+  cam.x *= maxradius/radii.x;
+  cam.y *= maxradius/radii.y;
+  cam.z *= maxradius/radii.z;
+  radii.x = radii.x;
+  if (cam.SquaredNorm ()<maxradius*maxradius &&
+      size > terr->block_minsize)*/
+  
+  float size = MAX(this->size.x, this->size.y);
+      
+  float splitdist = size*rdata->lod_lcoeff / float (res);
+  
+  if (GetAsyncKeyState(VK_F2) >= 0) return;
+  
+  if (cambox.SquaredOriginDist()<splitdist*splitdist &&
+    step > 1)
+  {
+    if (IsLeaf ())
+      Split ();
+  }
+  else
+  {
+    if (!IsLeaf ())
+      Merge ();
+  }
+  if (!IsLeaf ())
+    for (int i=0; i<4; i++)
+      children[i]->CalcLOD ();
+}
+
+void csTerrBlock::DrawTest (iGraphics3D* g3d,
+			    iRenderView *rview, uint32 frustum_mask,
+                            csReversibleTransform &transform,
+                            iMovable *movable,
+        csDirtyAccessArray<csRenderMesh*>& meshes)
+{
+  if (!IsLeaf () && children[0]->built &&
+                    children[1]->built &&
+                    children[2]->built &&
+                    children[3]->built)
+  {
+    children[0]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[1]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[2]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[3]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    return;
+  }
+
+  if (!built)
+    return;
+
+  int res = rdata->block_res;
+
+  if (!mesh_vertices)
+  {
+    int num_mesh_vertices = (res+1)*(res+1);
+    mesh_vertices = 
+      csRenderBuffer::CreateRenderBuffer (
+      num_mesh_vertices, CS_BUF_STATIC, CS_BUFCOMP_FLOAT,
+      3);
+    mesh_vertices->CopyInto (vertex_data, num_mesh_vertices);
+    delete[] vertex_data;
+    vertex_data = 0;
+
+    mesh_texcoords = 
+    csRenderBuffer::CreateRenderBuffer (num_mesh_vertices,
+      CS_BUF_STATIC, CS_BUFCOMP_FLOAT,
+      2);
+    mesh_texcoords->CopyInto (texcoord_data, num_mesh_vertices);
+    delete[] texcoord_data;
+    texcoord_data = 0;
+
+    bufferHolder->SetRenderBuffer (CS_BUFFER_POSITION, mesh_vertices);
+    bufferHolder->SetRenderBuffer (CS_BUFFER_TEXCOORD0, mesh_texcoords);
+  }
+
+  //csVector3 cam = rview->GetCamera ()->GetTransform ().GetOrigin ();
+  csVector3 cam = transform.GetOrigin ();
+
+  int clip_portal, clip_plane, clip_z_plane;
+  if (!rview->ClipBBox (rdata->planes, frustum_mask,
+      bbox, clip_portal, clip_plane, clip_z_plane))
+    return;
+
+  int idx = ((!neighbours[0] || neighbours[0]->step>step)?1:0)+
+            (((!neighbours[1] || neighbours[1]->step>step)?1:0)<<1)+
+            (((neighbours[2] && neighbours[2]->step>step)?1:0)<<2)+
+            (((neighbours[3] && neighbours[3]->step>step)?1:0)<<3);
+            
+  bufferHolder->SetRenderBuffer (CS_BUFFER_INDEX, rdata->mesh_indices[idx]);
+  
+  const csReversibleTransform o2wt = movable->GetFullTransform ();
+  const csVector3& wo = o2wt.GetOrigin ();
+  bool isMirrored = rview->GetCamera()->IsMirrored();
+
+  for (unsigned int j = 0; j < rdata->material_palette->GetSize (); ++j)
+  {
+    bool created;
+    
+    csRenderMesh*& mesh = rdata->rm_holder->GetUnusedMesh (created,
+                                       rview->GetCurrentFrameNumber ());
+    
+    mesh->meshtype = CS_MESHTYPE_TRIANGLES;
+    
+    mesh->buffers = bufferHolder;
+    mesh->clip_portal = clip_portal;
+    mesh->clip_plane = clip_plane;
+    mesh->clip_z_plane = clip_z_plane;
+    mesh->indexstart = 0;
+    mesh->indexend = rdata->numindices[idx];
+    mesh->material = rdata->material_palette->Get (j);
+    mesh->variablecontext = rdata->sv_context[j];
+
+    mesh->object2world = o2wt;
+    mesh->worldspace_origin = wo;
+    mesh->do_mirror = isMirrored;
+      
+    meshes.Push (mesh);
+  }
+}
+
+csTerrainSimpleCellRenderProperties::csTerrainSimpleCellRenderProperties
+  (iBase* parent)
+  : scfImplementationType (this, parent)
+{
+  visible = true;
+}
+
+csTerrainSimpleCellRenderProperties::~csTerrainSimpleCellRenderProperties ()
+{
+}
+
+bool csTerrainSimpleCellRenderProperties::GetVisible() const
+{
+  return visible;
+}
+
+void csTerrainSimpleCellRenderProperties::SetVisible(bool value)
+{
+  visible = value;
+}
+
+csTerrainSimpleRenderer::csTerrainSimpleRenderer (iBase* parent)
+  : scfImplementationType (this, parent)
+{
+}
+
+
+csTerrainSimpleRenderer::~csTerrainSimpleRenderer ()
+{
+}
+
+csPtr<iTerrainCellRenderProperties> csTerrainSimpleRenderer::CreateProperties()
+{
+  return new csTerrainSimpleCellRenderProperties(NULL);
+}
+
+csRenderMesh** csTerrainSimpleRenderer::GetRenderMeshes (int& n,
+      iRenderView* rview, iMovable* movable, uint32 frustum_mask,
+      iTerrainCell** cells, int cell_count)
+{
+  meshes.Empty ();
+  
+  bool do_mirroring = rview->GetCamera ()->IsMirrored ();
+  
+  const csReversibleTransform& o2wt = movable->GetFullTransform ();
+  const csVector3& wo = o2wt.GetOrigin ();
+  
+  iCamera* cam = rview->GetCamera ();
+  csReversibleTransform tr_o2c = cam->GetTransform ();
+  if (!movable->IsFullTransformIdentity ())
+      tr_o2c /= movable->GetFullTransform ();
+
+  csPlane3 planes[10];
+  rview->SetupClipPlanes (tr_o2c, planes, frustum_mask);
+
+  for (int i = 0; i < cell_count; ++i)
+  {
+    csSimpleTerrainRenderData* rdata = (csSimpleTerrainRenderData*)
+                                           cells[i]->GetRenderData ();
+
+    if (!rdata) continue;
+    
+    rdata->material_palette = &material_palette;
+    rdata->rm_holder = &rm_holder;
+    rdata->planes = planes;
+
+	rdata->rootblock->CalcLOD ();
+    
+    rdata->tr_o2c = tr_o2c;
+
+    rdata->rootblock->DrawTest (g3d, rview, 0, tr_o2c, movable, meshes);
+  }
+  
+  n = (int)meshes.GetSize ();
+  
+  return meshes.GetArray ();
+}
+
+void csTerrainSimpleRenderer::OnMaterialPaletteUpdate (
+const csRefArray<iMaterialWrapper>& material_palette)
+{
+  this->material_palette = material_palette;
+}
+
+void csTerrainSimpleRenderer::OnHeightUpdate (iTerrainCell* cell,
+const csRect& rectangle, const float* data, unsigned int pitch)
+{
+  csRef<csSimpleTerrainRenderData> rdata = (csSimpleTerrainRenderData*)
+  cell->GetRenderData ();
+
+  int grid_width = cell->GetGridWidth ();
+  int grid_height = cell->GetGridHeight ();
+  
+  int mm_width = cell->GetMaterialMapWidth();
+  int mm_height = cell->GetMaterialMapHeight();
+
+  if (!rdata)
+  {
+    rdata.AttachNew (new csSimpleTerrainRenderData(cell));
+
+    cell->SetRenderData (rdata);
+
+    rdata->SetupObject(g3d);
+  }
+}
+
+void csTerrainSimpleRenderer::OnMaterialMaskUpdate (iTerrainCell* cell,
+unsigned int material, const csRect& rectangle, const unsigned char* data,
+unsigned int pitch)
+{
+  csRef<csSimpleTerrainRenderData> rdata = (csSimpleTerrainRenderData*)
+  cell->GetRenderData ();
+
+  if (!rdata)
+  {
+    rdata.AttachNew (new csSimpleTerrainRenderData(cell));
+
+    cell->SetRenderData (rdata);
+
+    rdata->SetupObject(g3d);
+  }
+
+  if (rdata->sv_context.GetSize () <= material)
+  {
+    rdata->sv_context.SetSize (material + 1);
+  }
+  
+  if (!rdata->sv_context[material])
+  {
+    rdata->sv_context[material].AttachNew (new csShaderVariableContext);
+   
+    csRef<csShaderVariable> var;
+    var.AttachNew (new csShaderVariable(strings->Request ("splat base pass")));
+    var->SetType (csShaderVariable::INT);
+    var->SetValue (material == 0);
+    rdata->sv_context[material]->AddVariable (var);
+  }
+    
+  if (rdata->alpha_map.GetSize () <= material)
+  {
+    rdata->alpha_map.SetSize (material + 1);
+  }
+
+  if (!rdata->alpha_map[material])
+  {
+    csRef<iImage> image;
+    image.AttachNew (new csImageMemory (cell->GetMaterialMapWidth (),
+    cell->GetMaterialMapHeight (), CS_IMGFMT_TRUECOLOR));
+
+    rdata->alpha_map[material] = g3d->GetTextureManager()->RegisterTexture
+    (image, CS_TEXTURE_2D | CS_TEXTURE_3D | CS_TEXTURE_CLAMP);
+    
+    csRef<csShaderVariable> var;
+    var.AttachNew (new csShaderVariable(strings->Request ("splat alpha map")));
+    var->SetType (csShaderVariable::TEXTURE);
+    var->SetValue (rdata->alpha_map[material]);
+    rdata->sv_context[material]->AddVariable (var);
+  }
+  
+  csDirtyAccessArray<csRGBpixel> image_data;
+  image_data.SetSize (rectangle.Width () * rectangle.Height ());
+  
+  for (int y = 0; y < rectangle.Width (); ++y)
+    for (int x = 0; x < rectangle.Height (); ++x)
+      image_data[y * rectangle.Width () + x].Set (
+      data[y * pitch + x], data[y * pitch + x],
+      data[y * pitch + x], data[y * pitch + x]);
+      
+  rdata->alpha_map[material]->Blit (rectangle.xmin, rectangle.ymin,
+  rectangle.Width (), rectangle.Height (), (unsigned char*)
+  image_data.GetArray (), iTextureHandle::RGBA8888);
+}
+
+bool csTerrainSimpleRenderer::Initialize (iObjectRegistry* object_reg)
+{
+  this->object_reg = object_reg;
+   
+  g3d = csQueryRegistry<iGraphics3D> (object_reg);
+  
+  strings = csQueryRegistryTagInterface<iStringSet> (object_reg,
+  "crystalspace.shared.stringset");
+    
+  return true;
+}
+
+}
+CS_PLUGIN_NAMESPACE_END(ImprovedTerrain)

Added: CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.h
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.h	                        (rev 0)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/bruteblock/simplerenderer.h	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,99 @@
+/*
+    Copyright (C) 2006 by Kapoulkine Arseny
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __CS_TERRAIN_SIMPLERENDERER_H__
+#define __CS_TERRAIN_SIMPLERENDERER_H__
+
+#include "csutil/scf_implementation.h"
+
+#include "iterrain/terrainrenderer.h"
+#include "iterrain/terraincellrenderproperties.h"
+
+#include "cstool/rendermeshholder.h"
+
+#include "csutil/dirtyaccessarray.h"
+
+#include "iutil/comp.h"
+
+#include "ivideo/graph3d.h"
+
+#include "iutil/strset.h"
+
+CS_PLUGIN_NAMESPACE_BEGIN(ImprovedTerrain)
+{
+
+class csTerrainSimpleCellRenderProperties :
+  public scfImplementation1<csTerrainSimpleCellRenderProperties,
+                          iTerrainCellRenderProperties>
+{
+private:
+  bool visible;
+
+public:
+  csTerrainSimpleCellRenderProperties (iBase* parent);
+
+  virtual ~csTerrainSimpleCellRenderProperties ();
+
+  virtual bool GetVisible () const;
+  virtual void SetVisible (bool value);
+};
+
+class csTerrainSimpleRenderer :
+  public scfImplementation2<csTerrainSimpleRenderer,
+                            iTerrainRenderer,
+                            iComponent>
+{
+  csDirtyAccessArray<csRenderMesh*> meshes;
+  
+  csRenderMeshHolder rm_holder;
+
+  csRefArray<iMaterialWrapper> material_palette;
+
+  iObjectRegistry* object_reg;
+
+  csRef<iGraphics3D> g3d;
+  csRef<iStringSet> strings;
+public:
+  csTerrainSimpleRenderer (iBase* parent);
+
+  virtual ~csTerrainSimpleRenderer ();
+
+  // ------------ iTerrainRenderer implementation ------------
+
+  virtual csPtr<iTerrainCellRenderProperties> CreateProperties ();
+
+  virtual csRenderMesh** GetRenderMeshes (int& n, iRenderView* rview,
+                                   iMovable* movable, uint32 frustum_mask,
+                                   iTerrainCell** cells, int cell_count);
+
+  virtual void OnMaterialPaletteUpdate (const csRefArray<iMaterialWrapper>&
+                                        material_palette);
+  virtual void OnHeightUpdate (iTerrainCell* cell, const csRect& rectangle,
+                               const float* data, unsigned int pitch);
+  virtual void OnMaterialMaskUpdate (iTerrainCell* cell, unsigned int material,
+                               const csRect& rectangle, const unsigned char*
+                               data, unsigned int pitch);
+  
+  // ------------ iComponent implementation ------------
+  virtual bool Initialize (iObjectRegistry* object_reg);
+};
+
+}
+CS_PLUGIN_NAMESPACE_END(ImprovedTerrain)
+
+#endif // __CS_TERRAIN_SIMPLERENDERER_H__

Added: CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/readme.txt
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/readme.txt	                        (rev 0)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/readme.txt	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,3 @@
+I'm tired of renaming renderers, adding new ones and so - it's hard, because jam does not work.
+So I've decided to store working renderers here, and do all code in simplerenderer.cpp in terrain
+folder.

Added: CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.cpp
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.cpp	                        (rev 0)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.cpp	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,335 @@
+/*
+    Copyright (C) 2006 by Kapoulkine Arseny
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "cssysdef.h"
+
+#include "simplerenderer.h"
+
+#include "ivideo/rendermesh.h"
+#include "csgfx/renderbuffer.h"
+
+#include "csgfx/shadervarcontext.h"
+
+#include "iengine.h"
+
+#include "iterrain/terraincell.h"
+
+#include "csutil/objreg.h"
+
+#include "csgfx/shadervar.h"
+
+#include "csgfx/rgbpixel.h"
+#include "csgfx/memimage.h"
+
+#include "csutil/refarr.h"
+
+#include "ivideo/txtmgr.h"
+
+#include "cstool/rbuflock.h"
+
+CS_PLUGIN_NAMESPACE_BEGIN(ImprovedTerrain)
+{
+
+SCF_IMPLEMENT_FACTORY (csTerrainSimpleRenderer)
+
+struct csSimpleTerrainRenderData: public csRefCount
+{
+  csRef<csRenderBuffer> vb_pos;
+  csRef<csRenderBuffer> vb_texcoord;
+  csRef<csRenderBuffer> ib;
+
+  csRef<iMaterialWrapper> material;
+  
+  csArray<csRef<csShaderVariableContext> > sv_context;
+  
+  csArray<csRef<iTextureHandle> > alpha_map;
+
+  unsigned int primitive_count;
+};
+
+csTerrainSimpleCellRenderProperties::csTerrainSimpleCellRenderProperties
+  (iBase* parent)
+  : scfImplementationType (this, parent)
+{
+  visible = true;
+}
+
+csTerrainSimpleCellRenderProperties::~csTerrainSimpleCellRenderProperties ()
+{
+}
+
+bool csTerrainSimpleCellRenderProperties::GetVisible() const
+{
+  return visible;
+}
+
+void csTerrainSimpleCellRenderProperties::SetVisible(bool value)
+{
+  visible = value;
+}
+
+csTerrainSimpleRenderer::csTerrainSimpleRenderer (iBase* parent)
+  : scfImplementationType (this, parent)
+{
+}
+
+
+csTerrainSimpleRenderer::~csTerrainSimpleRenderer ()
+{
+}
+
+csPtr<iTerrainCellRenderProperties> csTerrainSimpleRenderer::CreateProperties()
+{
+  return new csTerrainSimpleCellRenderProperties(NULL);
+}
+
+csRenderMesh** csTerrainSimpleRenderer::GetRenderMeshes (int& n,
+      iRenderView* rview, iMovable* movable, uint32 frustum_mask,
+      iTerrainCell** cells, int cell_count)
+{
+  meshes.Empty ();
+  
+  bool do_mirroring = rview->GetCamera ()->IsMirrored ();
+  
+  const csReversibleTransform& o2wt = movable->GetFullTransform ();
+  const csVector3& wo = o2wt.GetOrigin ();
+  
+  for (int i = 0; i < cell_count; ++i)
+  {
+    csSimpleTerrainRenderData* rdata = (csSimpleTerrainRenderData*)
+                                           cells[i]->GetRenderData ();
+
+    if (!rdata) continue;
+
+    for (unsigned int j = 0; j < material_palette.GetSize (); ++j)
+    {
+      bool created;
+    
+      csRenderMesh*& mesh = rm_holder.GetUnusedMesh (created,
+                                         rview->GetCurrentFrameNumber ());
+
+    
+      mesh->meshtype = CS_MESHTYPE_TRIANGLES;
+    
+      mesh->material = material_palette[j];
+      
+      mesh->indexstart = 0;
+      mesh->indexend = rdata->primitive_count * 3;
+    
+      mesh->do_mirror = do_mirroring;
+    
+      mesh->variablecontext = rdata->sv_context[j];
+    
+      mesh->object2world = o2wt;
+      mesh->worldspace_origin = wo;
+      
+      if (created) mesh->buffers.AttachNew (new csRenderBufferHolder);
+    
+      mesh->buffers->SetRenderBuffer (CS_BUFFER_POSITION, rdata->vb_pos);
+      mesh->buffers->SetRenderBuffer (CS_BUFFER_TEXCOORD0, rdata->vb_texcoord);
+      mesh->buffers->SetRenderBuffer (CS_BUFFER_INDEX, rdata->ib);
+      
+      meshes.Push (mesh);
+    }
+  }
+  
+  n = (int)meshes.GetSize ();
+  
+  return meshes.GetArray ();
+}
+
+void csTerrainSimpleRenderer::OnMaterialPaletteUpdate (
+const csRefArray<iMaterialWrapper>& material_palette)
+{
+  this->material_palette = material_palette;
+}
+
+void csTerrainSimpleRenderer::OnHeightUpdate (iTerrainCell* cell,
+const csRect& rectangle, const float* data, unsigned int pitch)
+{
+  csRef<csSimpleTerrainRenderData> rdata = (csSimpleTerrainRenderData*)
+  cell->GetRenderData ();
+
+  int grid_width = cell->GetGridWidth ();
+  int grid_height = cell->GetGridHeight ();
+  
+  int mm_width = cell->GetMaterialMapWidth();
+  int mm_height = cell->GetMaterialMapHeight();
+
+  if (!rdata)
+  {
+    rdata.AttachNew (new csSimpleTerrainRenderData);
+
+    cell->SetRenderData (rdata);
+
+    rdata->primitive_count = (grid_width-1)*(grid_height-1)*2;
+
+    rdata->vb_pos = csRenderBuffer::CreateRenderBuffer (
+    grid_width * grid_height, CS_BUF_STATIC, CS_BUFCOMP_FLOAT, 3);
+    
+    rdata->vb_texcoord = csRenderBuffer::CreateRenderBuffer (
+    grid_width * grid_height, CS_BUF_STATIC, CS_BUFCOMP_FLOAT, 2);
+
+    rdata->ib = csRenderBuffer::CreateIndexRenderBuffer (
+    rdata->primitive_count*3, CS_BUF_STATIC, CS_BUFCOMP_UNSIGNED_INT, 0,
+    grid_width * grid_height);
+
+    // fill ib
+    csRenderBufferLock<unsigned int> ilocker(rdata->ib);
+    unsigned int* iptr = ilocker;
+
+    for (int y = 0; y < grid_height - 1; ++y)
+      for (int x = 0; x < grid_width - 1; ++x)
+      {
+        // tl - tr
+        //  | / |
+        // bl - br
+
+        int tl = y * grid_width + x;
+        int tr = y * grid_width + x + 1;
+        int bl = (y + 1) * grid_width + x;
+        int br = (y + 1) * grid_width + x + 1;
+
+        *iptr++ = tl;
+        *iptr++ = bl;
+        *iptr++ = tr;
+
+        *iptr++ = tr;
+        *iptr++ = bl;
+        *iptr++ = br;
+      }
+
+    rdata->ib->Release ();
+
+    // fill tex coords
+    csRenderBufferLock<float> vlocker(rdata->vb_texcoord);
+    float* vptr = vlocker;
+
+    float u_offset = 1.0f / (grid_width - 1);
+    float v_offset = 1.0f / (grid_height - 1);
+    
+    float u_correct = 0.5f / mm_width;
+    float v_correct = 0.5f / mm_height;
+    
+    for (int y = 0; y < grid_height; ++y)
+      for (int x = 0; x < grid_width; ++x)
+      {
+        *vptr++ = x * u_offset + u_correct;
+        *vptr++ = y * v_offset + v_correct;
+      }
+
+    rdata->vb_texcoord->Release();
+  }
+
+  csRenderBufferLock<float> vlocker(rdata->vb_pos);
+  float* vptr = vlocker;
+
+  float offset_x = cell->GetPosition ().x;
+  float offset_y = cell->GetPosition ().y;
+
+  float scale_x = cell->GetSize ().x / (grid_width - 1);
+  float scale_y = cell->GetSize ().y / (grid_height - 1);
+
+   for (int y = rectangle.ymin; y < rectangle.ymax; ++y)
+     for (int x = rectangle.xmin; x < rectangle.xmax; ++x)
+     {
+       *vptr++ = x * scale_x + offset_x;
+       *vptr++ = data[y * pitch + x];
+       *vptr++ = y * scale_y + offset_y;
+     }
+}
+
+void csTerrainSimpleRenderer::OnMaterialMaskUpdate (iTerrainCell* cell,
+unsigned int material, const csRect& rectangle, const unsigned char* data,
+unsigned int pitch)
+{
+  csRef<csSimpleTerrainRenderData> rdata = (csSimpleTerrainRenderData*)
+  cell->GetRenderData ();
+
+  if (!rdata)
+  {
+    rdata.AttachNew (new csSimpleTerrainRenderData);
+
+    cell->SetRenderData (rdata);
+  }
+
+  if (rdata->sv_context.GetSize () <= material)
+  {
+    rdata->sv_context.SetSize (material + 1);
+  }
+  
+  if (!rdata->sv_context[material])
+  {
+    rdata->sv_context[material].AttachNew (new csShaderVariableContext);
+   
+    csRef<csShaderVariable> var;
+    var.AttachNew (new csShaderVariable(strings->Request ("splat base pass")));
+    var->SetType (csShaderVariable::INT);
+    var->SetValue (material == 0);
+    rdata->sv_context[material]->AddVariable (var);
+  }
+    
+  if (rdata->alpha_map.GetSize () <= material)
+  {
+    rdata->alpha_map.SetSize (material + 1);
+  }
+
+  if (!rdata->alpha_map[material])
+  {
+    csRef<iImage> image;
+    image.AttachNew (new csImageMemory (cell->GetMaterialMapWidth (),
+    cell->GetMaterialMapHeight (), CS_IMGFMT_TRUECOLOR));
+
+    rdata->alpha_map[material] = g3d->GetTextureManager()->RegisterTexture
+    (image, CS_TEXTURE_2D | CS_TEXTURE_3D | CS_TEXTURE_CLAMP);
+    
+    csRef<csShaderVariable> var;
+    var.AttachNew (new csShaderVariable(strings->Request ("splat alpha map")));
+    var->SetType (csShaderVariable::TEXTURE);
+    var->SetValue (rdata->alpha_map[material]);
+    rdata->sv_context[material]->AddVariable (var);
+  }
+  
+  csDirtyAccessArray<csRGBpixel> image_data;
+  image_data.SetSize (rectangle.Width () * rectangle.Height ());
+  
+  for (int y = 0; y < rectangle.Width (); ++y)
+    for (int x = 0; x < rectangle.Height (); ++x)
+      image_data[y * rectangle.Width () + x].Set (
+      data[y * pitch + x], data[y * pitch + x],
+      data[y * pitch + x], data[y * pitch + x]);
+      
+  rdata->alpha_map[material]->Blit (rectangle.xmin, rectangle.ymin,
+  rectangle.Width (), rectangle.Height (), (unsigned char*)
+  image_data.GetArray (), iTextureHandle::RGBA8888);
+}
+
+bool csTerrainSimpleRenderer::Initialize (iObjectRegistry* object_reg)
+{
+  this->object_reg = object_reg;
+   
+  g3d = csQueryRegistry<iGraphics3D> (object_reg);
+  
+  strings = csQueryRegistryTagInterface<iStringSet> (object_reg,
+  "crystalspace.shared.stringset");
+    
+  return true;
+}
+
+}
+CS_PLUGIN_NAMESPACE_END(ImprovedTerrain)

Added: CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.h
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.h	                        (rev 0)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/renderers/simple/simplerenderer.h	2006-07-29 12:40:18 UTC (rev 24994)
@@ -0,0 +1,99 @@
+/*
+    Copyright (C) 2006 by Kapoulkine Arseny
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __CS_TERRAIN_SIMPLERENDERER_H__
+#define __CS_TERRAIN_SIMPLERENDERER_H__
+
+#include "csutil/scf_implementation.h"
+
+#include "iterrain/terrainrenderer.h"
+#include "iterrain/terraincellrenderproperties.h"
+
+#include "cstool/rendermeshholder.h"
+
+#include "csutil/dirtyaccessarray.h"
+
+#include "iutil/comp.h"
+
+#include "ivideo/graph3d.h"
+
+#include "iutil/strset.h"
+
+CS_PLUGIN_NAMESPACE_BEGIN(ImprovedTerrain)
+{
+
+class csTerrainSimpleCellRenderProperties :
+  public scfImplementation1<csTerrainSimpleCellRenderProperties,
+                          iTerrainCellRenderProperties>
+{
+private:
+  bool visible;
+
+public:
+  csTerrainSimpleCellRenderProperties (iBase* parent);
+
+  virtual ~csTerrainSimpleCellRenderProperties ();
+
+  virtual bool GetVisible () const;
+  virtual void SetVisible (bool value);
+};
+
+class csTerrainSimpleRenderer :
+  public scfImplementation2<csTerrainSimpleRenderer,
+                            iTerrainRenderer,
+                            iComponent>
+{
+  csDirtyAccessArray<csRenderMesh*> meshes;
+  
+  csRenderMeshHolder rm_holder;
+
+  csRefArray<iMaterialWrapper> material_palette;
+
+  iObjectRegistry* object_reg;
+
+  csRef<iGraphics3D> g3d;
+  csRef<iStringSet> strings;
+public:
+  csTerrainSimpleRenderer (iBase* parent);
+
+  virtual ~csTerrainSimpleRenderer ();
+
+  // ------------ iTerrainRenderer implementation ------------
+
+  virtual csPtr<iTerrainCellRenderProperties> CreateProperties ();
+
+  virtual csRenderMesh** GetRenderMeshes (int& n, iRenderView* rview,
+                                   iMovable* movable, uint32 frustum_mask,
+                                   iTerrainCell** cells, int cell_count);
+
+  virtual void OnMaterialPaletteUpdate (const csRefArray<iMaterialWrapper>&
+                                        material_palette);
+  virtual void OnHeightUpdate (iTerrainCell* cell, const csRect& rectangle,
+                               const float* data, unsigned int pitch);
+  virtual void OnMaterialMaskUpdate (iTerrainCell* cell, unsigned int material,
+                               const csRect& rectangle, const unsigned char*
+                               data, unsigned int pitch);
+  
+  // ------------ iComponent implementation ------------
+  virtual bool Initialize (iObjectRegistry* object_reg);
+};
+
+}
+CS_PLUGIN_NAMESPACE_END(ImprovedTerrain)
+
+#endif // __CS_TERRAIN_SIMPLERENDERER_H__

Modified: CS/branches/soc/terrain/plugins/mesh/terrain/improved/simplerenderer.cpp
===================================================================
--- CS/branches/soc/terrain/plugins/mesh/terrain/improved/simplerenderer.cpp	2006-07-29 03:06:37 UTC (rev 24993)
+++ CS/branches/soc/terrain/plugins/mesh/terrain/improved/simplerenderer.cpp	2006-07-29 12:40:18 UTC (rev 24994)
@@ -42,26 +42,770 @@
 
 #include "cstool/rbuflock.h"
 
+#include <windows.h>
+
 CS_PLUGIN_NAMESPACE_BEGIN(ImprovedTerrain)
 {
 
 SCF_IMPLEMENT_FACTORY (csTerrainSimpleRenderer)
 
+struct csSimpleTerrainRenderData;
+
+/**
+ * This is one block in the terrain.
+ */
+class csTerrBlock : public csRefCount
+{
+public:
+  CS_LEAKGUARD_DECLARE (csTerrBlock);
+
+  csRef<iRenderBuffer> mesh_vertices;
+  csRef<iRenderBuffer> mesh_texcoords;
+  csRef<iRenderBuffer> mesh_heights;
+  csRef<csRenderBufferHolder> bufferHolder;
+
+  csVector2 center;
+  csVector2 size;
+  int res;
+
+  // for this kind of grid:
+  // . _ .
+  // _ _ _
+  // . _ .
+  // left = top = 0, right = bottom = 2,
+  // step = 2
+  int left, top, right, bottom;
+  int step;
+
+  bool built;
+
+  csSimpleTerrainRenderData *rdata;
+
+  //          0
+  //      ---------
+  //      | 0 | 1 |
+  //    2 |-------| 1
+  //      | 2 | 3 |
+  //      ---------
+  //          3
+
+  csTerrBlock* parent;
+  csRef<csTerrBlock> children[4];
+  csTerrBlock* neighbours[4];
+  int child;
+
+  static int tris;
+
+  csBox3 bbox;
+
+public:
+
+  csTerrBlock (csSimpleTerrainRenderData *data);
+  ~csTerrBlock ();
+
+  /// Load data from Former
+  void LoadData ();
+
+  /// Generate mesh
+  void SetupMesh ();
+
+  /// Detach the node from the tree
+  void Detach ();
+
+  /// Split block in 4 children
+  void Split ();
+
+  /// Merge block
+  void Merge ();
+
+  /// Checks if something needs to be merged or split
+  void CalcLOD ();
+
+  /// Returns true if this node is a leaf
+  bool IsLeaf ()  const
+  { return children[0] == 0; }
+
+  void DrawTest (iGraphics3D* g3d, iRenderView *rview, uint32 frustum_mask,
+                 csReversibleTransform &transform, iMovable *movable,
+                 csDirtyAccessArray<csRenderMesh*>& meshes);
+
+  bool detach;
+};
+
+static void FillEdge (bool halfres, int res, uint16* indices, int &indexcount,
+               int offs, int add)
+{
+  if (!halfres) return;
+  
+  int x;
+  // This triangulation scheme could probably be better.
+  for (x=0; x<res; x+=2)
+  {
+    // 
+    // a - c - e - g - i
+    //   b   d   f   h
+    // ok, having 2 triangles for each crease is not cool
+    // though without that I doubt that it's possible to
+    // make correct orientation. Is it?
+    indices[indexcount++] = offs + x * add;
+    indices[indexcount++] = offs + (x+1) * add;
+    indices[indexcount++] = offs + (x+2) * add;
+    indices[indexcount++] = offs + x * add;
+    indices[indexcount++] = offs + (x+2) * add;
+    indices[indexcount++] = offs + (x+1) * add;
+  }
+}
+/*static void FillEdge (bool halfres, int res, uint16* indices, int &indexcount,
+               int offs, int xadd, int zadd)
+{
+  int x;
+  // This triangulation scheme could probably be better.
+  for (x=0; x<res; x+=2)
+  {
+    // 
+    // a   c   e   g   i
+    //   b   d   f   h
+    if (x>0)
+    {
+      indices[indexcount++] = offs+x*xadd+zadd;
+      indices[indexcount++] = offs+x*xadd;
+    }
+    else
+    {
+      indices[indexcount++] = offs+x*xadd;
+      indices[indexcount++] = offs+x*xadd;
+      indices[indexcount++] = offs+x*xadd;
+    }
+
+    indices[indexcount++] = offs+(x+1)*xadd+zadd;
+    if (!halfres)
+      indices[indexcount++] = offs+(x+1)*xadd;
+    else
+      indices[indexcount++] = offs+x*xadd;
+
+    if (x<res-2)
+    {
+      indices[indexcount++] = offs+(x+2)*xadd+zadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+    }
+    else
+    {
+      indices[indexcount++] = offs+(x+2)*xadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+      indices[indexcount++] = offs+(x+2)*xadd;
+    }
+  }
+}*/
+
 struct csSimpleTerrainRenderData: public csRefCount
 {
-  csRef<csRenderBuffer> vb_pos;
-  csRef<csRenderBuffer> vb_texcoord;
-  csRef<csRenderBuffer> ib;
+  csRef<csTerrBlock> rootblock;
 
   csRef<iMaterialWrapper> material;
   
+  csRenderMeshHolder* rm_holder;
+
+  csPlane3* planes;
+
+  csRefArray<iMaterialWrapper>* material_palette;
   csArray<csRef<csShaderVariableContext> > sv_context;
   
   csArray<csRef<iTextureHandle> > alpha_map;
 
   unsigned int primitive_count;
+
+  int block_res, block_minsize;
+  float lod_lcoeff;
+
+  csRef<iRenderBuffer> mesh_indices[16];
+  int numindices[16];
+  
+  csReversibleTransform tr_o2c;
+
+  bool initialized;
+
+  iTerrainCell* cell;
+
+  csSimpleTerrainRenderData(iTerrainCell* cell)
+  {
+    this->cell = cell;
+
+    initialized = false;
+
+//        <lodvalue name="block resolution">16</lodvalue>
+    block_res = 16;
+
+//        <lodvalue name="minimum block size">32</lodvalue>
+    block_minsize = 32;
+    
+    lod_lcoeff = 16;
+
+//    <variable name="LodM" value="-0.00666667" />
+//    <variable name="LodA" value="1.33333" />
+//        <lodvalue name="splatting distance">200</lodvalue>
+//        <lodvalue name="block split distance">8</lodvalue>
+//        <lodvalue name="cd resolution">256</lodvalue>
+  }
+
+  void SetupObject(iGraphics3D* g3d)
+  {
+    if (!initialized)
+    {
+      initialized = true;
+  
+      for (int t=0; t<=1; t++)
+      {
+        for (int r=0; r<=1; r++)
+        {
+          for (int l=0; l<=1; l++)
+          {
+            for (int b=0; b<=1; b++)
+            {
+              int idx = t+(r<<1)+(l<<2)+(b<<3);
+              mesh_indices[idx] = 
+  	      csRenderBuffer::CreateIndexRenderBuffer (
+                (block_res*block_res*2 + 4*block_res)*3, 
+                CS_BUF_STATIC, CS_BUFCOMP_UNSIGNED_SHORT,
+                0, (block_res+1) * (block_res+1) - 1);
+              uint16 *indices = 
+                (uint16*)mesh_indices[idx]->Lock (CS_BUF_LOCK_NORMAL);
+  
+              numindices[idx] = 0;
+              int x, z;
+/*              for (z=1; z<(block_res-1); z++)
+              {
+                indices[numindices[idx]++] = 1+z*(block_res+1);
+                indices[numindices[idx]++] = 1+z*(block_res+1);
+                for (x=1; x<(block_res); x++)
+                { 
+                  indices[numindices[idx]++] = x+(z+0)*(block_res+1);
+                  indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                }
+                indices[numindices[idx]++] = x-1+(z+1)*(block_res+1);
+                indices[numindices[idx]++] = x-1+(z+1)*(block_res+1);
+              }*/
+              for (z=0; z<block_res; z++)
+              {
+                  for (x=0; x<block_res; x++)
+                  { 
+                      indices[numindices[idx]++] = x+(z+0)*(block_res+1);
+                      indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                      indices[numindices[idx]++] = x+1+(z+0)*(block_res+1);
+                      
+                      indices[numindices[idx]++] = x+1+(z+0)*(block_res+1);
+                      indices[numindices[idx]++] = x+(z+1)*(block_res+1);
+                      indices[numindices[idx]++] = x+1+(z+1)*(block_res+1);
+                  }
+              }
+  
+              /*FillEdge (t==1,
+                block_res, indices, numindices[idx], 
+                0, 1, (block_res+1));
+  
+              FillEdge (r==1,
+                block_res, indices, numindices[idx],
+                block_res, (block_res+1), -1);
+
+              FillEdge (l==1,
+                block_res, indices, numindices[idx], 
+               block_res*(block_res+1), -(block_res+1), 1);
+
+              FillEdge (b==1, 
+                block_res, indices, numindices[idx],
+                block_res*(block_res+1)+block_res, -1, -(block_res+1));*/
+                
+              FillEdge (t==1,
+                  block_res, indices, numindices[idx], 
+                  0, 1);
+
+              FillEdge (r==1,
+                  block_res, indices, numindices[idx],
+                  block_res, block_res + 1);
+
+              FillEdge (l==1,
+                  block_res, indices, numindices[idx], 
+                  0, block_res + 1);
+
+              FillEdge (b==1, 
+                  block_res, indices, numindices[idx],
+                  block_res*(block_res+1), 1);
+
+              mesh_indices[idx]->Release ();
+            }
+          }
+        }
+      }
+
+      rootblock.AttachNew (new csTerrBlock (this));
+      csVector2 center = cell->GetPosition () + csVector2 (cell->GetSize ().x,
+        cell->GetSize ().y)/2;
+      rootblock->center = center;
+      rootblock->size = csVector2(cell->GetSize ().x, cell->GetSize ().y);
+      
+      rootblock->left = rootblock->top = 0;
+      rootblock->right = cell->GetGridWidth () - 1;
+      rootblock->bottom = cell->GetGridHeight () - 1;
+
+      // so, we're going to take block_res steps of size step to reach 
+      // from left to right, that is
+      // left + step * block_res = right
+      // beware! block_res and right should be 2^n !
+      rootblock->step = rootblock->right / block_res;
+
+      rootblock->SetupMesh ();
+    }
+  }
 };
 
+csTerrBlock::csTerrBlock (csSimpleTerrainRenderData* data)
+{
+  parent = 0;
+  child = 0;
+  children[0] = children[1] = children[2] = children[3] = 0;
+  neighbours[0] =  neighbours[1] = neighbours[2] = neighbours[3] = 0;
+
+  built = false;
+
+  bufferHolder.AttachNew (new csRenderBufferHolder);
+
+  detach = false;
+
+  rdata = data;
+}
+
+csTerrBlock::~csTerrBlock ()
+{
+}
+
+void csTerrBlock::Detach ()
+{
+  detach = true;
+
+  if (!IsLeaf ())
+  {
+    children[0]->Detach ();
+    children[1]->Detach ();
+    children[2]->Detach ();
+    children[3]->Detach ();
+    children[0] = children[1] = children[2] = children[3] = 0;
+  }
+
+  if (parent)
+  {
+    if (neighbours[0])
+    {
+      if (child == 0 || child == 1)
+      {
+        neighbours[0]->neighbours[3] = parent;
+      }
+    }
+    if (neighbours[1])
+    {
+      if (child == 1 || child == 3)
+      {
+        neighbours[1]->neighbours[2] = parent;
+      }
+    }
+    if (neighbours[2])
+    {
+      if (child == 0 || child == 2)
+      {
+        neighbours[2]->neighbours[1] = parent;
+      }
+    }
+    if (neighbours[3])
+    {
+      if (child == 2 || child == 3)
+      {
+        neighbours[3]->neighbours[0] = parent;
+      }
+    }
+  }
+}
+
+void csTerrBlock::LoadData ()
+{
+  res = rdata->block_res + 1;
+
+  mesh_vertices = 
+      csRenderBuffer::CreateRenderBuffer (
+      res*res, CS_BUF_STATIC, CS_BUFCOMP_FLOAT,
+      3);
+
+  mesh_texcoords = 
+      csRenderBuffer::CreateRenderBuffer (res*res,
+      CS_BUF_STATIC, CS_BUFCOMP_FLOAT,
+      2);
+
+  bufferHolder->SetRenderBuffer (CS_BUFFER_POSITION, mesh_vertices);
+  bufferHolder->SetRenderBuffer (CS_BUFFER_TEXCOORD0, mesh_texcoords);
+  
+  const csVector2& pos = rdata->cell->GetPosition();
+  const csVector3& cell_size = rdata->cell->GetSize();
+  
+  csLockedHeightData data = rdata->cell->GetHeightData ();
+  
+  if (!built)
+    bbox.Empty();
+  
+  {
+    csRenderBufferLock<csVector3> vertex_data(mesh_vertices);
+    
+    unsigned int index = 0;
+
+    float min_x = center.x - size.x/2;
+    float max_x = center.x + size.x/2;
+
+    float min_z = center.y - size.y/2;
+    float max_z = center.y + size.y/2;
+
+    float x_offset = (max_x - min_x) / (float)(res - 1);
+    float z_offset = (max_z - min_z) / (float)(res - 1);
+
+    float c_z = min_z;
+    
+    float min_height = 1e+20f;
+    float max_height = -1e+20f;
+    
+    for (int y = 0, grid_y = top; y < res; ++y, grid_y += step)
+    {
+      float c_x = min_x;
+      float* row = data.data + data.pitch * grid_y;
+      
+      for (int x = 0, grid_x = left; x < res; ++x, grid_x += step)
+      {
+        float height = row[grid_x];
+        
+        vertex_data[index] = csVector3(c_x, height, c_z);
+        
+        if (min_height > height) min_height = height;
+        if (max_height < height) max_height = height;
+        
+        c_x += x_offset;
+        
+        ++index;
+      }
+      
+      c_z += z_offset;
+    }
+    
+    if (!built)
+    {
+      bbox.Set(min_x, min_height, min_z,
+               max_x, max_height, max_z);
+    }
+  }  
+  
+  {
+    csRenderBufferLock<csVector2> texcoord_data(mesh_texcoords);
+    
+    unsigned int index = 0;
+    
+    float min_u = (center.x - size.x/2 - pos.x) / cell_size.x;
+    float max_u = (center.x + size.x/2 - pos.x) / cell_size.x;
+    
+    float min_v = (center.y - size.y/2 - pos.y) / cell_size.y;
+    float max_v = (center.y + size.y/2 - pos.y) / cell_size.y;
+    
+    float u_offset = (max_u - min_u) / (float)(res - 1);
+    float v_offset = (max_v - min_v) / (float)(res - 1);
+    
+    float v = min_v;
+
+    for (int y = 0; y < res; ++y)
+    {
+      float u = min_u;
+      
+      for (int x = 0; x < res; ++x)
+      {
+        texcoord_data[index].x = u;
+        texcoord_data[index].y = v;
+      
+        u += u_offset;
+        
+        ++index;
+      }
+      
+      v += v_offset;
+    }
+  }
+}
+
+void csTerrBlock::SetupMesh ()
+{
+  
+  //@@@ have a method to set this from world
+  res = rdata->block_res + 1;
+  
+  LoadData ();
+  
+  built = true;
+}
+
+void csTerrBlock::Split ()
+{
+  int i;
+  for (i=0; i<4; i++)
+  {
+    if (neighbours[i] && neighbours[i]->step>step && neighbours[i]->IsLeaf ())
+      neighbours[i]->Split ();
+  }
+
+  int half_right = left + (right - left) / 2;
+  int half_bottom = top + (bottom - top) / 2;
+
+  children[0].AttachNew (new csTerrBlock (rdata));
+  children[0]->parent = this;
+  children[0]->size = size/2.0;
+  children[0]->center = center + csVector2 (-size.x/4.0, -size.y/4.0);
+  children[0]->child = 0;
+  children[0]->step = step / 2;
+  children[0]->left = left;
+  children[0]->right = half_right;
+  children[0]->top = top;
+  children[0]->bottom = half_bottom;
+
+  children[1].AttachNew (new csTerrBlock (rdata));
+  children[1]->parent = this;
+  children[1]->size = size/2.0;
+  children[1]->center = center + csVector2 ( size.x/4.0, -size.y/4.0);
+  children[1]->child = 1;
+  children[1]->step = step / 2;
+  children[1]->left = half_right;
+  children[1]->right = right;
+  children[1]->top = top;
+  children[1]->bottom = half_bottom;
+
+  children[2].AttachNew (new csTerrBlock (rdata));
+  children[2]->parent = this;
+  children[2]->size = size/2.0;
+  children[2]->center = center + csVector2 (-size.x/4.0, size.y/4.0);
+  children[2]->child = 2;
+  children[2]->step = step / 2;
+  children[2]->left = left;
+  children[2]->right = half_right;
+  children[2]->top = half_bottom;
+  children[2]->bottom = bottom;
+
+  children[3].AttachNew (new csTerrBlock (rdata));
+  children[3]->parent = this;
+  children[3]->size = size/2.0;
+  children[3]->center = center + csVector2 ( size.x/4.0, size.y/4.0);
+  children[3]->child = 3;
+  children[3]->step = step / 2;
+  children[3]->left = half_right;
+  children[3]->right = right;
+  children[3]->top = half_bottom;
+  children[3]->bottom = bottom;
+
+  if (neighbours[0])
+    if (!neighbours[0]->IsLeaf ())
+    {
+      children[0]->neighbours[0] = neighbours[0]->children[2];
+      children[1]->neighbours[0] = neighbours[0]->children[3];
+      children[0]->neighbours[0]->neighbours[3] = children[0];
+      children[1]->neighbours[0]->neighbours[3] = children[1];
+    }
+    else
+    {
+      children[0]->neighbours[0] = neighbours[0];
+      children[1]->neighbours[0] = neighbours[0];
+      neighbours[0]->neighbours[3] = this;
+    }
+  if (neighbours[1])
+    if (!neighbours[1]->IsLeaf ())
+    {
+      children[1]->neighbours[1] = neighbours[1]->children[0];
+      children[3]->neighbours[1] = neighbours[1]->children[2];
+      children[1]->neighbours[1]->neighbours[2] = children[1];
+      children[3]->neighbours[1]->neighbours[2] = children[3];
+    }
+    else
+    {
+      children[1]->neighbours[1] = neighbours[1];
+      children[3]->neighbours[1] = neighbours[1];
+      neighbours[1]->neighbours[2] = this;
+    }
+  if (neighbours[2])
+    if (!neighbours[2]->IsLeaf ())
+    {
+      children[0]->neighbours[2] = neighbours[2]->children[1];
+      children[2]->neighbours[2] = neighbours[2]->children[3];
+      children[0]->neighbours[2]->neighbours[1] = children[0];
+      children[2]->neighbours[2]->neighbours[1] = children[2];
+    }
+    else
+    {
+      children[0]->neighbours[2] = neighbours[2];
+      children[2]->neighbours[2] = neighbours[2];
+      neighbours[2]->neighbours[1] = this;
+    }
+  if (neighbours[3])
+    if (!neighbours[3]->IsLeaf ())
+    {
+      children[2]->neighbours[3] = neighbours[3]->children[0];
+      children[3]->neighbours[3] = neighbours[3]->children[1];
+      children[2]->neighbours[3]->neighbours[0] = children[2];
+      children[3]->neighbours[3]->neighbours[0] = children[3];
+    }
+    else
+    {
+      children[2]->neighbours[3] = neighbours[3];
+      children[3]->neighbours[3] = neighbours[3];
+      neighbours[3]->neighbours[0] = this;
+    }
+  children[0]->neighbours[1] = children[1];
+  children[0]->neighbours[3] = children[2];
+
+  children[1]->neighbours[2] = children[0];
+  children[1]->neighbours[3] = children[3];
+
+  children[2]->neighbours[0] = children[0];
+  children[2]->neighbours[1] = children[3];
+
+  children[3]->neighbours[0] = children[1];
+  children[3]->neighbours[2] = children[2];
+
+  children[0]->SetupMesh ();
+  children[1]->SetupMesh ();
+  children[2]->SetupMesh ();
+  children[3]->SetupMesh ();
+}
+
+void csTerrBlock::Merge ()
+{
+  if (IsLeaf ())
+    return;
+  if (neighbours[0] && (!neighbours[0]->IsLeaf () && 
+                       (!neighbours[0]->children[2]->IsLeaf () ||
+                        !neighbours[0]->children[3]->IsLeaf ())))
+      return;
+  if (neighbours[1] && (!neighbours[1]->IsLeaf () && 
+                       (!neighbours[1]->children[0]->IsLeaf () ||
+                        !neighbours[1]->children[2]->IsLeaf ())))
+    return;
+  if (neighbours[2] && (!neighbours[2]->IsLeaf () && 
+                       (!neighbours[2]->children[1]->IsLeaf () ||
+                        !neighbours[2]->children[3]->IsLeaf ())))
+    return;
+  if (neighbours[3] && (!neighbours[3]->IsLeaf () && 
+                       (!neighbours[3]->children[0]->IsLeaf () ||
+                        !neighbours[3]->children[1]->IsLeaf ())))
+    return;
+
+  children[0]->Detach ();
+  children[1]->Detach ();
+  children[2]->Detach ();
+  children[3]->Detach ();
+  children[0] = children[1] = children[2] = children[3] = 0;
+}
+
+void csTerrBlock::CalcLOD ()
+{
+  int res = rdata->block_res;
+
+  csVector3 cam = rdata->tr_o2c.GetOrigin ();
+  csBox3 cambox (bbox.Min ()-cam, bbox.Max ()-cam);
+  /*csVector3 radii = (bbox.Max ()-bbox.Min ())*0.5;
+  radii *= (1.0/res)*terr->lod_lcoeff;
+  float maxradius = MAX(MAX(radii.x, radii.y), radii.z);
+  cam.x *= maxradius/radii.x;
+  cam.y *= maxradius/radii.y;
+  cam.z *= maxradius/radii.z;
+  radii.x = radii.x;
+  if (cam.SquaredNorm ()<maxradius*maxradius &&
+      size > terr->block_minsize)*/
+  
+  float size = MAX(this->size.x, this->size.y);
+      
+  float splitdist = size*rdata->lod_lcoeff / float (res);
+  
+  if (GetAsyncKeyState(VK_F2) >= 0) return;
+  
+  if (cambox.SquaredOriginDist()<splitdist*splitdist &&
+    step > 1)
+  {
+    if (IsLeaf ())
+      Split ();
+  }
+  else
+  {
+    if (!IsLeaf ())
+      Merge ();
+  }
+  if (!IsLeaf ())
+    for (int i=0; i<4; i++)
+      children[i]->CalcLOD ();
+}
+
+void csTerrBlock::DrawTest (iGraphics3D* g3d,
+			    iRenderView *rview, uint32 frustum_mask,
+                            csReversibleTransform &transform,
+                            iMovable *movable,
+        csDirtyAccessArray<csRenderMesh*>& meshes)
+{
+  if (!IsLeaf () && children[0]->built &&
+                    children[1]->built &&
+                    children[2]->built &&
+                    children[3]->built)
+  {
+    children[0]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[1]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[2]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    children[3]->DrawTest (g3d, rview, frustum_mask, transform, movable, meshes);
+    return;
+  }
+
+  if (!built)
+    return;
+
+  int res = rdata->block_res;
+
+  //csVector3 cam = rview->GetCamera ()->GetTransform ().GetOrigin ();
+  csVector3 cam = transform.GetOrigin ();
+
+  int clip_portal, clip_plane, clip_z_plane;
+  if (!rview->ClipBBox (rdata->planes, frustum_mask,
+      bbox, clip_portal, clip_plane, clip_z_plane))
+    return;
+
+  int idx = ((!neighbours[0] || neighbours[0]->step>step)?1:0)+
+            (((!neighbours[1] || neighbours[1]->step>step)?1:0)<<1)+
+            (((neighbours[2] && neighbours[2]->step>step)?1:0)<<2)+
+            (((neighbours[3] && neighbours[3]->step>step)?1:0)<<3);
+            
+  bufferHolder->SetRenderBuffer (CS_BUFFER_INDEX, rdata->mesh_indices[idx]);
+  
+  const csReversibleTransform o2wt = movable->GetFullTransform ();
+  const csVector3& wo = o2wt.GetOrigin ();
+  bool isMirrored = rview->GetCamera()->IsMirrored();
+
+  for (unsigned int j = 0; j < rdata->material_palette->GetSize (); ++j)
+  {
+    bool created;
+    
+    csRenderMesh*& mesh = rdata->rm_holder->GetUnusedMesh (created,
+                                       rview->GetCurrentFrameNumber ());
+    
+    mesh->meshtype = CS_MESHTYPE_TRIANGLES;
+    
+    mesh->buffers = bufferHolder;
+    mesh->clip_portal = clip_portal;
+    mesh->clip_plane = clip_plane;
+    mesh->clip_z_plane = clip_z_plane;
+    mesh->indexstart = 0;
+    mesh->indexend = rdata->numindices[idx];
+    mesh->material = rdata->material_palette->Get (j);
+    mesh->variablecontext = rdata->sv_context[j];
+
+    mesh->object2world = o2wt;
+    mesh->worldspace_origin = wo;
+    mesh->do_mirror = isMirrored;
+      
+    meshes.Push (mesh);
+  }
+}
+
 csTerrainSimpleCellRenderProperties::csTerrainSimpleCellRenderProperties
   (iBase* parent)
   : scfImplementationType (this, parent)
@@ -109,43 +853,30 @@
   const csReversibleTransform& o2wt = movable->GetFullTransform ();
   const csVector3& wo = o2wt.GetOrigin ();
   
+  iCamera* cam = rview->GetCamera ();
+  csReversibleTransform tr_o2c = cam->GetTransform ();
+  if (!movable->IsFullTransformIdentity ())
+      tr_o2c /= movable->GetFullTransform ();
+
+  csPlane3 planes[10];
+  rview->SetupClipPlanes (tr_o2c, planes, frustum_mask);
+
   for (int i = 0; i < cell_count; ++i)
   {
     csSimpleTerrainRenderData* rdata = (csSimpleTerrainRenderData*)
                                            cells[i]->GetRenderData ();
 
     if (!rdata) continue;
+    
+    rdata->material_palette = &material_palette;
+    rdata->rm_holder = &rm_holder;
+    rdata->planes = planes;
 
-    for (unsigned int j = 0; j < material_palette.GetSize (); ++j)
-    {
-      bool created;
+	rdata->rootblock->CalcLOD ();
     
-      csRenderMesh*& mesh = rm_holder.GetUnusedMesh (created,
-                                         rview->GetCurrentFrameNumber ());
+    rdata->tr_o2c = tr_o2c;
 
-    
-      mesh->meshtype = CS_MESHTYPE_TRIANGLES;
-    
-      mesh->material = material_palette[j];
-      
-      mesh->indexstart = 0;
-      mesh->indexend = rdata->primitive_count * 3;
-    
-      mesh->do_mirror = do_mirroring;
-    
-      mesh->variablecontext = rdata->sv_context[j];
-    
-      mesh->object2world = o2wt;
-      mesh->worldspace_origin = wo;
-      
-      if (created) mesh->buffers.AttachNew (new csRenderBufferHolder);
-    
-      mesh->buffers->SetRenderBuffer (CS_BUFFER_POSITION, rdata->vb_pos);
-      mesh->buffers->SetRenderBuffer (CS_BUFFER_TEXCOORD0, rdata->vb_texcoord);
-      mesh->buffers->SetRenderBuffer (CS_BUFFER_INDEX, rdata->ib);
-      
-      meshes.Push (mesh);
-    }
+    rdata->rootblock->DrawTest (g3d, rview, 0, tr_o2c, movable, meshes);
   }
   
   n = (int)meshes.GetSize ();
@@ -173,85 +904,12 @@
 
   if (!rdata)
   {
-    rdata.AttachNew (new csSimpleTerrainRenderData);
+    rdata.AttachNew (new csSimpleTerrainRenderData(cell));
 
     cell->SetRenderData (rdata);
 
-    rdata->primitive_count = (grid_width-1)*(grid_height-1)*2;
-
-    rdata->vb_pos = csRenderBuffer::CreateRenderBuffer (
-    grid_width * grid_height, CS_BUF_STATIC, CS_BUFCOMP_FLOAT, 3);
-    
-    rdata->vb_texcoord = csRenderBuffer::CreateRenderBuffer (
-    grid_width * grid_height, CS_BUF_STATIC, CS_BUFCOMP_FLOAT, 2);
-
-    rdata->ib = csRenderBuffer::CreateIndexRenderBuffer (
-    rdata->primitive_count*3, CS_BUF_STATIC, CS_BUFCOMP_UNSIGNED_INT, 0,
-    grid_width * grid_height);
-
-    // fill ib
-    csRenderBufferLock<unsigned int> ilocker(rdata->ib);
-    unsigned int* iptr = ilocker;
-
-    for (int y = 0; y < grid_height - 1; ++y)
-      for (int x = 0; x < grid_width - 1; ++x)
-      {
-        // tl - tr
-        //  | / |
-        // bl - br
-
-        int tl = y * grid_width + x;
-        int tr = y * grid_width + x + 1;
-        int bl = (y + 1) * grid_width + x;
-        int br = (y + 1) * grid_width + x + 1;
-
-        *iptr++ = tl;
-        *iptr++ = bl;
-        *iptr++ = tr;
-
-        *iptr++ = tr;
-        *iptr++ = bl;
-        *iptr++ = br;
-      }
-
-    rdata->ib->Release ();
-
-    // fill tex coords
-    csRenderBufferLock<float> vlocker(rdata->vb_texcoord);
-    float* vptr = vlocker;
-
-    float u_offset = 1.0f / (grid_width - 1);
-    float v_offset = 1.0f / (grid_height - 1);
-    
-    float u_correct = 0.5f / mm_width;
-    float v_correct = 0.5f / mm_height;
-    
-    for (int y = 0; y < grid_height; ++y)
-      for (int x = 0; x < grid_width; ++x)
-      {
-        *vptr++ = x * u_offset + u_correct;
-        *vptr++ = y * v_offset + v_correct;
-      }
-
-    rdata->vb_texcoord->Release();
+    rdata->SetupObject(g3d);
   }
-
-  csRenderBufferLock<float> vlocker(rdata->vb_pos);
-  float* vptr = vlocker;
-
-  float offset_x = cell->GetPosition ().x;
-  float offset_y = cell->GetPosition ().y;
-
-  float scale_x = cell->GetSize ().x / (grid_width - 1);
-  float scale_y = cell->GetSize ().y / (grid_height - 1);
-
-   for (int y = rectangle.ymin; y < rectangle.ymax; ++y)
-     for (int x = rectangle.xmin; x < rectangle.xmax; ++x)
-     {
-       *vptr++ = x * scale_x + offset_x;
-       *vptr++ = data[y * pitch + x];
-       *vptr++ = y * scale_y + offset_y;
-     }
 }
 
 void csTerrainSimpleRenderer::OnMaterialMaskUpdate (iTerrainCell* cell,
@@ -263,9 +921,11 @@
 
   if (!rdata)
   {
-    rdata.AttachNew (new csSimpleTerrainRenderData);
+    rdata.AttachNew (new csSimpleTerrainRenderData(cell));
 
     cell->SetRenderData (rdata);
+
+    rdata->SetupObject(g3d);
   }
 
   if (rdata->sv_context.GetSize () <= material)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Author: hakm
Date: 2006-07-29 10:45:56 +0200 (Sat, 29 Jul 2006)
New Revision: 288

Added:
   trunk/art/music/Sai`ke - Cold.ogg
Log:
- Added the ambient song Cold by Sai`ke.

Added: trunk/art/music/Sai`ke - Cold.ogg
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
(Binary files differ)


Property changes on: trunk/art/music/Sai`ke - Cold.ogg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Revision: 24993
Author:   res2002
Date:     2006-07-28 20:06:37 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24993&view=rev

Log Message:
-----------
Missing files

Added Paths:
-----------
    CS/trunk/data/shader/snippets/cg-common.cginc
    CS/trunk/data/shader/snippets/shaderframework-cg.inc
    CS/trunk/data/shader/snippets/shaderframework.inc
Added: CS/trunk/data/shader/snippets/cg-common.cginc
===================================================================
--- CS/trunk/data/shader/snippets/cg-common.cginc	                        (rev 0)
+++ CS/trunk/data/shader/snippets/cg-common.cginc	2006-07-29 03:06:37 UTC (rev 24993)
@@ -0,0 +1,59 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+	    (C) 2006 by Marten Svanfeldt
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include><![CDATA[
+
+#ifndef __CG_COMMON_CG_INC__
+#define __CG_COMMON_CG_INC__
+
+float2 ComputeParallaxOffset (sampler2D TexHeight, float2 OriginalCoord, 
+			      float3 EyeVec, float OffsetScale)
+{
+  // Sample height
+  float height = (tex2D (TexHeight, OriginalCoord).x - 0.5) * OffsetScale;
+      
+  // Compute offset
+  float2 offset = EyeVec.xy * height;
+    
+  return offset;
+}
+ 
+float3 IntersectSurface(sampler2D TexSurfaceHeight,
+			float2 StartPoint,
+			float3 RayDirection)
+{
+  // Start values
+  float3 I = float3 (StartPoint,0);
+  
+  float hScale = 0.25;
+  
+  // Step
+  for (float i = 0; i < 4; i += 1)
+  {
+    float height = tex2D (TexSurfaceHeight, I.xy).w * hScale;
+    float dh = height - I.z;
+    I += dh * RayDirection; 
+  }
+  
+  return I;
+}
+    
+#endif // __CG_COMMON_CG_INC__
+ 
+]]></include>

Added: CS/trunk/data/shader/snippets/shaderframework-cg.inc
===================================================================
--- CS/trunk/data/shader/snippets/shaderframework-cg.inc	                        (rev 0)
+++ CS/trunk/data/shader/snippets/shaderframework-cg.inc	2006-07-29 03:06:37 UTC (rev 24993)
@@ -0,0 +1,180 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+  <?SIfNDef __SHADERFRAMEWORK_CG_INC__ ?>
+  <?Define __SHADERFRAMEWORK_CG_INC__ ?>
+  
+  <?Include /shader/snippets/shaderframework.inc ?>
+  
+  <?CreateList CgAddV2F ?>
+  <?CreateList CgInitV2F_V ?>
+  <?CreateList CgInitV2F_F ?>
+  <?CreateList CgProgramPrepend?>
+
+  <?Template _CgShareBuffer TYPE SVAR CGNAME SEM ?>
+    <?Template _gen_pass_$CGNAME$?>
+      <?Template _pass_$CGNAME$ ?>
+	<buffer source="$SVAR$" destination="$CGNAME$" />
+      <?Endtemplate?>
+      <?AddToList PassMappings _pass_$CGNAME$ ?>
+    <?Endtemplate?>
+    <?Template _gen_varmap_$CGNAME$?>
+    <?Endtemplate?>
+    <?Template _prepend_buf_$CGNAME$?>
+      #ifndef __SHARED_BUFFER_$CGNAME$__
+      #define __SHARED_BUFFER_$CGNAME$__
+      <?ShareResource $CGNAME$ "$TYPE$ $CGNAME$ $SEM$;" _gen_pass_$CGNAME$ _gen_varmap_$CGNAME$?>
+      #endif
+    <?Endtemplate?>
+    <?AddToList CgProgramPrepend _prepend_buf_$CGNAME$ ?>
+  <?Endtemplate?>
+  
+  <?Template CgShareBuffer TYPE SVAR CGNAME ?>
+    <?_CgShareBuffer $TYPE$ $SVAR$ $CGNAME$ "" ?>
+  <?Endtemplate?>
+  <?Template CgShareBufferSem TYPE SVAR CGNAME SEM ?>
+    <?_CgShareBuffer $TYPE$ $SVAR$ $CGNAME$ ": $SEM$" ?>
+  <?Endtemplate?>
+  
+  <?Template _CgShareV2F TYPE CGNAME COND?>
+    <?Template _v2f_$CGNAME$?>
+      <?if $COND$?>
+      #ifndef _resshared_cgv2f_$CGNAME$
+      #define _resshared_cgv2f_$CGNAME$
+      $TYPE$ local_$CGNAME$;
+      #endif
+      <?endif?>
+    <?Endtemplate?>
+    <?AddToList CgAddV2F _v2f_$CGNAME$ ?>
+    
+    <?Template _v2f_$CGNAME$_init_v?>
+      <?if $COND$?>
+      #ifndef _resshared_cgv2f_v_$CGNAME$
+      #define _resshared_cgv2f_v_$CGNAME$
+      local_$CGNAME$ = $CGNAME$;
+      #endif
+      <?endif?>
+    <?Endtemplate?>
+    <?AddToList CgInitV2F_V _v2f_$CGNAME$_init_v ?>
+    
+    <?Template _v2f_$CGNAME$_init_f?>
+      <?if $COND$?>
+      #ifndef _resshared_cgv2f_f_$CGNAME$
+      #define _resshared_cgv2f_f_$CGNAME$
+      $CGNAME$ = local_$CGNAME$;
+      #endif
+      <?endif?>
+    <?Endtemplate?>
+    <?AddToList CgInitV2F_F _v2f_$CGNAME$_init_f ?>
+  <?Endtemplate?>
+  <?Template CgShareV2F TYPE CGNAME ?>
+    <?_CgShareV2F "$TYPE$" "$CGNAME$" consts.true?>
+  <?Endtemplate?>
+  <?Template CgShareV2FCond TYPE CGNAME COND ?>
+    <?_CgShareV2F "$TYPE$" "$CGNAME$" "$COND$"?>
+  <?Endtemplate?>
+
+  <?Template CgSetVertexFunc FUNC ?>
+    <?Template WriteVertexProgram?>
+      <?Template CgProgram?>
+	struct VertToFrag_Framework 
+	{
+	  <?InsertList CgAddV2F?>
+	  
+	  void SetupVert ()
+	  {
+	    <?InsertList CgInitV2F_V?>
+	  }
+	  
+	  void SetupFrag ()
+	  {
+	    <?InsertList CgInitV2F_F?>
+	  }
+	};
+	<?CgProgram?>
+      <?Endtemplate?>
+      <vp plugin="glcg">
+	<cgvp>
+	  <entry>$FUNC$</entry>
+	  <?TemplateWeak CgVertexOptions?><?Endtemplate?>
+	  <?CgVertexOptions?>
+	  <program>
+	  <?InsertList CgProgramPrepend?>
+	  <?CgProgram?>
+	  </program>
+	  <?InsertList ProgramMappings?>
+	</cgvp>
+      </vp>
+    <?Endtemplate?>
+  <?Endtemplate?>
+  
+  <?Template CgSetFragmentFunc FUNC ?>
+    <?Template WriteFragmentProgram?>
+      <fp plugin="glcg">
+	<cgfp>
+	  <entry>$FUNC$</entry>
+	  <?TemplateWeak CgFragmentOptions?><?Endtemplate?>
+	  <?CgFragmentOptions?>
+	  <program>
+	  <?InsertList CgProgramPrepend?>
+	  <?CgProgram?>
+	  </program>
+	  <?InsertList ProgramMappings?>
+	</cgfp>
+      </fp>
+    <?Endtemplate?>
+  <?Endtemplate?>
+  
+  <?Template CgAddSnippet TEMPLATE?>
+    <?AddToList CgProgramPrepend $TEMPLATE$ ?>
+  <?Endtemplate?>
+  
+  <?Template CgAddSharedBufferSem FEATURE TYPE SVAR CGNAME SEM?>
+    <?Template _CgUseShared_$FEATURE$ COND?>
+      <?CgShareBufferSem "$TYPE$" "$SVAR$" $CGNAME$ $SEM$ ?>
+    <?Endtemplate?>
+  <?Endtemplate?>
+  
+  <?Template CgAddSharedBuffer FEATURE TYPE SVAR CGNAME?>
+    <?Template _CgUseShared_$FEATURE$ COND?>
+      <?CgShareBuffer "$TYPE$" "$SVAR$" $CGNAME$ ?>
+    <?Endtemplate?>
+  <?Endtemplate?>
+  
+  <?Template CgAddSharedV2F FEATURE TYPE CGNAME?>
+    <?Template _CgUseShared_$FEATURE$ COND?>
+      <?CgShareV2F $TYPE$ $CGNAME$ "$COND$"?>
+    <?Endtemplate?>
+  <?Endtemplate?>
+  
+  <?CgAddSharedBuffer texCoord "varying float2" "texture coordinate" texCoord?>
+  <?CgAddSharedV2F texCoordV2F float2 texCoord?>
+
+  <?CgAddSharedBufferSem primaryColor "varying float4" "primary color" primaryColor COLOR?>
+  <?CgAddSharedV2F primaryColorV2F float4 primaryColor ?>
+ 
+  <?Template CgUseShared FEATURE?>
+    <?_CgUseShared_$FEATURE$ consts.true?>
+  <?Endtemplate?>
+  <?Template CgUseSharedCond FEATURE COND?>
+    <?_CgUseShared_$FEATURE$ "$COND$"?>
+  <?Endtemplate?>
+  
+  <?SEndIf?>
+</include>

Added: CS/trunk/data/shader/snippets/shaderframework.inc
===================================================================
--- CS/trunk/data/shader/snippets/shaderframework.inc	                        (rev 0)
+++ CS/trunk/data/shader/snippets/shaderframework.inc	2006-07-29 03:06:37 UTC (rev 24993)
@@ -0,0 +1,65 @@
+<!--
+  Copyright (C) 2006 by Frank Richter
+	    (C) 2006 by Jorrit Tyberghein
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public
+  License as published by the Free Software Foundation; either
+  version 2 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with this library; if not, write to the Free
+  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<include>
+  <?SIfNDef __SHADERFRAMEWORK_INC__ ?>
+  <?Define __SHADERFRAMEWORK_INC__ ?>
+  
+  <?Include /shader/snippets/shadercond-tools.inc ?>
+  
+  <?Template BeginGlue component?>
+    <?SIfNDef _glue_$component$?>
+    <?Define _glue_$component$?>
+  <?Endtemplate?>
+  <?Template EndGlue?>
+    <?SEndIf?>
+  <?Endtemplate?>
+  
+  <?Template ShareResource NAME STATEMENT PASS VARIABLEMAP ?>
+    $STATEMENT$
+    <?SIfNDef _resshared_$NAME$?>
+      <?Define _resshared_$NAME$?>
+      <?BeginGlue _resshared_$NAME$?>
+	<?$PASS$?>
+	<?$VARIABLEMAP$?>
+      <?EndGlue?>
+    <?SEndIf?>
+  <?Endtemplate?>
+  
+  <?CreateList PassMappings ?>
+  <?CreateList ProgramMappings ?>
+  <?CreateList ShaderVars ?>
+  
+  <?Template WriteShaderTechniques PRIO?>
+    <technique priority="$PRIO$">
+      <pass>
+	<?TemplateWeak WriteVertexProgram?><?Endtemplate?>
+	<?WriteVertexProgram?>
+	<?TemplateWeak WriteFragmentProgram?><?Endtemplate?>
+	<?WriteFragmentProgram?>
+	<?InsertList PassMappings?>
+      </pass>
+    </technique>
+  <?Endtemplate?>
+  
+  <?Template WriteShaderVars?>
+    <shadervars><?InsertList ShaderVars?></shadervars>
+  <?Endtemplate?>
+
+  <?SEndIf?>
+</include>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24991
Author:   res2002
Date:     2006-07-28 19:14:33 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24991&view=rev

Log Message:
-----------
res updated the contained DejaVu fonts to version 2.8.

Modified Paths:
--------------
    CS/trunk/data/config/freetype.cfg
Modified: CS/trunk/data/config/freetype.cfg
===================================================================
--- CS/trunk/data/config/freetype.cfg	2006-07-29 02:07:00 UTC (rev 24990)
+++ CS/trunk/data/config/freetype.cfg	2006-07-29 02:14:33 UTC (rev 24991)
@@ -18,7 +18,7 @@
 ; The font set
 Freetype2.Settings.FontSet = Default
 
-Freetype2.Fonts.Default.*courier = /fonts/ttf/DejaVuSansMono-Roman.ttf
+Freetype2.Fonts.Default.*courier = /fonts/ttf/DejaVuSansMono.ttf
 Freetype2.Fonts.Default.*large = /fonts/ttf/DejaVuSans.ttf
 Freetype2.Fonts.Default.*italic = /fonts/ttf/DejaVuSans-Oblique.ttf
 Freetype2.Fonts.Default.*small= /fonts/ttf/DejaVuSans.ttf
@@ -28,12 +28,12 @@
 Freetype2.Fonts.Default.DejaVuSansBoldOblique = /fonts/ttf/DejaVuSans-BoldOblique.ttf
 Freetype2.Fonts.Default.DejaVuSansOblique = /fonts/ttf/DejaVuSans-Oblique.ttf
 
-Freetype2.Fonts.Default.DejaVuSansMono = /fonts/ttf/DejaVuSansMono-Roman.ttf
+Freetype2.Fonts.Default.DejaVuSansMono = /fonts/ttf/DejaVuSansMono.ttf
 Freetype2.Fonts.Default.DejaVuSansMonoBold = /fonts/ttf/DejaVuSansMono-Bold.ttf
 Freetype2.Fonts.Default.DejaVuSansMonoBoldOblique = /fonts/ttf/DejaVuSansMono-BoldOb.ttf
 Freetype2.Fonts.Default.DejaVuSansMonoOblique = /fonts/ttf/DejaVuSansMono-Oblique.ttf
 
-Freetype2.Fonts.Default.DejaVuSerif = /fonts/ttf/DejaVuSerif-Roman.ttf
+Freetype2.Fonts.Default.DejaVuSerif = /fonts/ttf/DejaVuSerif.ttf
 Freetype2.Fonts.Default.DejaVuSerifBold = /fonts/ttf/DejaVuSerif-Bold.ttf
 Freetype2.Fonts.Default.DejaVuSerifBoldOblique = /fonts/ttf/DejaVuSerif-BoldOblique.ttf
 Freetype2.Fonts.Default.DejaVuSerifOblique = /fonts/ttf/DejaVuSerif-Oblique.ttf


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24985
Author:   jorrit
Date:     2006-07-28 07:18:03 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24985&view=rev

Log Message:
-----------
	- Jorrit fixed a small bug in csMeshWrapper::GetRenderMeshes().
	  It forgot to initialize 'n' to 1 in case an imposter was
	  returned.

Modified Paths:
--------------
    CS/branches/soc/imposters/docs/branch_history.txt
    CS/branches/soc/imposters/plugins/engine/3d/meshobj.cpp
Modified: CS/branches/soc/imposters/docs/branch_history.txt
===================================================================
--- CS/branches/soc/imposters/docs/branch_history.txt	2006-07-28 13:05:59 UTC (rev 24984)
+++ CS/branches/soc/imposters/docs/branch_history.txt	2006-07-28 14:18:03 UTC (rev 24985)
@@ -8,6 +8,10 @@
 
 This file describes the history of the SoC imposter branch.
 
+28-Jul-2006
+	- Jorrit fixed a small bug in csMeshWrapper::GetRenderMeshes().
+	  It forgot to initialize 'n' to 1 in case an imposter was
+	  returned.
 26-Jul-2006
 	- Fossi finally got imposters to show up visually
 29-Jun-2006

Modified: CS/branches/soc/imposters/plugins/engine/3d/meshobj.cpp
===================================================================
--- CS/branches/soc/imposters/plugins/engine/3d/meshobj.cpp	2006-07-28 13:05:59 UTC (rev 24984)
+++ CS/branches/soc/imposters/plugins/engine/3d/meshobj.cpp	2006-07-28 14:18:03 UTC (rev 24985)
@@ -592,6 +592,7 @@
     if (imposter)
     {
       printf("drawn\n");
+      n = 1;
       return imposter;
     }
   }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24963
Author:   mdmkolbe
Date:     2006-07-25 12:53:40 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24963&view=rev

Log Message:
-----------
Added forgotten history log entry.

Modified Paths:
--------------
    CS/trunk/docs/history.txt
Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt	2006-07-25 15:27:51 UTC (rev 24962)
+++ CS/trunk/docs/history.txt	2006-07-25 19:53:40 UTC (rev 24963)
@@ -6,6 +6,13 @@
 individual changes for each given day, however, are in normal (ascending)
 chronological order.
 
+25-Jul-2006
+	- mdmkolbe converted the following plugins to the new SCF:
+	    - plugins/physics/loader/
+	    - plugins/culling/frustvis/
+	    - plugins/engine/3d/
+	    - plugins/engine/renderloop/
+	    - plugins/sequence/
 24-Jul-2006
 	- Jorrit documented the new -cfgfile and -cfgset commandline
 	  options and also added documentation for a few other commonly


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24974
Author:   jorrit
Date:     2006-07-27 04:11:13 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24974&view=rev

Log Message:
-----------
	- Jorrit renamed datacontrol.xml to screenmanager.xml.

Modified Paths:
--------------
    crystalcore/trunk/docs/history.txt
    crystalcore/trunk/src/application.cpp

Added Paths:
-----------
    crystalcore/trunk/data/entities/screenmanager.xml

Removed Paths:
-------------
    crystalcore/trunk/data/entities/gamecontrol.xml
Deleted: crystalcore/trunk/data/entities/gamecontrol.xml
===================================================================
--- crystalcore/trunk/data/entities/gamecontrol.xml	2006-07-27 07:51:41 UTC (rev 24973)
+++ crystalcore/trunk/data/entities/gamecontrol.xml	2006-07-27 11:11:13 UTC (rev 24974)
@@ -1,234 +0,0 @@
-<world>
-    <addon plugin="cel.addons.xmlscripts">
-	<layer>blxml</layer>
-        <pcfactory>cel.pcfactory.properties</pcfactory>
-
-	<script name="cc_screenmanager">
-	  <event name="init">
-	    <createentity name="cc_screen_start" layer="blxml" behaviour="cc_screen_start" />
-	    <createentity name="cc_screen_game" layer="blxml" behaviour="cc_screen_game" />
-	    <createentity name="cc_screen_test" layer="blxml" behaviour="cc_screen_test" />
-	    <var name="cc_currentscreen" value="start" />
-	    <expr eval="('cc_screen_'+?cc_currentscreen)::activate()" />
-	  </event>
-
-	  <!-- Parameter: screen -->
-	  <event name="cc_switchscreen">
-	    <expr eval="('cc_screen_'+?cc_currentscreen)::deactivate()" />
-	    <var name="cc_currentscreen" value="@screen" />
-	    <expr eval="('cc_screen_'+?cc_currentscreen)::activate()" />
-	  </event>
-	</script>
-
-	<script name="cc_screen">
-
-	  <!--
-	    - Parse a config vector3.
-	    - Parameters:
-	    -    key = key name
-	    -    def = default value
-	    -->
-	  <event name="getcfgvector">
-	    <lvar name="vec" value="config(@key,@def)" />
-	    <strsplit string="#vec" left="x" delimiter="','" right="rem" />
-	    <strsplit string="?rem" left="y" delimiter="','" right="z" />
-	    <return value="[?x,?y,?z]" />
-	  </event>
-
-	  <!--
-	    - Bind a key based on config.
-	    -   cfg = config key name
-	    -   def = default
-	    -   action = action name
-	    -   doalt = true or false to do alternate
-	    -->
-	  <event name="bind">
-	    <lvar name="event" value="config('CrystalCore.Keys.'+@cfg,@def)" />
-	    <if eval="#event==''">
-	      <stop />
-	    </if>
-	    <default propclass="pc(ent_player,pccommandinput)" />
-	    <expr eval="Bind{trigger=#event,command=@action}" />
-	    <if eval="@doalt">
-	      <expr eval="bind(cfg=@cfg+'.alt',def='',action=@action,doalt=false)" />
-	    </if>
-	  </event>
-
-	  <!--
-	    - Parameters
-	    -   dir = directory
-	    -   file = file
-	    -   ent = entity name
-	    -   mode = loading mode
-	    -->
-	  <event name="addlevel">
-	    <lvar name="leveldir" value="config('CrystalCore.StartMenuLevel','')" />
-	    <lvar name="levelfile" value="config('CrystalCore.StartMenuLevelFile','')" />
-	    <if eval="!chdirauto(@dir,@file)">
-	      <reporterror message="'Cannot find '+@file+' at '+@dir+'!'" />
-	    </if>
-	    <createentity name="@ent" />
-	    <createpropclass entity="@ent" name="pczonemanager" />
-	    <default propclass="pc(@ent,pczonemanager)" />
-	    <expr eval="SetLoadingMode{mode=@mode}" />
-	    <lvar name="success" value="Load{file=@file}" />
-	    <if eval="!#success">
-	      <reporterror message="'Cannot load '+@file+' at '+@dir+'!'" />
-	    </if>
-	  </event>
-
-	  <!--
-	    - Start a game
-	    - Parameters:
-	    -   dir = directory for game level (level.xml)
-	    -->
-	  <event name="startgame">
-	    <lvar name="dir" value="@dir" />
-	    <lvar name="file" value="'level.xml'" />
-	    <expr eval="addlevel(dir=#dir,file=#file,ent=ent_level,mode=normal)" />
-
-	    <lvar name="playername" value="config('CrystalCore.Player.Name','ent_player')" />
-	    <expr eval="createplayer(name=#playername)" />
-
-	    <lvar name="dir" value="config('CrystalCore.GameMenuLevel','')" />
-	    <lvar name="file" value="config('CrystalCore.GameMenuLevelFile','')" />
-	    <expr eval="addlevel(dir=#dir,file=#file,ent=hud_level,mode=loadall)" />
-	  </event>
-
-	  <!--
-	    - Parameters
-	    -   name = player name
-	    -->
-	  <event name="createplayer">
-	    <lvar name="cfgkey" value="'CrystalCore.'+@name+'.'" />
-	    <createentity name="ent_player" behaviour="config(#cfgkey+Behaviour,cc_player)" />
-	    <createpropclass entity="ent_player" name="pcdefaultcamera" />
-	    <createpropclass entity="ent_player" name="pcmesh" />
-	    <createpropclass entity="ent_player" name="pclinearmovement" />
-	    <createpropclass entity="ent_player" name="pcactormove" />
-	    <createpropclass entity="ent_player" name="pccommandinput" />
-	    <createpropclass entity="ent_player" name="pcproperties" />
-	    <createpropclass entity="ent_player" name="pcinventory" />
-	    <createpropclass entity="ent_player" name="pctimer" />
-	    <!-- @@@ Do player and sound settings! -->
-
-	    <var entity="ent_player" name="cc_health" value="100" />
-	    <var entity="ent_player" name="cc_ammo" value="25" />
-
-	    <default propclass="pc(ent_player,pcdefaultcamera)" />
-	    <lvar name="region" value="property(pc(ent_level,pczonemanager),propid(lastregion))" />
-	    <lvar name="start" value="property(pc(ent_level,pczonemanager),propid(laststart))" />
-	    <expr eval="SetZoneManager{entity=ent(ent_level),region=#region,start=#start}" />
-	    <lvar name="spr1" value="float(config(#cfgkey+SpringCoef,'10.0'))" />
-	    <lvar name="spr2" value="float(config(#cfgkey+DampeningCoef,'0.1'))" />
-	    <lvar name="spr3" value="float(config(#cfgkey+SpringLength,'0.01'))" />
-	    <lvar name="spr" value="[#spr1,#spr2,#spr3]" />
-	    <lvar name="pitch" value="float(config(#cfgkey+Pitch,'-0.4'))" />
-	    <!-- @@@ Better config! -->
-	    <expr eval="SetCamera{modename=firstperson,spring=#spr,fpoffset=[0,1,0],tpoffset=[0,1,3]}" />
-
-	    <default propclass="pc(ent_player,pcmesh)" />
-	    <lvar name="path" value="config(#cfgkey+ModelPath,'')" />
-	    <lvar name="file" value="config(#cfgkey+ModelFile,'/cc/models/box')" />
-	    <lvar name="fact" value="config(#cfgkey+ModelName,box)" />
-	    <if eval="!LoadMeshPath{path=#path,filename=#file,factoryname=#fact}">
-	      <stop />
-	    </if>
-
-	    <default propclass="pc(ent_level,pczonemanager)" />
-	    <expr eval="PointMesh{entity=ent_player,region=#region,start=#start}" />
-
-	    <default propclass="pc(ent_player,pclinearmovement)" />
-	    <lvar name="body" value="getcfgvector(key=#cfgkey+Body,def='0.5,0.8,0.5')" />
-	    <lvar name="legs" value="getcfgvector(key=#cfgkey+Legs,def='0.5,0.4,0.5')" />
-	    <lvar name="offset" value="getcfgvector(key=#cfgkey+Offset,def='0,0,0')" />
-	    <expr eval="InitCD{body=#body,legs=#legs,offset=#offset}" />
-
-	    <default propclass="pc(ent_player,pcactormove)" />
-	    <lvar name="movespeed" value="float(config(#cfgkey+MoveSpeed,'2.0'))" />
-	    <lvar name="runspeed" value="float(config(#cfgkey+RunSpeed,'5.0'))" />
-	    <lvar name="rotspeed" value="float(config(#cfgkey+RotationSpeed,'1.75'))" />
-	    <lvar name="jumpspeed" value="float(config(#cfgkey+JumpingVelocity,'6.31'))" />
-	    <expr eval="SetSpeed{movement=#movespeed,running=#runspeed,rotation=#rotspeed,jumping=#jumpspeed}" />
-
-	    <default propclass="pc(ent_player,pccommandinput)" />
-	    <property id="propid(screenspace)" value="false" />
-	    <expr eval="bind(cfg=forward,def=up,action=forward,doalt=true)" />
-	    <expr eval="bind(cfg=backward,def=down,action=backward,doalt=true)" />
-	    <expr eval="bind(cfg=rotateleft,def=left,action=rotateleft,doalt=true)" />
-	    <expr eval="bind(cfg=rotateright,def=right,action=rotateright,doalt=true)" />
-	    <expr eval="bind(cfg=strafeleft,def=a,action=strafeleft,doalt=true)" />
-	    <expr eval="bind(cfg=straferight,def=d,action=straferight,doalt=true)" />
-	    <expr eval="bind(cfg=run,def=shift,action=run,doalt=true)" />
-	    <expr eval="bind(cfg=cammode,def=m,action=cammode,doalt=true)" />
-	    <expr eval="bind(cfg=jump,def=space,action=jump,doalt=true)" />
-	    <expr eval="bind(cfg=center,def=x,action=center,doalt=true)" />
-	    <expr eval="bind(cfg=lookup,def=pgup,action=lookup,doalt=true)" />
-	    <expr eval="bind(cfg=lookdown,def=pgdn,action=lookdown,doalt=true)" />
-	    <expr eval="bind(cfg=fire,def=ctrl,action=fire,doalt=true)" />
-
-	    <expr eval="bind(cfg=clip_no,def=f1,action=clip_no,doalt=true)" />
-	    <expr eval="bind(cfg=clip_1,def=f2,action=clip_1,doalt=true)" />
-	    <expr eval="bind(cfg=clip_2,def=f3,action=clip_2,doalt=true)" />
-	    <expr eval="bind(cfg=clip_3,def=f4,action=clip_3,doalt=true)" />
-	    <expr eval="bind(cfg=clip_4,def=f5,action=clip_4,doalt=true)" />
-
-	    <expr eval="bind(cfg=teleport,def=t,action=teleport,doalt=true)" />
-	    <expr eval="bind(cfg=pickup,def=',',action=pickup,doalt=true)" />
-
-	    <expr eval="bind(cfg=mousemove,def=MouseAxis0,action=mousemove,doalt=true)" />
-
-	    <action propclass="pc(ent_player,pctimer)" id="actid(WakeUpFrame)" />
-	  </event>
-	</script>
-
-	<script name="cc_screen_start">
-	  <superscript name="cc_screen" />
-
-	  <event name="activate">
-	    <lvar name="dir" value="config('CrystalCore.StartMenuLevel','')" />
-	    <lvar name="file" value="config('CrystalCore.StartMenuLevelFile','')" />
-	    <expr eval="addlevel(dir=#dir,file=#file,ent=menu_level,mode=loadall)" />
-	  </event>
-
-	  <event name="deactivate">
-	    <destroyentity name="menu_level" />
-	  </event>
-	</script>
-
-	<script name="cc_screen_test">
-	  <superscript name="cc_screen" />
-
-	  <event name="activate">
-	    <lvar name="dir" value="config('CrystalCore.TestLevel','')" />
-	    <expr eval="startgame(dir=#dir)" />
-	  </event>
-
-	  <event name="deactivate">
-	    <destroyentity name="ent_level" />
-	    <destroyentity name="hud_level" />
-	    <destroyentity name="ent_player" />
-	  </event>
-	</script>
-
-	<script name="cc_screen_game">
-	  <superscript name="cc_screen" />
-
-	  <event name="activate">
-	    <lvar name="dir" value="config('CrystalCore.DefaultLevel','')" />
-	    <expr eval="startgame(dir=#dir)" />
-	  </event>
-
-	  <event name="deactivate">
-	    <destroyentity name="ent_level" />
-	    <destroyentity name="hud_level" />
-	    <destroyentity name="ent_player" />
-	  </event>
-	</script>
-    </addon>
-
-    <addon plugin="cel.addons.celentity" entityname="cc_screenmanager">
-        <behaviour name="cc_screenmanager" layer="blxml" />
-    </addon>
-
-</world>

Copied: crystalcore/trunk/data/entities/screenmanager.xml (from rev 24973, crystalcore/trunk/data/entities/gamecontrol.xml)
===================================================================
--- crystalcore/trunk/data/entities/screenmanager.xml	                        (rev 0)
+++ crystalcore/trunk/data/entities/screenmanager.xml	2006-07-27 11:11:13 UTC (rev 24974)
@@ -0,0 +1,234 @@
+<world>
+    <addon plugin="cel.addons.xmlscripts">
+	<layer>blxml</layer>
+        <pcfactory>cel.pcfactory.properties</pcfactory>
+
+	<script name="cc_screenmanager">
+	  <event name="init">
+	    <createentity name="cc_screen_start" layer="blxml" behaviour="cc_screen_start" />
+	    <createentity name="cc_screen_game" layer="blxml" behaviour="cc_screen_game" />
+	    <createentity name="cc_screen_test" layer="blxml" behaviour="cc_screen_test" />
+	    <var name="cc_currentscreen" value="start" />
+	    <expr eval="('cc_screen_'+?cc_currentscreen)::activate()" />
+	  </event>
+
+	  <!-- Parameter: screen -->
+	  <event name="cc_switchscreen">
+	    <expr eval="('cc_screen_'+?cc_currentscreen)::deactivate()" />
+	    <var name="cc_currentscreen" value="@screen" />
+	    <expr eval="('cc_screen_'+?cc_currentscreen)::activate()" />
+	  </event>
+	</script>
+
+	<script name="cc_screen">
+
+	  <!--
+	    - Parse a config vector3.
+	    - Parameters:
+	    -    key = key name
+	    -    def = default value
+	    -->
+	  <event name="getcfgvector">
+	    <lvar name="vec" value="config(@key,@def)" />
+	    <strsplit string="#vec" left="x" delimiter="','" right="rem" />
+	    <strsplit string="?rem" left="y" delimiter="','" right="z" />
+	    <return value="[?x,?y,?z]" />
+	  </event>
+
+	  <!--
+	    - Bind a key based on config.
+	    -   cfg = config key name
+	    -   def = default
+	    -   action = action name
+	    -   doalt = true or false to do alternate
+	    -->
+	  <event name="bind">
+	    <lvar name="event" value="config('CrystalCore.Keys.'+@cfg,@def)" />
+	    <if eval="#event==''">
+	      <stop />
+	    </if>
+	    <default propclass="pc(ent_player,pccommandinput)" />
+	    <expr eval="Bind{trigger=#event,command=@action}" />
+	    <if eval="@doalt">
+	      <expr eval="bind(cfg=@cfg+'.alt',def='',action=@action,doalt=false)" />
+	    </if>
+	  </event>
+
+	  <!--
+	    - Parameters
+	    -   dir = directory
+	    -   file = file
+	    -   ent = entity name
+	    -   mode = loading mode
+	    -->
+	  <event name="addlevel">
+	    <lvar name="leveldir" value="config('CrystalCore.StartMenuLevel','')" />
+	    <lvar name="levelfile" value="config('CrystalCore.StartMenuLevelFile','')" />
+	    <if eval="!chdirauto(@dir,@file)">
+	      <reporterror message="'Cannot find '+@file+' at '+@dir+'!'" />
+	    </if>
+	    <createentity name="@ent" />
+	    <createpropclass entity="@ent" name="pczonemanager" />
+	    <default propclass="pc(@ent,pczonemanager)" />
+	    <expr eval="SetLoadingMode{mode=@mode}" />
+	    <lvar name="success" value="Load{file=@file}" />
+	    <if eval="!#success">
+	      <reporterror message="'Cannot load '+@file+' at '+@dir+'!'" />
+	    </if>
+	  </event>
+
+	  <!--
+	    - Start a game
+	    - Parameters:
+	    -   dir = directory for game level (level.xml)
+	    -->
+	  <event name="startgame">
+	    <lvar name="dir" value="@dir" />
+	    <lvar name="file" value="'level.xml'" />
+	    <expr eval="addlevel(dir=#dir,file=#file,ent=ent_level,mode=normal)" />
+
+	    <lvar name="playername" value="config('CrystalCore.Player.Name','ent_player')" />
+	    <expr eval="createplayer(name=#playername)" />
+
+	    <lvar name="dir" value="config('CrystalCore.GameMenuLevel','')" />
+	    <lvar name="file" value="config('CrystalCore.GameMenuLevelFile','')" />
+	    <expr eval="addlevel(dir=#dir,file=#file,ent=hud_level,mode=loadall)" />
+	  </event>
+
+	  <!--
+	    - Parameters
+	    -   name = player name
+	    -->
+	  <event name="createplayer">
+	    <lvar name="cfgkey" value="'CrystalCore.'+@name+'.'" />
+	    <createentity name="ent_player" behaviour="config(#cfgkey+Behaviour,cc_player)" />
+	    <createpropclass entity="ent_player" name="pcdefaultcamera" />
+	    <createpropclass entity="ent_player" name="pcmesh" />
+	    <createpropclass entity="ent_player" name="pclinearmovement" />
+	    <createpropclass entity="ent_player" name="pcactormove" />
+	    <createpropclass entity="ent_player" name="pccommandinput" />
+	    <createpropclass entity="ent_player" name="pcproperties" />
+	    <createpropclass entity="ent_player" name="pcinventory" />
+	    <createpropclass entity="ent_player" name="pctimer" />
+	    <!-- @@@ Do player and sound settings! -->
+
+	    <var entity="ent_player" name="cc_health" value="100" />
+	    <var entity="ent_player" name="cc_ammo" value="25" />
+
+	    <default propclass="pc(ent_player,pcdefaultcamera)" />
+	    <lvar name="region" value="property(pc(ent_level,pczonemanager),propid(lastregion))" />
+	    <lvar name="start" value="property(pc(ent_level,pczonemanager),propid(laststart))" />
+	    <expr eval="SetZoneManager{entity=ent(ent_level),region=#region,start=#start}" />
+	    <lvar name="spr1" value="float(config(#cfgkey+SpringCoef,'10.0'))" />
+	    <lvar name="spr2" value="float(config(#cfgkey+DampeningCoef,'0.1'))" />
+	    <lvar name="spr3" value="float(config(#cfgkey+SpringLength,'0.01'))" />
+	    <lvar name="spr" value="[#spr1,#spr2,#spr3]" />
+	    <lvar name="pitch" value="float(config(#cfgkey+Pitch,'-0.4'))" />
+	    <!-- @@@ Better config! -->
+	    <expr eval="SetCamera{modename=firstperson,spring=#spr,fpoffset=[0,1,0],tpoffset=[0,1,3]}" />
+
+	    <default propclass="pc(ent_player,pcmesh)" />
+	    <lvar name="path" value="config(#cfgkey+ModelPath,'')" />
+	    <lvar name="file" value="config(#cfgkey+ModelFile,'/cc/models/box')" />
+	    <lvar name="fact" value="config(#cfgkey+ModelName,box)" />
+	    <if eval="!LoadMeshPath{path=#path,filename=#file,factoryname=#fact}">
+	      <stop />
+	    </if>
+
+	    <default propclass="pc(ent_level,pczonemanager)" />
+	    <expr eval="PointMesh{entity=ent_player,region=#region,start=#start}" />
+
+	    <default propclass="pc(ent_player,pclinearmovement)" />
+	    <lvar name="body" value="getcfgvector(key=#cfgkey+Body,def='0.5,0.8,0.5')" />
+	    <lvar name="legs" value="getcfgvector(key=#cfgkey+Legs,def='0.5,0.4,0.5')" />
+	    <lvar name="offset" value="getcfgvector(key=#cfgkey+Offset,def='0,0,0')" />
+	    <expr eval="InitCD{body=#body,legs=#legs,offset=#offset}" />
+
+	    <default propclass="pc(ent_player,pcactormove)" />
+	    <lvar name="movespeed" value="float(config(#cfgkey+MoveSpeed,'2.0'))" />
+	    <lvar name="runspeed" value="float(config(#cfgkey+RunSpeed,'5.0'))" />
+	    <lvar name="rotspeed" value="float(config(#cfgkey+RotationSpeed,'1.75'))" />
+	    <lvar name="jumpspeed" value="float(config(#cfgkey+JumpingVelocity,'6.31'))" />
+	    <expr eval="SetSpeed{movement=#movespeed,running=#runspeed,rotation=#rotspeed,jumping=#jumpspeed}" />
+
+	    <default propclass="pc(ent_player,pccommandinput)" />
+	    <property id="propid(screenspace)" value="false" />
+	    <expr eval="bind(cfg=forward,def=up,action=forward,doalt=true)" />
+	    <expr eval="bind(cfg=backward,def=down,action=backward,doalt=true)" />
+	    <expr eval="bind(cfg=rotateleft,def=left,action=rotateleft,doalt=true)" />
+	    <expr eval="bind(cfg=rotateright,def=right,action=rotateright,doalt=true)" />
+	    <expr eval="bind(cfg=strafeleft,def=a,action=strafeleft,doalt=true)" />
+	    <expr eval="bind(cfg=straferight,def=d,action=straferight,doalt=true)" />
+	    <expr eval="bind(cfg=run,def=shift,action=run,doalt=true)" />
+	    <expr eval="bind(cfg=cammode,def=m,action=cammode,doalt=true)" />
+	    <expr eval="bind(cfg=jump,def=space,action=jump,doalt=true)" />
+	    <expr eval="bind(cfg=center,def=x,action=center,doalt=true)" />
+	    <expr eval="bind(cfg=lookup,def=pgup,action=lookup,doalt=true)" />
+	    <expr eval="bind(cfg=lookdown,def=pgdn,action=lookdown,doalt=true)" />
+	    <expr eval="bind(cfg=fire,def=ctrl,action=fire,doalt=true)" />
+
+	    <expr eval="bind(cfg=clip_no,def=f1,action=clip_no,doalt=true)" />
+	    <expr eval="bind(cfg=clip_1,def=f2,action=clip_1,doalt=true)" />
+	    <expr eval="bind(cfg=clip_2,def=f3,action=clip_2,doalt=true)" />
+	    <expr eval="bind(cfg=clip_3,def=f4,action=clip_3,doalt=true)" />
+	    <expr eval="bind(cfg=clip_4,def=f5,action=clip_4,doalt=true)" />
+
+	    <expr eval="bind(cfg=teleport,def=t,action=teleport,doalt=true)" />
+	    <expr eval="bind(cfg=pickup,def=',',action=pickup,doalt=true)" />
+
+	    <expr eval="bind(cfg=mousemove,def=MouseAxis0,action=mousemove,doalt=true)" />
+
+	    <action propclass="pc(ent_player,pctimer)" id="actid(WakeUpFrame)" />
+	  </event>
+	</script>
+
+	<script name="cc_screen_start">
+	  <superscript name="cc_screen" />
+
+	  <event name="activate">
+	    <lvar name="dir" value="config('CrystalCore.StartMenuLevel','')" />
+	    <lvar name="file" value="config('CrystalCore.StartMenuLevelFile','')" />
+	    <expr eval="addlevel(dir=#dir,file=#file,ent=menu_level,mode=loadall)" />
+	  </event>
+
+	  <event name="deactivate">
+	    <destroyentity name="menu_level" />
+	  </event>
+	</script>
+
+	<script name="cc_screen_test">
+	  <superscript name="cc_screen" />
+
+	  <event name="activate">
+	    <lvar name="dir" value="config('CrystalCore.TestLevel','')" />
+	    <expr eval="startgame(dir=#dir)" />
+	  </event>
+
+	  <event name="deactivate">
+	    <destroyentity name="ent_level" />
+	    <destroyentity name="hud_level" />
+	    <destroyentity name="ent_player" />
+	  </event>
+	</script>
+
+	<script name="cc_screen_game">
+	  <superscript name="cc_screen" />
+
+	  <event name="activate">
+	    <lvar name="dir" value="config('CrystalCore.DefaultLevel','')" />
+	    <expr eval="startgame(dir=#dir)" />
+	  </event>
+
+	  <event name="deactivate">
+	    <destroyentity name="ent_level" />
+	    <destroyentity name="hud_level" />
+	    <destroyentity name="ent_player" />
+	  </event>
+	</script>
+    </addon>
+
+    <addon plugin="cel.addons.celentity" entityname="cc_screenmanager">
+        <behaviour name="cc_screenmanager" layer="blxml" />
+    </addon>
+
+</world>

Modified: crystalcore/trunk/docs/history.txt
===================================================================
--- crystalcore/trunk/docs/history.txt	2006-07-27 07:51:41 UTC (rev 24973)
+++ crystalcore/trunk/docs/history.txt	2006-07-27 11:11:13 UTC (rev 24974)
@@ -5,6 +5,7 @@
 
 27-Jul-2006
 	- Jorrit cleaned up a lot of code from CC.
+	- Jorrit renamed datacontrol.xml to screenmanager.xml.
 26-Jul-2006
 	- Jorrit completed the first phase of the new gamecontrol
 	  entity. It works more or less. There is still a bug that it

Modified: crystalcore/trunk/src/application.cpp
===================================================================
--- crystalcore/trunk/src/application.cpp	2006-07-27 07:51:41 UTC (rev 24973)
+++ crystalcore/trunk/src/application.cpp	2006-07-27 11:11:13 UTC (rev 24974)
@@ -92,8 +92,7 @@
 
   // @@@ Configure!
   const char* leveldir = "/cc/gamectrl";
-  const char* levelfile = "gamecontrol.xml";
-  // Make 'leveldir' current vfs directory.
+  const char* levelfile = "screenmanager.xml";
   if (!vfs->ChDirAuto (leveldir, 0, 0, levelfile))
     return false;
   return loader->LoadMapFile (levelfile, false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24983
Author:   jorrit
Date:     2006-07-28 03:00:40 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24983&view=rev

Log Message:
-----------

	- Jorrit removed the mousemove code from CC since CC now uses
	  the mousemove code out of pcactormove.

Modified Paths:
--------------
    crystalcore/trunk/crystalcore.cfg
    crystalcore/trunk/data/entities/screenmanager.xml
    crystalcore/trunk/docs/history.txt
    crystalcore/trunk/src/behaviours/be_player.cpp
    crystalcore/trunk/src/behaviours/be_player.h

Added Paths:
-----------
    crystalcore/trunk/data/entities/player.xml
Modified: crystalcore/trunk/crystalcore.cfg
===================================================================
--- crystalcore/trunk/crystalcore.cfg	2006-07-27 23:10:15 UTC (rev 24982)
+++ crystalcore/trunk/crystalcore.cfg	2006-07-28 10:00:40 UTC (rev 24983)
@@ -211,9 +211,9 @@
 ; Maximum target range for aiming accuratelly.
 CrystalCore.MalePlayer.MaxTargetRange = 20.0
 ; Horizontal speedup factor for mouse movement.
-CrystalCore.MalePlayer.HorizontalMouseFactor = 0.4
+CrystalCore.MalePlayer.HorizontalMouseFactor = 1.0
 ; Vertical speedup factor for mouse movement.
-CrystalCore.MalePlayer.VerticalMouseFactor = 2.4
+CrystalCore.MalePlayer.VerticalMouseFactor = 1.0
 
 ; Use inverted movement.
 CrystalCore.MalePlayer.Inverted = false

Added: crystalcore/trunk/data/entities/player.xml
===================================================================
--- crystalcore/trunk/data/entities/player.xml	                        (rev 0)
+++ crystalcore/trunk/data/entities/player.xml	2006-07-28 10:00:40 UTC (rev 24983)
@@ -0,0 +1,16 @@
+<world>
+    <addon plugin="cel.addons.xmlscripts">
+	<layer>blxml</layer>
+        <pcfactory>cel.pcfactory.properties</pcfactory>
+
+	<script name="cc_player">
+	  <event name="init">
+	  </event>
+	</script>
+    </addon>
+
+    <addon plugin="cel.addons.celentity" entityname="ent_player">
+        <behaviour name="cc_player" layer="blxml" />
+    </addon>
+
+</world>

Modified: crystalcore/trunk/data/entities/screenmanager.xml
===================================================================
--- crystalcore/trunk/data/entities/screenmanager.xml	2006-07-27 23:10:15 UTC (rev 24982)
+++ crystalcore/trunk/data/entities/screenmanager.xml	2006-07-28 10:00:40 UTC (rev 24983)
@@ -109,7 +109,6 @@
 	    <createpropclass entity="ent_player" name="pccommandinput" />
 	    <createpropclass entity="ent_player" name="pcproperties" />
 	    <createpropclass entity="ent_player" name="pcinventory" />
-	    <createpropclass entity="ent_player" name="pctimer" />
 	    <!-- @@@ Do player and sound settings! -->
 
 	    <var entity="ent_player" name="cc_health" value="100" />
@@ -177,8 +176,6 @@
 	    <expr eval="bind(cfg=pickup,def=',',action=pickup,doalt=true)" />
 
 	    <expr eval="bind(cfg=mousemove,def=MouseAxis0,action=mousemove,doalt=true)" />
-
-	    <action propclass="pc(ent_player,pctimer)" id="actid(WakeUpFrame)" />
 	  </event>
 	</script>
 

Modified: crystalcore/trunk/docs/history.txt
===================================================================
--- crystalcore/trunk/docs/history.txt	2006-07-27 23:10:15 UTC (rev 24982)
+++ crystalcore/trunk/docs/history.txt	2006-07-28 10:00:40 UTC (rev 24983)
@@ -3,6 +3,9 @@
 
 The history order is reversed so that new features are at the top.
 
+28-Jul-2006
+	- Jorrit removed the mousemove code from CC since CC now uses
+	  the mousemove code out of pcactormove.
 27-Jul-2006
 	- Jorrit cleaned up a lot of code from CC.
 	- Jorrit renamed datacontrol.xml to screenmanager.xml.

Modified: crystalcore/trunk/src/behaviours/be_player.cpp
===================================================================
--- crystalcore/trunk/src/behaviours/be_player.cpp	2006-07-27 23:10:15 UTC (rev 24982)
+++ crystalcore/trunk/src/behaviours/be_player.cpp	2006-07-28 10:00:40 UTC (rev 24983)
@@ -97,8 +97,6 @@
 
   id_pccommandinput_mousemove = pl->FetchStringID ("pccommandinput_mousemove");
 
-  id_pctimer_wakeupframe = pl->FetchStringID ("pctimer_wakeupframe");
-
   id_cc_damage = pl->FetchStringID ("cc_damage");
   id_cc_drop = pl->FetchStringID ("cc_drop");
   id_damage_amount = pl->FetchStringID ("cel.parameter.amount");
@@ -114,25 +112,13 @@
 
   max_pickuprange = 3.0f;
   max_targetrange = 20.0f;
-  hor_factor = 0.4f;
-  vert_factor = 2.4f;
+  hor_factor = 1.0f;
+  vert_factor = 1.0f;
   inverted = false;
-
-  vc = csQueryRegistry<iVirtualClock> (object_reg);
-  last_ticks = (csTicks)~0;
-  last_x = last_y = 0.0f;
-  totdelta = 0.0f;
-
-  csRef<iGraphics3D> g3d = csQueryRegistry<iGraphics3D> (object_reg);
-  g2d = g3d->GetDriver2D ();
-  frame_width = g2d->GetWidth();
-  frame_height = g2d->GetHeight();
-  g2d->SetMouseCursor (csmcNone);
 }
 
 ccBehaviourPlayer::~ccBehaviourPlayer ()
 {
-  g2d->SetMouseCursor (csmcArrow);
 }
 
 iPcActorMove* ccBehaviourPlayer::GetActorMove ()
@@ -140,6 +126,12 @@
   if (!pcactormove)
   {
     pcactormove = CEL_QUERY_PROPCLASS_ENT (entity, iPcActorMove);
+    if (pcactormove)
+    {
+      pcactormove->EnableMouseMove (true);
+      pcactormove->SetMouseMoveSpeed (hor_factor, vert_factor);
+      pcactormove->SetMouseMoveInverted (inverted);
+    }
   }
   return pcactormove;
 }
@@ -177,65 +169,11 @@
 {
   GetActorMove ();
   GetCamera ();
-  if (msg_id == id_pctimer_wakeupframe)
+  if (msg_id == id_pccommandinput_mousemove)
   {
-    csTicks cur_ticks = vc->GetCurrentTicks ();
-    if (last_ticks == (csTicks)~0)
-    {
-      // Do nothing for first time.
-      last_ticks = cur_ticks;
-      g2d->SetMousePosition (frame_width / 2, frame_height / 2);
-      return true;
-    }
-    float delta = float (cur_ticks - last_ticks);
-    last_ticks = cur_ticks;
-    totdelta += delta;
-
-    if (totdelta >= 100.0f)
-    {
-      if (inverted) last_y = -last_y;
-      float abs_x = fabs (last_x);
-      float abs_y = fabs (last_y);
-      if ((abs_x > 0.0001 || abs_y > 0.0001) && abs_x < .4 && abs_y < .4)
-      {
-        pccamera->MovePitch ((-last_y) * vert_factor);
-        float s = pcactormove->GetRotationSpeed();
-        pcactormove->SetRotationSpeed (fabs (last_x) * hor_factor * 100.0f);
-        if (fabs (last_x) < 0.0001f)
-        {
-          pcactormove->RotateRight(false);
-          pcactormove->RotateLeft(false);
-        }
-        else if (last_x > 0)
-        {
-          pcactormove->RotateRight(true);
-          pcactormove->RotateLeft(false);
-        }
-        else
-        {
-          pcactormove->RotateLeft(true);
-          pcactormove->RotateRight(false);
-        }
-        pcactormove->SetRotationSpeed (s); // Reset setting
-      }
-      else
-      {
-        pcactormove->RotateRight(false);
-        pcactormove->RotateLeft(false);
-      }
-
-      totdelta -= 100.0f;
-      if (totdelta >= 100.0f) totdelta = 0.0f;
-      g2d->SetMousePosition (frame_width / 2, frame_height / 2);
-      last_x = last_y = 0.0f;
-    }
-  }
-  else if (msg_id == id_pccommandinput_mousemove)
-  {
     CEL_FETCH_FLOAT_PAR (x, params, id_x);
     CEL_FETCH_FLOAT_PAR (y, params, id_y);
-    last_x = x;
-    last_y = y;
+    pcactormove->MouseMove (x, y);
   }
   else if (msg_id == id_pccommandinput_forward1)
     pcactormove->Forward (true);

Modified: crystalcore/trunk/src/behaviours/be_player.h
===================================================================
--- crystalcore/trunk/src/behaviours/be_player.h	2006-07-27 23:10:15 UTC (rev 24982)
+++ crystalcore/trunk/src/behaviours/be_player.h	2006-07-28 10:00:40 UTC (rev 24983)
@@ -80,8 +80,6 @@
   csStringID id_pccommandinput_teleport1;
   csStringID id_pccommandinput_pickup1;
 
-  csStringID id_pctimer_wakeupframe;
-
   csStringID id_cc_damage;
   csStringID id_cc_drop;
   csStringID id_damage_amount;
@@ -103,14 +101,6 @@
   csWeakRef<iPcInventory> pcinv;
   iPcInventory* GetInv ();
 
-  // For mouse movement.
-  csRef<iVirtualClock> vc;
-  csTicks last_ticks;
-  float last_x, last_y;		// Last x,y coordinates for mouse.
-  iGraphics2D* g2d;
-  int frame_width, frame_height;
-  float totdelta;
-
   // Sounds.
   csRef<iSndSysSource> pickup_source;
   csRef<iSndSysSource> drop_source;
@@ -133,7 +123,8 @@
 
   // Pick up targetted item.
   void Pickup ();
-  // Drop item. This only plays a sound. The rest of the dropping is handled in hud entity.
+  // Drop item. This only plays a sound. The rest of the dropping is
+  // handled in hud entity.
   void Drop ();
 
   /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24984
Author:   FossiFoo
Date:     2006-07-28 06:05:59 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24984&view=rev

Log Message:
-----------
Update, fourth try

Modified Paths:
--------------
    CS/branches/soc/imposters/apps/Jamfile
    CS/branches/soc/imposters/apps/tutorial/Jamfile
    CS/branches/soc/imposters/apps/tutorial/simple2/simple2.cpp
    CS/branches/soc/imposters/configure
    CS/branches/soc/imposters/configure.ac
    CS/branches/soc/imposters/docs/branch_history.txt
    CS/branches/soc/imposters/plugins/engine/3d/engine.cpp
    CS/branches/soc/imposters/plugins/engine/3d/impmesh.cpp
    CS/branches/soc/imposters/plugins/engine/3d/impprctx.cpp
    CS/branches/soc/imposters/plugins/engine/3d/impprctx.h
    CS/branches/soc/imposters/plugins/engine/3d/meshobj.cpp
    CS/branches/soc/imposters/plugins/mesh/Jamfile

Added Paths:
-----------
    CS/branches/soc/imposters/plugins/mesh/opentree/
    CS/branches/soc/imposters/plugins/mesh/opentree/Jamfile
    CS/branches/soc/imposters/plugins/mesh/opentree/object/
    CS/branches/soc/imposters/plugins/mesh/opentree/object/Jamfile
    CS/branches/soc/imposters/plugins/mesh/opentree/object/opentree.cpp
    CS/branches/soc/imposters/plugins/mesh/opentree/object/opentree.csplugin
    CS/branches/soc/imposters/plugins/mesh/opentree/object/opentree.h
    CS/branches/soc/imposters/plugins/mesh/opentree/prototree.cpp
    CS/branches/soc/imposters/plugins/mesh/opentree/prototree.h
Modified: CS/branches/soc/imposters/apps/Jamfile
===================================================================
--- CS/branches/soc/imposters/apps/Jamfile	2006-07-28 10:00:40 UTC (rev 24983)
+++ CS/branches/soc/imposters/apps/Jamfile	2006-07-28 13:05:59 UTC (rev 24984)
@@ -1,11 +1,11 @@
 SubDir TOP apps ;
 
-SubInclude TOP apps demo ;
-SubInclude TOP apps import ;
-SubInclude TOP apps isotest ;
-SubInclude TOP apps pysimp ;
-SubInclude TOP apps tests ;
-SubInclude TOP apps tools ;
+#SubInclude TOP apps demo ;
+#SubInclude TOP apps import ;
+#SubInclude TOP apps isotest ;
+#SubInclude TOP apps pysimp ;
+#SubInclude TOP apps tests ;
+#SubInclude TOP apps tools ;
 SubInclude TOP apps tutorial ;
 SubInclude TOP apps walktest ;
-SubInclude TOP apps waterdemo ;
+#SubInclude TOP apps waterdemo ;

Modified: CS/branches/soc/imposters/apps/tutorial/Jamfile
===================================================================
--- CS/branches/soc/imposters/apps/tutorial/Jamfile	2006-07-28 10:00:40 UTC (rev 24983)
+++ CS/branches/soc/imposters/apps/tutorial/Jamfile	2006-07-28 13:05:59 UTC (rev 24984)
@@ -1,12 +1,12 @@
 SubDir TOP apps tutorial ;
 
-SubInclude TOP apps tutorial awstut ;
-SubInclude TOP apps tutorial pathtut ;
-SubInclude TOP apps tutorial phystut ;
-SubInclude TOP apps tutorial simpcd ;
+#SubInclude TOP apps tutorial awstut ;
+#SubInclude TOP apps tutorial pathtut ;
+#SubInclude TOP apps tutorial phystut ;
+#SubInclude TOP apps tutorial simpcd ;
 SubInclude TOP apps tutorial simple1 ;
 SubInclude TOP apps tutorial simple2 ;
-SubInclude TOP apps tutorial simplept ;
-SubInclude TOP apps tutorial simpmap ;
-SubInclude TOP apps tutorial simpvs ;
-SubInclude TOP apps tutorial mazing ;
+#SubInclude TOP apps tutorial simplept ;
+#SubInclude TOP apps tutorial simpmap ;
+#SubInclude TOP apps tutorial simpvs ;
+#SubInclude TOP apps tutorial mazing ;

Modified: CS/branches/soc/imposters/apps/tutorial/simple2/simple2.cpp
===================================================================
--- CS/branches/soc/imposters/apps/tutorial/simple2/simple2.cpp	2006-07-28 10:00:40 UTC (rev 24983)
+++ CS/branches/soc/imposters/apps/tutorial/simple2/simple2.cpp	2006-07-28 13:05:59 UTC (rev 24984)
@@ -297,7 +297,6 @@
 
   //iMeshObject* test = sprite->GetMeshObject();
   csRef<iImposter> i = scfQueryInterface<iImposter> (sprite);
-  if (!i) printf ("nix is\n");
   i->SetImposterActive(true);
   iSharedVariableList* varlist = engine->GetVariableList();
   csRef<iSharedVariable> distvar = varlist->New();

Modified: CS/branches/soc/imposters/configure
===================================================================
--- CS/branches/soc/imposters/configure	2006-07-28 10:00:40 UTC (rev 24983)
+++ CS/branches/soc/imposters/configure	2006-07-28 13:05:59 UTC (rev 24984)
@@ -1,10 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for crystalspace 0.99.
+# Generated by GNU Autoconf 2.60 for crystalspace 0.99.
 #
 # Report bugs to <crystal-main@...>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -18,11 +19,35 @@
   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+
+# PATH needs CR
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
 # Support unset when possible.
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=unset
@@ -31,8 +56,43 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+as_nl='
+'
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  { (exit 1); exit 1; }
+fi
+
 # Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+for as_var in ENV MAIL MAILPATH
+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
@@ -46,18 +106,19 @@
   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
     eval $as_var=C; export $as_var
   else
-    $as_unset $as_var
+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   fi
 done
 
 # Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
@@ -65,157 +126,386 @@
 
 
 # Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# CDPATH.
+$as_unset CDPATH
 
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
+if test "x$CONFIG_SHELL" = x; then
+  if (eval ":") 2>/dev/null; then
+  as_have_required=yes
+else
+  as_have_required=no
 fi
 
+  if test $as_have_required = yes && 	 (eval ":
+(as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
 
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0) || { (exit 1); exit 1; }
+
+(
+  as_lineno_1=\$LINENO
+  as_lineno_2=\$LINENO
+  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+") 2> /dev/null; then
+  :
+else
+  as_candidate_shells=
     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
+  case $as_dir in
 	 /*)
-	   if ("$as_dir/$as_base" -c '
+	   for as_base in sh bash ksh sh5; do
+	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	   done;;
+       esac
+done
+IFS=$as_save_IFS
+
+
+      for as_shell in $as_candidate_shells $SHELL; do
+	 # Try only shells that exist, to save several forks.
+	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+_ASEOF
+}; then
+  CONFIG_SHELL=$as_shell
+	       as_have_required=yes
+	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+:
+(as_func_return () {
+  (exit $1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = "$1" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test $exitcode = 0) || { (exit 1); exit 1; }
+
+(
   as_lineno_1=$LINENO
   as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
   test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
 
+_ASEOF
+}; then
+  break
+fi
+
+fi
+
+      done
+
+      if test "x$CONFIG_SHELL" != x; then
+  for as_var in BASH_ENV ENV
+        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+        done
+        export CONFIG_SHELL
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+
+    if test $as_have_required = no; then
+  echo This script requires a shell more modern than all the
+      echo shells that I found on your system.  Please install a
+      echo modern shell, or manually run the script under such a
+      echo shell if you do have one.
+      { (exit 1); exit 1; }
+fi
+
+
+fi
+
+fi
+
+
+
+(eval "as_func_return () {
+  (exit \$1)
+}
+as_func_success () {
+  as_func_return 0
+}
+as_func_failure () {
+  as_func_return 1
+}
+as_func_ret_success () {
+  return 0
+}
+as_func_ret_failure () {
+  return 1
+}
+
+exitcode=0
+if as_func_success; then
+  :
+else
+  exitcode=1
+  echo as_func_success failed.
+fi
+
+if as_func_failure; then
+  exitcode=1
+  echo as_func_failure succeeded.
+fi
+
+if as_func_ret_success; then
+  :
+else
+  exitcode=1
+  echo as_func_ret_success failed.
+fi
+
+if as_func_ret_failure; then
+  exitcode=1
+  echo as_func_ret_failure succeeded.
+fi
+
+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+  :
+else
+  exitcode=1
+  echo positional parameters were not saved.
+fi
+
+test \$exitcode = 0") || {
+  echo No shell found that supports shell functions.
+  echo Please tell autoconf@... about your system,
+  echo including any error possibly output before this
+  echo message
+}
+
+
+
+  as_lineno_1=$LINENO
+  as_lineno_2=$LINENO
+  test "x$as_lineno_1" != "x$as_lineno_2" &&
+  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+
   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
   # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
+  # line-number line after each line using $LINENO; the second 'sed'
+  # does the real work.  The second script uses 'N' to pair each
+  # line-number line with the line containing $LINENO, and appends
+  # trailing '-' during substitution so that $LINENO is not a special
+  # case at line end.
   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
+  chmod +x "$as_me.lineno" ||
     { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
    { (exit 1); exit 1; }; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in
+-n*)
+  case `echo 'x\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  *)   ECHO_C='\c';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir
+fi
 echo >conf$$.file
 if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
+  as_ln_s='ln -s'
+  # ... but there are two gotchas:
+  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+  # In both cases, we have to default to `cp -p'.
+  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
     as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
 elif ln conf$$.file conf$$ 2>/dev/null; then
   as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p'
@@ -226,7 +516,19 @@
 fi
 test -d ./-p && rmdir ./-p
 
-as_executable_p="test -f"
+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
+# systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  as_executable_p="test -x"
+else
+  as_executable_p=:
+fi
+rm -f conf$$.file
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -235,39 +537,27 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
 
-# CDPATH.
-$as_unset CDPATH
+exec 7<&0 </dev/null 6>&1
 
-
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
 # Identity of this package.
 PACKAGE_NAME='crystalspace'
 PACKAGE_TARNAME='crystalspace'
@@ -304,18 +594,226 @@
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
+#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CXXCPP RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP WINDRES ac_ct_WINDRES STRINGS ac_ct_STRINGS OBJCOPY ac_ct_OBJCOPY LIBTOOL_TEST ac_ct_LIBTOOL_TEST LIBTOOL_PATH LIBTOOL ac_ct_LIBTOOL CS_LT_APPLE APPLE_LIBTOOL MKDIR MKDIRS INSTALL TEXI2DVI TEXI2PDF DVIPS DVIPDF MAKEINFO DOXYGEN DOT ac_ct_DOT FLEX BISON HHC ac_ct_HHC SWIG JAM MAKE CSLIBS_CONFIG ac_ct_CSLIBS_CONFIG EGREP PERL PYTHON JAVA JAVAC ANT CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG ac_ct_PKG_CONFIG CONFIG_XXF86VM ac_ct_CONFIG_XXF86VM CONFIG_XAW ac_ct_CONFIG_XAW CONFIG_Z ac_ct_CONFIG_Z CONFIG_ZLIB ac_ct_CONFIG_ZLIB CONFIG_PNG ac_ct_CONFIG_PNG CONFIG_LIBPNG ac_ct_CONFIG_LIBPNG CONFIG_JPEG ac_ct_CONFIG_JPEG CONFIG_LIBJPEG ac_ct_CONFIG_LIBJPEG CONFIG_LCMS ac_ct_CONFIG_LCMS CONFIG_MNG ac_ct_CONFIG_MNG CONFIG_LIBMNG ac_ct_CONFIG_LIBMNG CONFIG_MIKMOD ac_ct_CONFIG_MIKMOD CONFIG_OGG ac_ct_CONFIG_OGG CONFIG_VORBIS ac_ct_CONFIG_VORBIS CONFIG_VORBISFILE ac_ct_CONFIG_VORBISFILE CONFIG_3DS ac_ct_CONFIG_3DS CONFIG_LIB3DS ac_ct_CONFIG_LIB3DS CONFIG_LIB3DS_120 ac_ct_CONFIG_LIB3DS_120 CONFIG_ODE ac_ct_CONFIG_ODE CONFIG_BULLET ac_ct_CONFIG_BULLET CONFIG_FREETYPE2 ac_ct_CONFIG_FREETYPE2 CONFIG_FREETYPE ac_ct_CONFIG_FREETYPE CONFIG_CAL3D ac_ct_CONFIG_CAL3D CONFIG_SDL ac_ct_CONFIG_SDL CONFIG_METAOBJECT_A3DL ac_ct_CONFIG_METAOBJECT_A3DL CONFIG_LIBMETAOBJECT_A3DL ac_ct_CONFIG_LIBMETAOBJECT_A3DL CONFIG_METAOBJECT_MISC ac_ct_CONFIG_METAOBJECT_MISC CONFIG_LIBMETAOBJECT_MISC ac_ct_CONFIG_LIBMETAOBJECT_MISC CONFIG_WX ac_ct_CONFIG_WX CONFIG_CEGUI ac_ct_CONFIG_CEGUI CONFIG_CEGUIBASE ac_ct_CONFIG_CEGUIBASE CONFIG_CG ac_ct_CONFIG_CG CONFIG_CGGL ac_ct_CONFIG_CGGL CONFIG_JACKASYN ac_ct_CONFIG_JACKASYN CONFIG_ASOUND ac_ct_CONFIG_ASOUND CONFIG_CACA ac_ct_CONFIG_CACA CONFIG_LIBCACA ac_ct_CONFIG_LIBCACA CONFIG_JS ac_ct_CONFIG_JS TTREE CONFIG_CPPUNIT ac_ct_CONFIG_CPPUNIT CONFIG_BFD ac_ct_CONFIG_BFD LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL
+PATH_SEPARATOR
+PACKAGE_NAME
+PACKAGE_TARNAME
+PACKAGE_VERSION
+PACKAGE_STRING
+PACKAGE_BUGREPORT
+exec_prefix
+prefix
+program_transform_name
+bindir
+sbindir
+libexecdir
+datarootdir
+datadir
+sysconfdir
+sharedstatedir
+localstatedir
+includedir
+oldincludedir
+docdir
+infodir
+htmldir
+dvidir
+pdfdir
+psdir
+libdir
+localedir
+mandir
+DEFS
+ECHO_C
+ECHO_N
+ECHO_T
+LIBS
+build_alias
+host_alias
+target_alias
+build
+build_cpu
+build_vendor
+build_os
+host
+host_cpu
+host_vendor
+host_os
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+ac_ct_CC
+EXEEXT
+OBJEXT
+CXX
+CXXFLAGS
+ac_ct_CXX
+CXXCPP
+RANLIB
+DLLTOOL
+ac_ct_DLLTOOL
+DLLWRAP
+ac_ct_DLLWRAP
+WINDRES
+ac_ct_WINDRES
+STRINGS
+ac_ct_STRINGS
+OBJCOPY
+ac_ct_OBJCOPY
+LIBTOOL_TEST
+ac_ct_LIBTOOL_TEST
+LIBTOOL_PATH
+LIBTOOL
+ac_ct_LIBTOOL
+CS_LT_APPLE
+APPLE_LIBTOOL
+MKDIR
+MKDIRS
+INSTALL
+TEXI2DVI
+TEXI2PDF
+DVIPS
+DVIPDF
+MAKEINFO
+DOXYGEN
+DOT
+ac_ct_DOT
+FLEX
+BISON
+HHC
+ac_ct_HHC
+SWIG
+JAM
+MAKE
+CSLIBS_CONFIG
+ac_ct_CSLIBS_CONFIG
+GREP
+EGREP
+PERL
+PYTHON
+JAVA
+JAVAC
+ANT
+CPP
+XMKMF
+X_CFLAGS
+X_PRE_LIBS
+X_LIBS
+X_EXTRA_LIBS
+PKG_CONFIG
+ac_ct_PKG_CONFIG
+CONFIG_XXF86VM
+ac_ct_CONFIG_XXF86VM
+CONFIG_
+ac_ct_CONFIG_
+CONFIG_XAW
+ac_ct_CONFIG_XAW
+CONFIG_Z
+ac_ct_CONFIG_Z
+CONFIG_ZLIB
+ac_ct_CONFIG_ZLIB
+CONFIG_PNG
+ac_ct_CONFIG_PNG
+CONFIG_LIBPNG
+ac_ct_CONFIG_LIBPNG
+CONFIG_JPEG
+ac_ct_CONFIG_JPEG
+CONFIG_LIBJPEG
+ac_ct_CONFIG_LIBJPEG
+CONFIG_LCMS
+ac_ct_CONFIG_LCMS
+CONFIG_MNG
+ac_ct_CONFIG_MNG
+CONFIG_LIBMNG
+ac_ct_CONFIG_LIBMNG
+CONFIG_MIKMOD
+ac_ct_CONFIG_MIKMOD
+CONFIG_OGG
+ac_ct_CONFIG_OGG
+CONFIG_VORBIS
+ac_ct_CONFIG_VORBIS
+CONFIG_VORBISFILE
+ac_ct_CONFIG_VORBISFILE
+CONFIG_3DS
+ac_ct_CONFIG_3DS
+CONFIG_LIB3DS
+ac_ct_CONFIG_LIB3DS
+CONFIG_LIB3DS_120
+ac_ct_CONFIG_LIB3DS_120
+CONFIG_ODE
+ac_ct_CONFIG_ODE
+CONFIG_BULLET
+ac_ct_CONFIG_BULLET
+CONFIG_FREETYPE2
+ac_ct_CONFIG_FREETYPE2
+CONFIG_FREETYPE
+ac_ct_CONFIG_FREETYPE
+CONFIG_CAL3D
+ac_ct_CONFIG_CAL3D
+CONFIG_SDL
+ac_ct_CONFIG_SDL
+CONFIG_METAOBJECT_A3DL
+ac_ct_CONFIG_METAOBJECT_A3DL
+CONFIG_LIBMETAOBJECT_A3DL
+ac_ct_CONFIG_LIBMETAOBJECT_A3DL
+CONFIG_METAOBJECT_MISC
+ac_ct_CONFIG_METAOBJECT_MISC
+CONFIG_LIBMETAOBJECT_MISC
+ac_ct_CONFIG_LIBMETAOBJECT_MISC
+CONFIG_WX
+ac_ct_CONFIG_WX
+CONFIG_CEGUI
+ac_ct_CONFIG_CEGUI
+CONFIG_CEGUIBASE
+ac_ct_CONFIG_CEGUIBASE
+CONFIG_CG
+ac_ct_CONFIG_CG
+CONFIG_CGGL
+ac_ct_CONFIG_CGGL
+CONFIG_JACKASYN
+ac_ct_CONFIG_JACKASYN
+CONFIG_ASOUND
+ac_ct_CONFIG_ASOUND
+CONFIG_CACA
+ac_ct_CONFIG_CACA
+CONFIG_LIBCACA
+ac_ct_CONFIG_LIBCACA
+CONFIG_JS
+ac_ct_CONFIG_JS
+CONFIG_OPENTREE
+ac_ct_CONFIG_OPENTREE
+TTREE
+CONFIG_CPPUNIT
+ac_ct_CONFIG_CPPUNIT
+CONFIG_BFD
+ac_ct_CONFIG_BFD
+LIBOBJS
+LTLIBOBJS'
 ac_subst_files=''
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+CPPFLAGS
+CXX
+CXXFLAGS
+CCC
+CXXCPP
+CPP
+XMKMF'
 
+
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
@@ -341,34 +839,48 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -390,12 +902,18 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
@@ -403,8 +921,18 @@
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    eval enable_$ac_feature=no ;;
 
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
   -enable-* | --enable-*)
     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
@@ -412,11 +940,7 @@
       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
    { (exit 1); exit 1; }; }
     ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_feature=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -443,6 +967,12 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -467,13 +997,16 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -538,6 +1071,16 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -594,11 +1137,7 @@
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_package=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
@@ -607,7 +1146,7 @@
       { echo "$as_me: error: invalid package name: $ac_package" >&2
    { (exit 1); exit 1; }; }
     ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    eval with_$ac_package=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -638,8 +1177,7 @@
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
       { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
@@ -659,29 +1197,21 @@
    { (exit 1); exit 1; }; }
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
+# Be sure to have absolute directory names.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
   case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
+  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+   { (exit 1); exit 1; }; }
 done
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -706,22 +1236,43 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  { echo "$as_me: error: Working directory cannot be determined" >&2
+   { (exit 1); exit 1; }; }
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  { echo "$as_me: error: pwd does not report name of working directory" >&2
+   { (exit 1); exit 1; }; }
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$0" ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$0" : 'X\(//\)[^/]' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
   if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
@@ -730,62 +1281,31 @@
   ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
    { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
    { (exit 1); exit 1; }; }
-  fi
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
 fi
-(cd $srcdir && test -r "./$ac_unique_file") 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -814,9 +1334,6 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
 			  [$ac_default_prefix]
@@ -834,15 +1351,22 @@
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
   --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
   --includedir=DIR       C header files [PREFIX/include]
   --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR          info documentation [DATAROOTDIR/info]
+  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR           man documentation [DATAROOTDIR/man]
+  --docdir=DIR           documentation root [DATAROOTDIR/doc/crystalspace]
+  --htmldir=DIR          html documentation [DOCDIR]
+  --dvidir=DIR           dvi documentation [DOCDIR]
+  --pdfdir=DIR           pdf documentation [DOCDIR]
+  --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -1012,6 +1536,9 @@
   --with-js=dir           specify location of libjs if not detected
                           automatically; searches dir/include, dir/lib, and
                           dir
+  --with-opentree=dir     specify location of libopentree if not detected
+                          automatically; searches dir/include, dir/lib, and
+                          dir
   --with-cppunit=dir      specify location of libcppunit if not detected
                           automatically; searches dir/include, dir/lib, and
                           dir
@@ -1024,132 +1551,99 @@
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
   CXXCPP      C++ preprocessor
   CPP         C preprocessor
+  XMKMF       Path to xmkmf, Makefile generator for X Window System
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <crystal-main@...>.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" || continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
   ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 crystalspace configure 0.99
-generated by GNU Autoconf 2.59
+generated by GNU Autoconf 2.60
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by crystalspace $as_me 0.99, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.60.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1168,7 +1662,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1182,6 +1676,7 @@
   test -z "$as_dir" && as_dir=.
   echo "PATH: $as_dir"
 done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1203,7 +1698,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1214,7 +1708,7 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+    *\'*)
       ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
@@ -1236,9 +1730,7 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      ac_configure_args="$ac_configure_args '$ac_arg'"
       ;;
     esac
   done
@@ -1249,8 +1741,8 @@
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1263,20 +1755,34 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      *) $as_unset $ac_var ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1287,22 +1793,28 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1314,26 +1826,24 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1364,14 +1874,17 @@
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
+if test -n "$CONFIG_SITE"; then
+  set x "$CONFIG_SITE"
+elif test "x$prefix" != xNONE; then
+  set x "$prefix/share/config.site" "$prefix/etc/config.site"
+else
+  set x "$ac_default_prefix/share/config.site" \
+	"$ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in $CONFIG_SITE; do
+shift
+for ac_site_file
+do
   if test -r "$ac_site_file"; then
     { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
@@ -1387,8 +1900,8 @@
     { echo "$as_me:$LINENO: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
@@ -1400,12 +1913,11 @@
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
@@ -1430,8 +1942,7 @@
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1448,11 +1959,6 @@
    { (exit 1); exit 1; }; }
 fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
@@ -1477,91 +1983,130 @@
 
 
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-
 PACKAGE_LONGNAME="Crystal Space"
     PACKAGE_COPYRIGHT="Copyright (C)1998-2005 Jorrit Tyberghein and others"
     PACKAGE_HOMEPAGE="http://www.crystalspace3d.org/"
 
 
 ac_aux_dir=
-for ac_dir in mk/autoconf $srcdir/mk/autoconf; do
-  if test -f $ac_dir/install-sh; then
+for ac_dir in mk/autoconf "$srcdir"/mk/autoconf; do
+  if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
-  elif test -f $ac_dir/install.sh; then
+  elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
-  elif test -f $ac_dir/shtool; then
+  elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mk/autoconf $srcdir/mk/autoconf" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in mk/autoconf $srcdir/mk/autoconf" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&2;}
    { (exit 1); exit 1; }; }
 fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking build system type" >&5
+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
   { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+echo "${ECHO_T}$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+echo "$as_me: error: invalid value of canonical build" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking host system type" >&5
+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
+fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+echo "${ECHO_T}$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+echo "$as_me: error: invalid value of canonical host" >&2;}
+   { (exit 1); exit 1; }; };;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -1581,8 +2126,8 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1595,32 +2140,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1633,36 +2180,51 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1675,74 +2237,34 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+
   fi
-done
-done
-
 fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1756,7 +2278,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -1767,6 +2289,7 @@
   fi
 done
 done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -1784,22 +2307,23 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1812,36 +2336,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1854,29 +2380,45 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet.  If you think this
+configuration is useful to you, please write to autoconf@...." >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
@@ -1889,21 +2431,35 @@
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
+echo "$as_me:$LINENO: checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler --version >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler --version >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -v >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -v >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+{ (ac_try="$ac_compiler -V >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compiler -V >&5") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }
@@ -1928,46 +2484,70 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+#
+# List of possible output files, starting from the most likely.
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+# only as a last resort.  b.out is created by i960 compilers.
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+#
+# The IRIX 6 linker writes into existing files which may not be
+# executable, retaining their permissions.  Remove them first so a
+# subsequent execution test works.
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { (ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
 	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -1980,19 +2560,23 @@
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
 
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2011,22 +2595,27 @@
     fi
   fi
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 
 rm -f a.out a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
+# Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+echo "${ECHO_T}$cross_compiling" >&6; }
 
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
@@ -2037,9 +2626,8 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
@@ -2053,14 +2641,14 @@
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2080,14 +2668,20 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
@@ -2105,12 +2699,12 @@
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+echo "${ECHO_T}$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2133,24 +2727,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2159,24 +2765,28 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_compiler_gnu=no
+	ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2192,24 +2802,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2218,12 +2840,131 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_prog_cc_g=no
+	CFLAGS=""
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_prog_cc_g=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -2239,12 +2980,12 @@
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2278,12 +3019,17 @@
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2298,205 +3044,74 @@
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
+  ac_cv_prog_cc_c89=$ac_arg
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext
+
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+  xno)
+    { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2521,8 +3136,8 @@
 
 
 	# Check if compiler recognizes -pipe directive.
-	echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
-echo $ECHO_N "checking if $CC accepts -pipe... $ECHO_C" >&6
+	{ echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
+echo $ECHO_N "checking if $CC accepts -pipe... $ECHO_C" >&6; }
 if test "${cs_cv_prog_cc_pipe_ok+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2613,24 +3228,36 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
   ac_status=$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
+  { (case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_try") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
@@ -2639,8 +3266,10 @@
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
+
 fi
-rm -f conftest.err conftest.$ac_objext \
+
+rm -f core conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
 	if test $cs_build_ok = yes; then
   break
@@ -2671,8 +3300,8 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $cs_cv_prog_cc_pipe_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cc_pipe_ok" >&6
+{ echo "$as_me:$LINENO: result: $cs_cv_prog_cc_pipe_ok" >&5
+echo "${ECHO_T}$cs_cv_prog_cc_pipe_ok" >&6; }
     if test "$cs_cv_prog_cc_pipe_ok" != no; then
   cs_build_prop_val="$cs_cv_prog_cc_pipe"
     cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
@@ -2691,18 +3320,22 @@
 
 
     CXXFLAGS="$CXXFLAGS" # Filter undesired flags
-    ac_ext=cc
+    ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 if test "${ac_cv_prog_CXX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -2715,36 +3348,38 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
+IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { echo "$as_me:$LINENO: result: $CXX" >&5
+echo "${ECHO_T}$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24975
Author:   brandonhamilton
Date:     2006-07-27 07:56:14 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24975&view=rev

Log Message:
-----------
Fixes and updates

Modified Paths:
--------------
    CS/branches/soc/vfs/plugins/filesys/vfs/vfs.cpp
    CS/branches/soc/vfs/plugins/filesys/vfs/vfs.h
Modified: CS/branches/soc/vfs/plugins/filesys/vfs/vfs.cpp
===================================================================
--- CS/branches/soc/vfs/plugins/filesys/vfs/vfs.cpp	2006-07-27 11:11:13 UTC (rev 24974)
+++ CS/branches/soc/vfs/plugins/filesys/vfs/vfs.cpp	2006-07-27 14:56:14 UTC (rev 24975)
@@ -730,7 +730,7 @@
 bool csVFS::ChDir (const char *Path)
 {
   // Must be a path
-  if (strlen(Path) == 0)
+  if (!Path || strlen(Path) == 0)
     return false;
 
   csScopedMutexLock lock (mutex);
@@ -790,9 +790,12 @@
 	// Push the current directory onto the stack
 	DirectoryStack.Push(CwdNode);
 
-	// Change the current directory
-  if (!ChDir(Path))
-    DirectoryStack.Pop();
+  if (Path)
+  {
+	  // Change the current directory
+    if (!ChDir(Path))
+      DirectoryStack.Pop();
+  }
 }
 
 bool csVFS::PopDir ()
@@ -887,14 +890,19 @@
 
   csScopedMutexLock lock (mutex);
 
+  csString fullPath = _ExpandPath(Path);
+  
+  if (fullPath.IsEmpty())
+    fullPath = "/";
+
   // Find the parent directory of the files we are checking
-  VfsNode *node = GetParentDirectoryNode(Path, false);
+  VfsNode *node = GetParentDirectoryNode(fullPath, false);
 
   if (!node)
 	  return false;
  
   // Check if the node contains the file
-  return node->ContainsFile(ExtractFileName(Path));
+  return node->ContainsFile(ExtractFileName(fullPath));
 }
 
 csPtr<iStringArray> csVFS::FindFiles (const char *Path)
@@ -908,24 +916,29 @@
     return v;
   }
 
+  csString fullPath = _ExpandPath(Path);
+  
+  if (fullPath.IsEmpty())
+    fullPath = "/";
+
   csScopedMutexLock lock (mutex);
 
   // Get directory node
-	VfsNode *node = GetDirectoryNode(Path);
+	VfsNode *node = GetDirectoryNode(fullPath);
 
   csString strMask;
 
 	if (!node)
   {
     // Get parent directory node
-    node = GetParentDirectoryNode(Path, false);
+    node = GetParentDirectoryNode(fullPath, false);
     if (!node)
     {
       // Does not exist
       csPtr<iStringArray> v(fl);
       return v;
     }
-    strMask = ExtractFileName(Path);
+    strMask = ExtractFileName(fullPath);
   }
 
   if (strMask.Length() == 0)
@@ -1069,7 +1082,7 @@
 	  return false;
 
   // Create the node for the mount
-  csString tmp = VirtualPath;
+  csString tmp = _ExpandPath(VirtualPath);
   
   // Remove trailing slash
   if (tmp.GetAt(tmp.Length() - 1) == VFS_PATH_SEPARATOR)
@@ -1233,7 +1246,7 @@
     char c = '\0';
 
     csString vfs_dir;
-    vfs_dir << VirtualPath << '/';
+    vfs_dir << _ExpandPath(VirtualPath) << '/';
 
     for (size_t j = 0; j < slen; j++)
     {
@@ -1336,8 +1349,13 @@
 bool csVFS::ChDirAuto (const char* path, const csStringArray* paths,
 					   const char* vfspath, const char* filename)
 {
+  csString fullPath = _ExpandPath(path);
+  
+  if (fullPath.IsEmpty())
+    fullPath = "/";
+
   // Check if the VFS Path exists
-  if (TryChDirAuto(path, filename))
+  if (TryChDirAuto(fullPath, filename))
     return true;
 
   // Check the paths
@@ -1357,7 +1375,7 @@
         testpath.Truncate(testpath.Length() -1);
       }
 
-      testpath.Append(path);
+      testpath.Append(fullPath);
 
       // Test if the path exists
       if (TryChDirAuto((const char *) testpath, filename))
@@ -1391,12 +1409,17 @@
 
   csScopedMutexLock lock (mutex);
 
-  VfsNode *node = GetParentDirectoryNode(FileName, false);
+  csString fullPath = _ExpandPath(FileName);
+  
+  if (fullPath.IsEmpty())
+    return false;
 
+  VfsNode *node = GetParentDirectoryNode(fullPath, false);
+
   if (!node)
     return false;
 
-  return node->GetFileTime(FileName, oTime);
+  return node->GetFileTime(fullPath, oTime);
 }		
 
 bool csVFS::SetFileTime (const char *FileName, const csFileTime &iTime)
@@ -1406,12 +1429,17 @@
 
   csScopedMutexLock lock (mutex);
 
-  VfsNode *node = GetParentDirectoryNode(FileName, false);
+  csString fullPath = _ExpandPath(FileName);
+  
+  if (fullPath.IsEmpty())
+    return false;
 
+  VfsNode *node = GetParentDirectoryNode(fullPath, false);
+
   if (!node)
     return false;
 
-  return node->SetFileTime(FileName, iTime);
+  return node->SetFileTime(fullPath, iTime);
 }
 
 bool csVFS::GetFileSize (const char *FileName, size_t &oSize)
@@ -1421,12 +1449,17 @@
 
   csScopedMutexLock lock (mutex);
 
-  VfsNode *node = GetParentDirectoryNode(FileName, false);
+  csString fullPath = _ExpandPath(FileName);
+  
+  if (fullPath.IsEmpty())
+    return false;
 
+  VfsNode *node = GetParentDirectoryNode(fullPath, false);
+
   if (!node)
     return false;
 
-  return node->GetFileSize(FileName, oSize);
+  return node->GetFileSize(fullPath, oSize);
 }
 
 csPtr<iDataBuffer> csVFS::GetRealPath (const char *FileName)
@@ -1435,11 +1468,17 @@
     csPtr<iDataBuffer> (0);
 
   csScopedMutexLock lock (mutex);
-  VfsNode *node = GetDirectoryNode(FileName);
 
+  csString fullPath = _ExpandPath(FileName);
+  
+  if (fullPath.IsEmpty())
+    fullPath = "/";
+
+  VfsNode *node = GetDirectoryNode(fullPath);
+
   if (!node)
   {
-    node = GetParentDirectoryNode(FileName, false);
+    node = GetParentDirectoryNode(fullPath, false);
     if (!node)
       return csPtr<iDataBuffer> (0);
   }
@@ -1447,7 +1486,7 @@
   csString path;
   
   // Try get the real path
-  if (!node->GetRealPath(ExtractFileName(FileName), path))
+  if (!node->GetRealPath(ExtractFileName(fullPath), path))
      return csPtr<iDataBuffer> (0);
 
   return csPtr<iDataBuffer> (new csDataBuffer (
@@ -1480,8 +1519,13 @@
   {
     csScopedMutexLock lock (mutex);
 
+    csString fullPath = _ExpandPath(VirtualPath);
+  
+    if (fullPath.IsEmpty())
+      fullPath = "/";
+
     // Find the node
-    VfsNode *node = GetDirectoryNode(VirtualPath);
+    VfsNode *node = GetDirectoryNode(fullPath);
   
     if (node)
     {
@@ -1521,7 +1565,7 @@
   if (!node)
   {
     // Create the node
-	  csString tmp = Link;
+	  csString tmp = _ExpandPath(Link);
 
     // Remove trailing slash
     if (tmp.GetAt(tmp.Length() - 1) == VFS_PATH_SEPARATOR)
@@ -1606,19 +1650,6 @@
 
   while(counter < directories.Length() - 1)
   {
-    if (strcmp (directories[counter], "..") == 0)
-    {
-      if (node->ParentNode)
-        node = node->ParentNode;
-
-      counter++;
-      continue;
-    }
-    else if (strcmp (directories[counter], ".") == 0)
-    {
-      counter++;
-      continue;
-    }
     currentDir.Append(VFS_PATH_SEPARATOR);
 	  currentDir.Append(directories[counter]);
 
@@ -1699,6 +1730,12 @@
   csStringArray Directories;
   if (cmdline)
   {
+    // Try and mount the user directory
+    if (vfs->Mount("/mnt/user", csGetPlatformConfigPath("", false)))
+	  {
+      // Add it to the directory list
+		  Directories.Push("/mnt/user");
+	  }
     // Try and mount the resource directory
     if (vfs->Mount("/mnt/resource", cmdline->GetResourceDir()))
 	  {
@@ -1711,6 +1748,25 @@
       // Add it to the directory list
 		  Directories.Push("/mnt/app");
 	  }
+
+    // Try and mount the install directory
+    csPathsList* installdirs = csInstallationPathsHelper::GetPlatformInstallationPaths();
+
+    bool mounted = false;
+    for (size_t i = 0; i < installdirs->Length(); i++)
+    {
+      csPathsList::Entry const& installPath = (*installdirs)[i];
+      if (vfs->Mount("/mnt/install", installPath.path))
+	    {
+        mounted = true;
+	    }
+    }
+
+    if (mounted)
+	  {
+      // Add it to the directory list
+		  //Directories.Push("/mnt/install");
+	  }
   }
 
   // An iterator to iterate through directories

Modified: CS/branches/soc/vfs/plugins/filesys/vfs/vfs.h
===================================================================
--- CS/branches/soc/vfs/plugins/filesys/vfs/vfs.h	2006-07-27 11:11:13 UTC (rev 24974)
+++ CS/branches/soc/vfs/plugins/filesys/vfs/vfs.h	2006-07-27 14:56:14 UTC (rev 24975)
@@ -139,6 +139,7 @@
 
   /// Save current configuration back into configuration file
   virtual bool SaveMounts (const char *FileName);
+  
   /// Load a configuration file
   virtual bool LoadMountsFromFile (iConfigFile* file);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

On 25.07.2006 21:39, crystal-manage@... wrote:
>    trunk/artsource/models/flesh-spider/textures/.WorkerUV.jpg.autosave.=
kra
>    trunk/artsource/models/flesh-spider/textures/Worker-Spec.png~
>    trunk/artsource/models/flesh-spider/textures/WorkerUV.jpg~
>    trunk/artsource/models/flesh-spider/textures/WorkerUV.png~

Those are backup files and don't belong into a repository.

>    trunk/artsource/models/flesh-spider/textures/BoilerPlateNor.dds

You're compressing normal maps with DXT - don't; for an explanation why,
read http://developer.nvidia.com/object/bump_map_compression.html .

-f.r.

Revision: 24965
Author:   res2002
Date:     2006-07-25 14:46:22 -0700 (Tue, 25 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24965&view=rev

Log Message:
-----------
res unmerged the changes from r24885:24886 ("res disabled 
  RTLD_GLOBAL for unix plugin loading again...") since the original
  issue was solved in a different way. RTLD_GLOBAL is at least needed
  for python as well.

Modified Paths:
--------------
    CS/trunk/configure
    CS/trunk/docs/history.txt
    CS/trunk/libs/csutil/unix/loadlib.cpp
    CS/trunk/mk/autoconf/checkopengl.m4
    CS/trunk/plugins/video/canvas/openglx/Jamfile
    CS/trunk/plugins/video/canvas/openglx/glx2d.cpp
    CS/trunk/plugins/video/canvas/openglx/glx2d.h
Modified: CS/trunk/configure
===================================================================
--- CS/trunk/configure	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/configure	2006-07-25 21:46:22 UTC (rev 24965)
@@ -24527,19 +24527,6 @@
 
 fi
 
-    # Extract the GL library name
-    if test "x$cs_cv_libgl" = "xyes"; then
-  gl_plat_libs_trimmed=`echo x$cs_gl_plat_libs | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
-        libgl_name=`echo $cs_cv_libgl_libs | sed "s/$gl_plat_libs_trimmed//" | sed 's/-l//'`
-        cs_build_prop_val="$libgl_name"
-    cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`
-    if test -n "$cs_build_prop_val"; then
-  cs_jamconfig_text="${cs_jamconfig_text}GL.LIBNAME ?= \"$cs_build_prop_val\" ;
-"
-fi
-
-fi
-
 if test $cs_cv_libgl = yes; then
   # Check for GLhandleARB.
     if test "" != yes; then

Modified: CS/trunk/docs/history.txt
===================================================================
--- CS/trunk/docs/history.txt	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/docs/history.txt	2006-07-25 21:46:22 UTC (rev 24965)
@@ -14,6 +14,10 @@
 	    - plugins/engine/renderloop/
 	    - plugins/sequence/
 	- res reworked the "Mesa DRI DXT upload only" support.
+	- res unmerged the changes from r24885:24886 ("res disabled 
+	  RTLD_GLOBAL for unix plugin loading again...") since the original
+	  issue was solved in a different way. RTLD_GLOBAL is at least needed
+	  for python as well.
 24-Jul-2006
 	- Jorrit documented the new -cfgfile and -cfgset commandline
 	  options and also added documentation for a few other commonly

Modified: CS/trunk/libs/csutil/unix/loadlib.cpp
===================================================================
--- CS/trunk/libs/csutil/unix/loadlib.cpp	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/libs/csutil/unix/loadlib.cpp	2006-07-25 21:46:22 UTC (rev 24965)
@@ -28,12 +28,12 @@
 
 #ifdef CS_DEBUG
 #  ifdef CS_HAVE_RTLD_NOW
-#    define DLOPEN_MODE   RTLD_NOW //| RTLD_GLOBAL	// handy for debugging
+#    define DLOPEN_MODE   RTLD_NOW | RTLD_GLOBAL	// handy for debugging
 #  else
-#    define DLOPEN_MODE   RTLD_LAZY //| RTLD_GLOBAL
+#    define DLOPEN_MODE   RTLD_LAZY | RTLD_GLOBAL
 #  endif
 #else
-#  define DLOPEN_MODE   RTLD_LAZY //| RTLD_GLOBAL
+#  define DLOPEN_MODE   RTLD_LAZY | RTLD_GLOBAL
 #endif
 
 csLibraryHandle csLoadLibrary (const char* iName)

Modified: CS/trunk/mk/autoconf/checkopengl.m4
===================================================================
--- CS/trunk/mk/autoconf/checkopengl.m4	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/mk/autoconf/checkopengl.m4	2006-07-25 21:46:22 UTC (rev 24965)
@@ -126,12 +126,7 @@
 	CS_CREATE_TUPLE([],[],[-lgl]) \
 	$cs_mesa_gl], [],
 	[CS_EMIT_BUILD_RESULT([cs_cv_libgl], [GL])], [], [],
-	[$cs_gl_plat_cflags], [$cs_gl_plat_lflags], [$cs_gl_plat_libs])
-    # Extract the GL library name
-    AS_IF([test "x$cs_cv_libgl" = "xyes"],
-        [gl_plat_libs_trimmed=CS_TRIM([$cs_gl_plat_libs])
-        libgl_name=`echo $cs_cv_libgl_libs | sed "s/$gl_plat_libs_trimmed//" | sed 's/-l//'`
-        CS_EMIT_BUILD_PROPERTY([GL.LIBNAME], [$libgl_name])])])
+	[$cs_gl_plat_cflags], [$cs_gl_plat_lflags], [$cs_gl_plat_libs])])
 
 
 #------------------------------------------------------------------------------

Modified: CS/trunk/plugins/video/canvas/openglx/Jamfile
===================================================================
--- CS/trunk/plugins/video/canvas/openglx/Jamfile	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/plugins/video/canvas/openglx/Jamfile	2006-07-25 21:46:22 UTC (rev 24965)
@@ -2,13 +2,9 @@
 
 if $(GLX.AVAILABLE) = "yes"
 {
-  Description glx2d : "GL/X 2D driver" ;
-  Plugin glx2d : [ Wildcard *.cpp *.h ] ;
-  LinkWith glx2d : crystalspace_opengl crystalspace ;
-  ExternalLibs glx2d : GLX ;
-  if $(GL.LIBNAME)
-  {
-    CFlags glx2d : [ FDefines "LIBGL_NAME=\"\\\"$(GL.LIBNAME)\\\"\"" ] ;
-  }
-  CompileGroups glx2d : canvases openglcanvas ;
+Description glx2d : "GL/X 2D driver" ;
+Plugin glx2d : [ Wildcard *.cpp *.h ] ;
+LinkWith glx2d : crystalspace_opengl crystalspace ;
+ExternalLibs glx2d : GLX ;
+CompileGroups glx2d : canvases openglcanvas ;
 }

Modified: CS/trunk/plugins/video/canvas/openglx/glx2d.cpp
===================================================================
--- CS/trunk/plugins/video/canvas/openglx/glx2d.cpp	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/plugins/video/canvas/openglx/glx2d.cpp	2006-07-25 21:46:22 UTC (rev 24965)
@@ -33,8 +33,6 @@
 #include "iutil/objreg.h"
 #include "ivaria/reporter.h"
 
-#include <dlfcn.h>
-
 CS_IMPLEMENT_PLUGIN
 
 SCF_IMPLEMENT_FACTORY (csGraphics2DGLX)
@@ -44,7 +42,7 @@
 
 // csGraphics2DGLX function
 csGraphics2DGLX::csGraphics2DGLX (iBase *iParent) :
-  scfImplementationType (this, iParent), cmap (0), hardwareaccelerated(false), libGL (0)
+  scfImplementationType (this, iParent), cmap (0), hardwareaccelerated(false)
 {
 }
 
@@ -69,21 +67,6 @@
   dispdriver = 0;
   xvis = 0;
   hardwareaccelerated = false;
-  
-#ifdef LIBGL_NAME
-  /* HACK: Work around issue where DRI drivers fail to load.
-   * If RTLD_GLOBAL is not defined, DRI drivers may not find some symbols
-   * exported from libGL, and hence not load. Previously, RTLD_GLOBAL was
-   * set on plugin loading; however, this has a couple of wacky, undesired
-   * side effects - like symbols, supposed to be from static libraries, 
-   * being imported from other modules, causing side effects like memory
-   * allocation not being from the same module any more.
-   * To avoid using RTLD_GLOBAL for plugins, but nevertheless allow DRI 
-   * drivers to work, we hack around this by manually loading libGL with
-   * RTLD_GLOBAL. This is enough to satisfy the DRI drivers.
-   */
-  libGL = dlopen ("lib" LIBGL_NAME ".so", RTLD_LAZY | RTLD_GLOBAL);
-#endif
 
   if (!csGraphics2DGLCommon::Initialize (object_reg))
     return false;
@@ -149,7 +132,6 @@
   // Destroy your graphic interface
   XFree ((void*)xvis);
   Close ();
-  if (libGL) dlclose (libGL);
 }
 
 bool csGraphics2DGLX::Open()

Modified: CS/trunk/plugins/video/canvas/openglx/glx2d.h
===================================================================
--- CS/trunk/plugins/video/canvas/openglx/glx2d.h	2006-07-25 21:35:54 UTC (rev 24964)
+++ CS/trunk/plugins/video/canvas/openglx/glx2d.h	2006-07-25 21:46:22 UTC (rev 24965)
@@ -29,9 +29,7 @@
 
 #include "iogldisp.h"
 
-#ifndef XK_MISCELLANY
 #define XK_MISCELLANY 1
-#endif
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
@@ -50,9 +48,6 @@
   Colormap cmap;
   GLXContext active_GLContext;
   bool hardwareaccelerated;
-  
-  // Handle to loaded libGL.so (see remark in Initialize())
-  void* libGL;
 
   // we are using a specific displaydriver
   csRef<iOpenGLDisp> dispdriver;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 24982
Author:   res2002
Date:     2006-07-27 16:10:15 -0700 (Thu, 27 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/crystal/?rev=24982&view=rev

Log Message:
-----------
Reinstantiate accidentally deleted 'useAFP2D' block

Modified Paths:
--------------
    CS/trunk/data/config/gldrivers.xml
Modified: CS/trunk/data/config/gldrivers.xml
===================================================================
--- CS/trunk/data/config/gldrivers.xml	2006-07-27 21:45:26 UTC (rev 24981)
+++ CS/trunk/data/config/gldrivers.xml	2006-07-27 23:10:15 UTC (rev 24982)
@@ -219,6 +219,16 @@
         </ShaderManager>
       </Video>
     </config>
+    <config name="useAFP2D">
+      <Video>
+	<OpenGL>
+	  <FontCache>
+	    <UseAFP>yes</UseAFP>
+	  </FontCache>
+	  <AFPDrawPixmap>yes</AFPDrawPixmap>
+	</OpenGL>
+      </Video>
+    </config>
   </configs>
   <rules>
     <!-- rule description="Some more examples">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.