[simspark-cvs] simspark/spark/kerosin Makefile.am, 1.7, 1.8 kerosin.cpp, 1.2, 1.3 kerosin.h, 1.2, 1.3 kerosin.rb, 1.1, 1.2

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/kerosin
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21072/kerosin

Modified Files:
	Makefile.am kerosin.cpp kerosin.h kerosin.rb 
Log Message:
merge from projectx branch

Index: kerosin.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kerosin.cpp	15 Mar 2007 07:26:25 -0000	1.2
--- kerosin.cpp	17 Jun 2007 13:38:29 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(OpenGLSystem), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(BaseRenderServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(RenderServer), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(RenderControl), "kerosin/");
***************
*** 50,54 ****
--- 51,57 ----
      zg.GetCore()->RegisterClassObject(new CLASS(Material), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(Material2DTexture), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(MaterialExternal), "kerosin/");
      zg.GetCore()->RegisterClassObject(new CLASS(MaterialSolid), "kerosin/");
+     zg.GetCore()->RegisterClassObject(new CLASS(MaterialExporter), "kerosin/");
  
      // scene graph
***************
*** 61,64 ****
--- 64,68 ----
      zg.GetCore()->RegisterClassObject(new CLASS(Sphere), "kerosin/");
  
+     // std::cerr << "Kerosin run init script\n";
      // load default setting
      zg.GetCore()->GetRoot()->GetScript()->RunInitScript

Index: Makefile.am
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	15 Mar 2007 07:26:25 -0000	1.7
--- Makefile.am	17 Jun 2007 13:38:29 -0000	1.8
***************
*** 3,7 ****
  pkglib_LTLIBRARIES = libkerosin_debug.la
  libkerosin_debug_la_SOURCES = $(sources) 
- # nodist_libkerosin_debug_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_debug_la_CXXFLAGS = -O -g -W -Wall
  libkerosin_debug_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
--- 3,6 ----
***************
*** 10,14 ****
  pkglib_LTLIBRARIES = libkerosin.la
  libkerosin_la_SOURCES = $(sources) 
- # nodist_libkerosin_la_SOURCES = openglserver/glextensionreg.cpp
  libkerosin_la_CXXFLAGS = -O2
  libkerosin_la_LIBADD = @FREETYPE_LIBADD@ @SDL_LIBADD@ @IL_LIBADD@ @GL_LIBADD@
--- 9,12 ----
***************
*** 18,33 ****
  bin_SCRIPTS = kerosin-config
  
- # BUILT_SOURCES = openglserver/glextensionreg.h
- # nobase_nodist_libpkginclude_HEADERS = openglserver/glextensionreg.h
- 
- # openglserver/glextensionreg.cpp: ${top_srcdir}/utility/glextgen/glextensionreg.cpp
- # 	@echo "Copying generated glextension sources"
- # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.cpp $@
- 
- # openglserver/glextensionreg.h: ${top_srcdir}/utility/glextgen/glextensionreg.h
- # 	cp ${top_srcdir}/utility/glextgen/glextensionreg.h $@
- 
- # ${top_srcdir}/utility/glextgen/glextensionreg.cpp ${top_srcdir}/utility/glextgen/glextensionreg.h:
- # 	cd ${top_srcdir}/utility/glextgen/ && $(MAKE) $(AM_MAKEFLAGS) all
  endif
  
--- 16,19 ----
***************
*** 68,75 ****
--- 54,64 ----
  materialserver/material2dtexture.cpp \
  materialserver/material2dtexture_c.cpp \
+ materialserver/materialexternal.cpp \
+ materialserver/materialexternal_c.cpp \
  materialserver/materialsolid.cpp \
  materialserver/materialsolid_c.cpp \
  materialserver/materialserver.cpp \
  materialserver/materialserver_c.cpp \
+ materialserver/materialexporter_c.cpp \
  sceneserver/axis.cpp \
  sceneserver/axis_c.cpp \
***************
*** 97,100 ****
--- 86,91 ----
  openglserver/openglserver_c.cpp \
  openglserver/openglsystem_c.cpp \
+ renderserver/baserenderserver.cpp \
+ renderserver/baserenderserver_c.cpp \
  renderserver/renderserver.cpp \
  renderserver/renderserver_c.cpp \
***************
*** 128,132 ****
--- 119,125 ----
  sceneserver/helper/nv_math/nv_mathdecl.h \
  materialserver/material2dtexture.h \
+ materialserver/materialexternal.h \
  materialserver/materialsolid.h \
+ materialserver/materialexporter.h \
  sceneserver/singlematnode.h \
  sceneserver/light.h \
***************
*** 148,151 ****
--- 141,145 ----
  openglserver/openglserver.h \
  openglserver/glbase.h \
+ renderserver/baserenderserver.h \
  renderserver/renderserver.h \
  renderserver/rendernode.h \

Index: kerosin.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** kerosin.h	15 Mar 2007 07:26:25 -0000	1.2
--- kerosin.h	17 Jun 2007 13:38:29 -0000	1.3
***************
*** 53,57 ****
--- 53,59 ----
  #include "materialserver/material.h"
  #include "materialserver/material2dtexture.h"
+ #include "materialserver/materialexternal.h"
  #include "materialserver/materialsolid.h"
+ #include "materialserver/materialexporter.h"
  
  // scene graph

Index: kerosin.rb
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/kerosin/kerosin.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** kerosin.rb	2 Jan 2006 20:39:41 -0000	1.1
--- kerosin.rb	17 Jun 2007 13:38:29 -0000	1.2
***************
*** 13,17 ****
  #
  
! createVariable('Application.Title', 'Kerosin');
  
  
--- 13,17 ----
  #
  
! createVariable('Application.Title', 'SimSpark');