| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 30 */ | 30 */ |
| 31 | 31 |
| 32 | 32 |
| 33 // Contains windows-specific code for setting up the Client object | 33 // Contains windows-specific code for setting up the Client object |
| 34 // used in the unit tests. Defines WinMain and a WindowProc for running | 34 // used in the unit tests. Defines WinMain and a WindowProc for running |
| 35 // the GUnit tests | 35 // the GUnit tests |
| 36 | 36 |
| 37 #include "core/cross/client_info.h" |
| 37 #include "core/cross/class_manager.h" | 38 #include "core/cross/class_manager.h" |
| 38 #include "core/cross/evaluation_counter.h" | 39 #include "core/cross/evaluation_counter.h" |
| 39 #include "core/cross/install_check.h" | 40 #include "core/cross/install_check.h" |
| 40 #include "core/cross/features.h" | 41 #include "core/cross/features.h" |
| 41 #include "core/cross/object_manager.h" | 42 #include "core/cross/object_manager.h" |
| 42 #include "core/cross/profiler.h" | 43 #include "core/cross/profiler.h" |
| 43 #include "core/cross/renderer.h" | 44 #include "core/cross/renderer.h" |
| 44 #include "core/cross/renderer_platform.h" | 45 #include "core/cross/renderer_platform.h" |
| 45 #include "core/cross/service_locator.h" | 46 #include "core/cross/service_locator.h" |
| 46 #include "core/cross/types.h" | 47 #include "core/cross/types.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 } | 83 } |
| 83 | 84 |
| 84 g_program_path = &program_path; | 85 g_program_path = &program_path; |
| 85 g_program_name = &program_name; | 86 g_program_name = &program_name; |
| 86 | 87 |
| 87 o3d::ServiceLocator service_locator; | 88 o3d::ServiceLocator service_locator; |
| 88 g_service_locator = &service_locator; | 89 g_service_locator = &service_locator; |
| 89 | 90 |
| 90 o3d::EvaluationCounter evaluation_counter(g_service_locator); | 91 o3d::EvaluationCounter evaluation_counter(g_service_locator); |
| 91 o3d::ClassManager class_manager(g_service_locator); | 92 o3d::ClassManager class_manager(g_service_locator); |
| 93 o3d::ClientInfoManager client_info_manager(g_service_locator); |
| 92 o3d::ObjectManager object_manager(g_service_locator); | 94 o3d::ObjectManager object_manager(g_service_locator); |
| 93 o3d::Profiler profiler(g_service_locator); | 95 o3d::Profiler profiler(g_service_locator); |
| 94 o3d::Features features(g_service_locator); | 96 o3d::Features features(g_service_locator); |
| 95 | 97 |
| 96 // create a renderer device based on the current platform | 98 // create a renderer device based on the current platform |
| 97 g_renderer = o3d::Renderer::CreateDefaultRenderer(g_service_locator); | 99 g_renderer = o3d::Renderer::CreateDefaultRenderer(g_service_locator); |
| 98 | 100 |
| 99 g_display = ::XOpenDisplay(0); | 101 g_display = ::XOpenDisplay(0); |
| 100 int attribs[] = { | 102 int attribs[] = { |
| 101 GLX_RGBA, | 103 GLX_RGBA, |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 g_renderer = NULL; | 162 g_renderer = NULL; |
| 161 | 163 |
| 162 delete display_window; | 164 delete display_window; |
| 163 g_display_window = NULL; | 165 g_display_window = NULL; |
| 164 g_program_path = NULL; | 166 g_program_path = NULL; |
| 165 g_program_name = NULL; | 167 g_program_name = NULL; |
| 166 ::XCloseDisplay(g_display); | 168 ::XCloseDisplay(g_display); |
| 167 | 169 |
| 168 return ret; | 170 return ret; |
| 169 } | 171 } |
| OLD | NEW |