| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   57 #include "core/cross/event.h" |   57 #include "core/cross/event.h" | 
|   58 #include "core/cross/event_callback.h" |   58 #include "core/cross/event_callback.h" | 
|   59 #include "core/cross/event_manager.h" |   59 #include "core/cross/event_manager.h" | 
|   60 #include "core/cross/lost_resource_callback.h" |   60 #include "core/cross/lost_resource_callback.h" | 
|   61 #include "core/cross/render_event.h" |   61 #include "core/cross/render_event.h" | 
|   62 #include "core/cross/render_surface.h" |   62 #include "core/cross/render_surface.h" | 
|   63 #include "core/cross/tick_event.h" |   63 #include "core/cross/tick_event.h" | 
|   64 #include "core/cross/timer.h" |   64 #include "core/cross/timer.h" | 
|   65 #include "core/cross/timingtable.h" |   65 #include "core/cross/timingtable.h" | 
|   66 #include "core/cross/transform.h" |   66 #include "core/cross/transform.h" | 
 |   67 #include "core/cross/cairo/image_2d.h" | 
|   67  |   68  | 
|   68 namespace o3d { |   69 namespace o3d { | 
|   69 class MessageQueue; |   70 class MessageQueue; | 
|   70 class Profiler; |   71 class Profiler; | 
|   71 class State; |   72 class State; | 
|   72 class Pack; |   73 class Pack; | 
|   73  |   74  | 
|   74 // The Client class is the main point of entry to O3D.  It defines methods |   75 // The Client class is the main point of entry to O3D.  It defines methods | 
|   75 // for creating and deleting packs and internal use only methods for creating |   76 // for creating and deleting packs and internal use only methods for creating | 
|   76 // most objects. Each new object created by the Client is assigned a unique ID |   77 // most objects. Each new object created by the Client is assigned a unique ID | 
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  535  |  536  | 
|  536   RenderSurface::Ref offscreen_render_surface_; |  537   RenderSurface::Ref offscreen_render_surface_; | 
|  537   RenderDepthStencilSurface::Ref offscreen_depth_render_surface_; |  538   RenderDepthStencilSurface::Ref offscreen_depth_render_surface_; | 
|  538  |  539  | 
|  539   DISALLOW_COPY_AND_ASSIGN(Client); |  540   DISALLOW_COPY_AND_ASSIGN(Client); | 
|  540 };  // Client |  541 };  // Client | 
|  541  |  542  | 
|  542 }  // namespace o3d |  543 }  // namespace o3d | 
|  543  |  544  | 
|  544 #endif  // O3D_CORE_CROSS_CLIENT_H_ |  545 #endif  // O3D_CORE_CROSS_CLIENT_H_ | 
| OLD | NEW |