rename TinyGL -> TinyPanda

This commit is contained in:
David Rose 2009-02-02 19:05:58 +00:00
parent a471d9f92b
commit 1aa39d8088
17 changed files with 36 additions and 45 deletions

View File

@ -118,7 +118,7 @@ init_libtinydisplay() {
TinyTextureContext::init_type(); TinyTextureContext::init_type();
PandaSystem *ps = PandaSystem::get_global_ptr(); PandaSystem *ps = PandaSystem::get_global_ptr();
ps->add_system("TinyGL"); ps->add_system("TinyPanda");
GraphicsPipeSelection *selection = GraphicsPipeSelection::get_global_ptr(); GraphicsPipeSelection *selection = GraphicsPipeSelection::get_global_ptr();
@ -127,7 +127,7 @@ init_libtinydisplay() {
TinyXGraphicsWindow::init_type(); TinyXGraphicsWindow::init_type();
selection->add_pipe_type(TinyXGraphicsPipe::get_class_type(), selection->add_pipe_type(TinyXGraphicsPipe::get_class_type(),
TinyXGraphicsPipe::pipe_constructor); TinyXGraphicsPipe::pipe_constructor);
ps->set_system_tag("TinyGL", "native_window_system", "X"); ps->set_system_tag("TinyPanda", "native_window_system", "X");
#endif #endif
#ifdef WIN32 #ifdef WIN32
@ -135,7 +135,7 @@ init_libtinydisplay() {
TinyWinGraphicsWindow::init_type(); TinyWinGraphicsWindow::init_type();
selection->add_pipe_type(TinyWinGraphicsPipe::get_class_type(), selection->add_pipe_type(TinyWinGraphicsPipe::get_class_type(),
TinyWinGraphicsPipe::pipe_constructor); TinyWinGraphicsPipe::pipe_constructor);
ps->set_system_tag("TinyGL", "native_window_system", "Win"); ps->set_system_tag("TinyPanda", "native_window_system", "Win");
#endif #endif
#ifdef IS_OSX #ifdef IS_OSX
@ -143,7 +143,7 @@ init_libtinydisplay() {
TinyOsxGraphicsWindow::init_type(); TinyOsxGraphicsWindow::init_type();
selection->add_pipe_type(TinyOsxGraphicsPipe::get_class_type(), selection->add_pipe_type(TinyOsxGraphicsPipe::get_class_type(),
TinyOsxGraphicsPipe::pipe_constructor); TinyOsxGraphicsPipe::pipe_constructor);
ps->set_system_tag("TinyGL", "OSX", "OSX"); ps->set_system_tag("TinyPanda", "native_window_system", "OSX");
#endif #endif
#ifdef HAVE_SDL #ifdef HAVE_SDL
@ -151,7 +151,7 @@ init_libtinydisplay() {
TinySDLGraphicsWindow::init_type(); TinySDLGraphicsWindow::init_type();
selection->add_pipe_type(TinySDLGraphicsPipe::get_class_type(), selection->add_pipe_type(TinySDLGraphicsPipe::get_class_type(),
TinySDLGraphicsPipe::pipe_constructor); TinySDLGraphicsPipe::pipe_constructor);
ps->set_system_tag("TinyGL", "SDL", "SDL"); ps->set_system_tag("TinyPanda", "SDL", "SDL");
#endif #endif
} }

View File

@ -7,7 +7,7 @@ void gl_fatal_error(char *format, ...)
va_start(ap,format); va_start(ap,format);
fprintf(stderr,"TinyGL: fatal error: "); fprintf(stderr,"TinyPanda: fatal error: ");
vfprintf(stderr,format,ap); vfprintf(stderr,format,ap);
fprintf(stderr,"\n"); fprintf(stderr,"\n");
exit(1); exit(1);

View File

@ -54,23 +54,6 @@ munge_format_impl(const GeomVertexFormat *orig,
PT(GeomVertexFormat) new_format = new GeomVertexFormat(*orig); PT(GeomVertexFormat) new_format = new GeomVertexFormat(*orig);
new_format->set_animation(animation); new_format->set_animation(animation);
/*
const GeomVertexColumn *color_type = orig->get_color_column();
if (color_type != (GeomVertexColumn *)NULL &&
color_type->get_numeric_type() == NT_packed_dabc) {
// We need to convert the color format; OpenGL doesn't support the
// byte order of DirectX's packed ARGB format.
int color_array = orig->get_array_with(InternalName::get_color());
PT(GeomVertexArrayFormat) new_array_format = new_format->modify_array(color_array);
// Replace the existing color format with the new format.
new_array_format->add_column
(InternalName::get_color(), 4, NT_uint8,
C_color, color_type->get_start());
}
*/
CPT(GeomVertexFormat) format = GeomVertexFormat::register_format(new_format); CPT(GeomVertexFormat) format = GeomVertexFormat::register_format(new_format);
return format; return format;

View File

@ -23,8 +23,9 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyGeomMunger // Class : TinyGeomMunger
// Description : This specialization on GeomMunger finesses vertices // Description : This specialization on GeomMunger finesses vertices
// for TinyGL rendering. In particular, it makes sure // for TinyPanda rendering. This actually doesn't have
// colors aren't stored in DirectX's packed_argb format. // to do very much, since TinyPanda is not that
// particular.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyGeomMunger : public StandardMunger { class EXPCL_TINYDISPLAY TinyGeomMunger : public StandardMunger {
public: public:

View File

@ -2404,9 +2404,9 @@ set_scissor(float left, float right, float bottom, float top) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: TinyGraphicsStateGuardian::apply_texture // Function: TinyGraphicsStateGuardian::apply_texture
// Access: Protected // Access: Protected
// Description: Updates TinyGL with the current information for this // Description: Updates the graphics state with the current
// texture, and makes it the current texture available // information for this texture, and makes it the
// for rendering. // current texture available for rendering.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool TinyGraphicsStateGuardian:: bool TinyGraphicsStateGuardian::
apply_texture(TextureContext *tc) { apply_texture(TextureContext *tc) {
@ -2419,7 +2419,7 @@ apply_texture(TextureContext *tc) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: TinyGraphicsStateGuardian::upload_texture // Function: TinyGraphicsStateGuardian::upload_texture
// Access: Protected // Access: Protected
// Description: Uploads the texture image to TinyGL. // Description: Uploads the texture image to the graphics state.
// //
// The return value is true if successful, or false if // The return value is true if successful, or false if
// the texture has no image. // the texture has no image.

View File

@ -29,8 +29,16 @@ class TinyTextureContext;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyGraphicsStateGuardian // Class : TinyGraphicsStateGuardian
// Description : An interface to the TinyGL software rendering code // Description : An interface to the TinyPanda software rendering code
// within this module. // within this module.
//
// TinyPanda takes its name from TinyGL, the
// public-domain software renderer (see
// http://fabrice.bellard.free.fr/TinyGL/ ) from which
// this code originated. It has since been heavily
// modified, to integrate it closely with Panda, and to
// add additional features such as blending, filtering,
// and multitexturing.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyGraphicsStateGuardian : public GraphicsStateGuardian { class EXPCL_TINYDISPLAY TinyGraphicsStateGuardian : public GraphicsStateGuardian {
public: public:

View File

@ -54,7 +54,7 @@ TinyOsxGraphicsPipe::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string TinyOsxGraphicsPipe:: string TinyOsxGraphicsPipe::
get_interface_name() const { get_interface_name() const {
return "TinyGL OSX"; return "TinyPanda";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -30,8 +30,7 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyOsxGraphicsPipe // Class : TinyOsxGraphicsPipe
// Description : This graphics pipe represents the interface for // Description : This graphics pipe represents the interface for
// creating TinyGL graphics windows on a Windows-based // creating TinyPanda graphics windows on a Mac client.
// client.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyOsxGraphicsPipe : public GraphicsPipe { class EXPCL_TINYDISPLAY TinyOsxGraphicsPipe : public GraphicsPipe {
public: public:

View File

@ -27,8 +27,8 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyOsxGraphicsWindow // Class : TinyOsxGraphicsWindow
// Description : Opens a window on OS X to display the TinyGL software // Description : Opens a window on OS X to display the TinyPanda
// rendering. // software rendering.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class TinyOsxGraphicsWindow : public GraphicsWindow { class TinyOsxGraphicsWindow : public GraphicsWindow {
public: public:

View File

@ -66,7 +66,7 @@ TinySDLGraphicsPipe::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string TinySDLGraphicsPipe:: string TinySDLGraphicsPipe::
get_interface_name() const { get_interface_name() const {
return "TinyGL SDL"; return "TinyPanda";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -27,7 +27,7 @@ class FrameBufferProperties;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinySDLGraphicsPipe // Class : TinySDLGraphicsPipe
// Description : This graphics pipe manages SDL windows for rendering // Description : This graphics pipe manages SDL windows for rendering
// TinyGL software buffers. // TinyPanda software buffers.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinySDLGraphicsPipe : public GraphicsPipe { class EXPCL_TINYDISPLAY TinySDLGraphicsPipe : public GraphicsPipe {
public: public:

View File

@ -54,7 +54,7 @@ TinyWinGraphicsPipe::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string TinyWinGraphicsPipe:: string TinyWinGraphicsPipe::
get_interface_name() const { get_interface_name() const {
return "TinyGL Windows"; return "TinyPanda";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyWinGraphicsPipe // Class : TinyWinGraphicsPipe
// Description : This graphics pipe represents the interface for // Description : This graphics pipe represents the interface for
// creating TinyGL graphics windows on a Windows-based // creating TinyPanda graphics windows on a
// client. // Windows-based client.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyWinGraphicsPipe : public WinGraphicsPipe { class EXPCL_TINYDISPLAY TinyWinGraphicsPipe : public WinGraphicsPipe {
public: public:

View File

@ -25,7 +25,7 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyWinGraphicsWindow // Class : TinyWinGraphicsWindow
// Description : Opens a window on Microsoft Windows to display the // Description : Opens a window on Microsoft Windows to display the
// TinyGL software rendering. // TinyPanda software rendering.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyWinGraphicsWindow : public WinGraphicsWindow { class EXPCL_TINYDISPLAY TinyWinGraphicsWindow : public WinGraphicsWindow {
public: public:

View File

@ -148,7 +148,7 @@ TinyXGraphicsPipe::
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
string TinyXGraphicsPipe:: string TinyXGraphicsPipe::
get_interface_name() const { get_interface_name() const {
return "TinyGL X11"; return "TinyPanda";
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

View File

@ -46,7 +46,7 @@ typedef int XIC;
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyXGraphicsPipe // Class : TinyXGraphicsPipe
// Description : This graphics pipe represents the interface for // Description : This graphics pipe represents the interface for
// creating TinyGL graphics windows on an X11-based // creating TinyPanda graphics windows on an X11-based
// (e.g. Unix) client. // (e.g. Unix) client.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyXGraphicsPipe : public GraphicsPipe { class EXPCL_TINYDISPLAY TinyXGraphicsPipe : public GraphicsPipe {

View File

@ -25,8 +25,8 @@
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : TinyXGraphicsWindow // Class : TinyXGraphicsWindow
// Description : Opens a window on X11 to display the TinyGL software // Description : Opens a window on X11 to display the TinyPanda
// rendering. // software rendering.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
class EXPCL_TINYDISPLAY TinyXGraphicsWindow : public GraphicsWindow { class EXPCL_TINYDISPLAY TinyXGraphicsWindow : public GraphicsWindow {
public: public: