[pkg-fgfs-crew] r130 - in /simgear/trunk/simgear/scene/sky: Makefile.am Makefile.in bbcache.cxx bbcache.hxx cloud.cxx newcloud.hxx

[ovek at users.alioth.debian.org]

Author: ovek
Date: Thu Jul 21 03:12:43 2011
New Revision: 130

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=130
Log:
Backported bbcache part of upstream commit 49f418f146003dc092d16417faa1f60970de8b99
"Remove legacy direct-OpenGL code in simgear/screen (predating switch to OSG)."

Removed:
    simgear/trunk/simgear/scene/sky/bbcache.cxx
    simgear/trunk/simgear/scene/sky/bbcache.hxx
Modified:
    simgear/trunk/simgear/scene/sky/Makefile.am
    simgear/trunk/simgear/scene/sky/Makefile.in
    simgear/trunk/simgear/scene/sky/cloud.cxx
    simgear/trunk/simgear/scene/sky/newcloud.hxx

Modified: simgear/trunk/simgear/scene/sky/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/sky/Makefile.am?rev=130&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/sky/Makefile.am (original)
+++ simgear/trunk/simgear/scene/sky/Makefile.am Thu Jul 21 03:12:43 2011
@@ -10,7 +10,6 @@
 	sky.hxx \
 	sphere.hxx \
 	stars.hxx \
-	bbcache.hxx \
 	cloudfield.hxx \
 	newcloud.hxx \
 	CloudShaderGeometry.hxx
@@ -23,7 +22,6 @@
 	sky.cxx \
 	sphere.cxx \
 	stars.cxx \
-	bbcache.cxx \
 	cloudfield.cxx \
 	newcloud.cxx \
 	CloudShaderGeometry.cxx

Modified: simgear/trunk/simgear/scene/sky/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/sky/Makefile.in?rev=130&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/sky/Makefile.in (original)
+++ simgear/trunk/simgear/scene/sky/Makefile.in Thu Jul 21 03:12:43 2011
@@ -74,8 +74,8 @@
 libsgsky_a_LIBADD =
 am_libsgsky_a_OBJECTS = cloud.$(OBJEXT) dome.$(OBJEXT) moon.$(OBJEXT) \
 	oursun.$(OBJEXT) sky.$(OBJEXT) sphere.$(OBJEXT) \
-	stars.$(OBJEXT) bbcache.$(OBJEXT) cloudfield.$(OBJEXT) \
-	newcloud.$(OBJEXT) CloudShaderGeometry.$(OBJEXT)
+	stars.$(OBJEXT) cloudfield.$(OBJEXT) newcloud.$(OBJEXT) \
+	CloudShaderGeometry.$(OBJEXT)
 libsgsky_a_OBJECTS = $(am_libsgsky_a_OBJECTS)
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/simgear
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -220,7 +220,6 @@
 	sky.hxx \
 	sphere.hxx \
 	stars.hxx \
-	bbcache.hxx \
 	cloudfield.hxx \
 	newcloud.hxx \
 	CloudShaderGeometry.hxx
@@ -233,7 +232,6 @@
 	sky.cxx \
 	sphere.cxx \
 	stars.cxx \
-	bbcache.cxx \
 	cloudfield.cxx \
 	newcloud.cxx \
 	CloudShaderGeometry.cxx
@@ -317,7 +315,6 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CloudShaderGeometry.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bbcache.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cloud.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cloudfield.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dome.Po at am__quote@

Modified: simgear/trunk/simgear/scene/sky/cloud.cxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/sky/cloud.cxx?rev=130&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/sky/cloud.cxx (original)
+++ simgear/trunk/simgear/scene/sky/cloud.cxx Thu Jul 21 03:12:43 2011
@@ -54,6 +54,7 @@
 #include <simgear/scene/model/model.hxx>
 #include <simgear/scene/util/RenderConstants.hxx>
 #include <simgear/scene/util/StateAttributeFactory.hxx>
+#include <simgear/screen/extensions.hxx>
 #include <simgear/math/polar3d.hxx>
 
 #include "newcloud.hxx"

Modified: simgear/trunk/simgear/scene/sky/newcloud.hxx
URL: http://svn.debian.org/wsvn/pkg-fgfs/simgear/trunk/simgear/scene/sky/newcloud.hxx?rev=130&op=diff
==============================================================================
--- simgear/trunk/simgear/scene/sky/newcloud.hxx (original)
+++ simgear/trunk/simgear/scene/sky/newcloud.hxx Thu Jul 21 03:12:43 2011
@@ -28,8 +28,6 @@
 #include <string>
 #include <vector>
 #include <osg/Fog>
-
-#include "bbcache.hxx"
 
 #include <simgear/scene/material/Effect.hxx>
 #include <simgear/scene/material/EffectGeode.hxx>