From 2a1f35a373213151ae3452af5054a6638ead6a66 Mon Sep 17 00:00:00 2001 From: "fransiskusx@google.com" Date: Thu, 9 Sep 2010 16:35:34 +0000 Subject: Further integration of 2D mode. This change supports calltype=v, transparancy, and image transformation. Currently only support Linux and compiled when renderer = cairo. TEST= I compiled with renderer = cairo and it worked. Also I compiled with renderer = gl and it worked. BUG=none Review URL: http://codereview.chromium.org/3272003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58946 0039d316-1c4b-4281-b951-d872f2087c98 --- o3d/converter/cross/converter.cc | 3 ++- o3d/converter/cross/renderer_stub.cc | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'o3d/converter') diff --git a/o3d/converter/cross/converter.cc b/o3d/converter/cross/converter.cc index 4726392..84ebae7 100644 --- a/o3d/converter/cross/converter.cc +++ b/o3d/converter/cross/converter.cc @@ -37,6 +37,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/scoped_ptr.h" +#include "converter/cross/renderer_stub.h" #include "core/cross/class_manager.h" #include "core/cross/client.h" #include "core/cross/client_info.h" @@ -279,7 +280,7 @@ bool Convert(const FilePath& in_filename, ErrorCollector error_collector(&service_locator); scoped_ptr renderer( - Renderer::CreateDefaultRenderer(&service_locator)); + RendererStub::CreateDefault(&service_locator)); renderer->InitCommon(); Pack::Ref pack(object_manager.CreatePack()); diff --git a/o3d/converter/cross/renderer_stub.cc b/o3d/converter/cross/renderer_stub.cc index ba0ffd8..0155068 100644 --- a/o3d/converter/cross/renderer_stub.cc +++ b/o3d/converter/cross/renderer_stub.cc @@ -211,10 +211,4 @@ const int* RendererStub::GetRGBAUByteNSwizzleTable() { return swizzle_table; } -// This is a factory function for creating Renderer objects. Since -// we're implementing a stub renderer, we only ever return a stub renderer. -Renderer* Renderer::CreateDefaultRenderer(ServiceLocator* service_locator) { - return RendererStub::CreateDefault(service_locator); -} - } // namespace o3d -- cgit v1.1