aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/games/jogl
Commit message (Collapse)AuthorAgeFilesLines
* Moved all functionality from GLContextFactory implementations into Kenneth Russel2005-07-1914-920/+89
| | | | | | | | | concrete GLDrawableFactory implementations. Made GLDrawableFactory abstract and added GLDrawableFactoryImpl to support creation of offscreen GLDrawables for non-pbuffer fallback path of GLJPanel. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@329 232f8b59-042b-4e1e-8c03-345bb8c30851
* Moved pbuffer creation support from MacOSXOnscreenGLDrawable toKenneth Russel2005-07-1814-213/+64
| | | | | | | | | | MacOSXGLContextFactory. This completes the transition from creating pbuffers as a subordinate object of a GLCanvas to creating them as standalone GLDrawables. Deleted code from GLAutoDrawable and all implementations related to pbuffer instantiation. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@328 232f8b59-042b-4e1e-8c03-345bb8c30851
* Moved support for instantiating GLPbuffers from X11OnscreenGLContextKenneth Russel2005-07-185-140/+216
| | | | | | | to X11GLContextFactory. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@327 232f8b59-042b-4e1e-8c03-345bb8c30851
* Implemented pbuffer instantiation support in GLDrawableFactory rather Kenneth Russel2005-07-1810-178/+211
| | | | | | | | than GLCanvas on Windows. Restructured GLJPanel and jogl-demos to use new APIs. Still needs to be ported to other platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@326 232f8b59-042b-4e1e-8c03-345bb8c30851
* Rewrote and refactored creation of dummy window and OpenGL context on Kenneth Russel2005-07-1715-569/+351
| | | | | | | | | | Windows to be encapsulated in WindowsDummyGLDrawable class. This is a prerequisite for implementing top-level pbuffer support in the GLDrawableFactory (i.e., not associated with a GLCanvas). Refactored context implementations further on all platforms. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@325 232f8b59-042b-4e1e-8c03-345bb8c30851
* Further context-related changes for the JSR-231 API. The GLContext Kenneth Russel2005-07-1740-2449/+3213
| | | | | | | | | | | | | | | | | | | | | | | implementations on all platforms have been split into orthogonal GLDrawable and GLContext concepts. It is now possible to create more than one GLContet per GLDrawable (though this has not been tested yet). GLCanvas has been reimplemented in terms of GLDrawableFactory.getGLDrawable(). More functionality has been moved from GLDrawable to GLAutoDrawable. Reimplemented lazy sending of reshape GLEventListener events in GLCanvas and GLJPanel and deleted notion of deferred reshapes from GLDrawableHelper and elsewhere. Sharing of textures and display lists is now expressed in terms of GLContexts instead of GLDrawables. Still need to move pbuffer creation into GLDrawableFactory from the onscreen GLContext implementations. Added option to gleem ExaminerViewer to disable automatic redraws upon mouse events and respecified more of gleem to work on GLAutoDrawables rather than GLDrawables. Updated all JOGL demos to work with new APIs and slightly different initialization sequences (in particular, for pbuffers -- this will change with the addition of GLDrawableFactory.createGLPbuffer()). git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@324 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Mac OS X port after initial GLContext changesKenneth Russel2005-07-102-1/+5
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@321 232f8b59-042b-4e1e-8c03-345bb8c30851
* Initial set of context-related changes for the JSR-231 API. GLContext Kenneth Russel2005-07-1030-1302/+1070
| | | | | | | | | | | | | | | has been exposed in the public API. The GLEventListener callback mechanism has been removed from the core GLContext implementation and moved up to a higher level. GLAutoDrawable now contains the GLEventListener-related methods, and the GLEventListener's methods now receive a GLAutoDrawable as argument. All JOGL demos have been updated for the new APIs. Many FIXMEs and much unimplemented functionality remain. There is slightly different initialization behavior for the demos containing pbuffers, and the deferring of reshape callbacks needs to be rethought. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@320 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Mac OS X port after GlueGen changes to add array offsetsKenneth Russel2005-07-082-2/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@319 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Windows port after changes to GlueGen to include array offsets. Kenneth Russel2005-07-083-17/+55
| | | | | | | | | | | Ported all demos to new API. Temporarily added back in GLU entry points taking primitive arrays as the underlying APIs (in particular, glTexImage2D) do not yet support non-direct Buffers. Changed C code generation to only add in array offset if array is non-null. Fixed bug in GLU tesselator demo's vertex callback. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@318 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with main trunk (tag JOGL_PRE_1_1_1)Kenneth Russel2005-07-0766-357/+738
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@317 232f8b59-042b-4e1e-8c03-345bb8c30851
* This putback adds array offsets to the public JOGL API. The offsets areTravis Bryson2005-06-2410-184/+161
| | | | | | | | | | | | | | | | | | | | | | | | respected and used properly in all of the public and private functions. The changes are in gluegen, so that the code is generated properly. And also throughout the parts of the jogl code that are not gluegen-generated. For the internally generated implementation methods, a "1" is added to the method names. So as to not overload the public API. This is similar to what is already done with Buffer APIs, which have a "0" added internally. I used a "1" instead of a "0" to avoid any collisions of the signatures, which could happen if a null object was sent down for the Array (e.g., the wrong method would get called). This should be a suitable foundation for the implementation to add the ability to wrap arrays in Buffers, which we plan to add to the implementation soon. These changes will cause all existing JOGL programs to break, although adapting them is pretty easy. We will later be putting back changed examples and utilities that incorporate these new APIs. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@313 232f8b59-042b-4e1e-8c03-345bb8c30851
* Modified Files:Travis Bryson2005-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jogl/make/gl-common.cfg jogl/make/gl-glx-common.cfg jogl/src/net/java/games/gluegen/opengl/JavaGLPAWrapperEmitter.java jogl/src/net/java/games/gluegen/runtime/BufferFactory.java jogl/src/net/java/games/gluegen/JavaEmitter.java jogl/src/net/java/games/gluegen/JavaConfiguration.java jogl/src/net/java/games/gluegen/CMethodBindingEmitter.java jogl/src/net/java/games/gluegen/JavaMethodBindingEmitter.java jogl/src/net/java/games/gluegen/CMethodBindingImplEmitter.java jogl/src/net/java/games/gluegen/JavaMethodBindingImplEmitter.java jogl/src/net/java/games/jogl/util/BufferUtils.java Changes: * Add NIODirectOnly grammar for description of methods that should have only NIO Direct Buffer option (no expansion into other types, and also will not be expanded to include indirect Buffer when we add that functionality) * Make changes to respect Direct Buffer position value. This allows a setting of an internal Buffer object parameter and JOGL will start reading data at the point in the buffer to which this position is set * The code is now generated to always respect this offset option. This has the affect of changing the internal signatures of all methods that use Buffers. But it does not affect the external API at all. * Old JOGL programs will continue working the same as long as they had the Buffer position set to zero before (the default value) git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@281 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with current JOGL trunk (by using -r HEAD)Kenneth Russel2005-04-249-52/+399
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@262 232f8b59-042b-4e1e-8c03-345bb8c30851
* Merged with current JOGL trunk (tag JOGL_1_1_PRE_B10)Kenneth Russel2005-02-2623-286/+910
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@245 232f8b59-042b-4e1e-8c03-345bb8c30851
* This commit was manufactured by cvs2svn to create branch 'JSR-231'.First Last2005-02-2632-0/+10197
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@244 232f8b59-042b-4e1e-8c03-345bb8c30851
* Initial incomplete GLU NURBS port under net.java.games.jogl.impl.nurbs Kenneth Russel2004-12-2013-0/+3485
| | | | | | | and a small README about the procedures being used during the port git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@180 232f8b59-042b-4e1e-8c03-345bb8c30851
* Upgraded JOGL and JOGL demo webstart jars to 1.1 b07.Kenneth Russel2004-11-201-1/+1
| | | | | | | Upgraded version number to 1.1 b08. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@176 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed bug pointed out by art in the JOGL forums where cap of sphere Kenneth Russel2004-11-191-1/+1
| | | | | | | was not being drawn if filled and untextured. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@175 232f8b59-042b-4e1e-8c03-345bb8c30851
* Added files missed in recent GLU putbackKenneth Russel2004-11-194-0/+1891
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@174 232f8b59-042b-4e1e-8c03-345bb8c30851
* Conditioned ATI_WORKAROUND notice on jogl.verbose system propertyKenneth Russel2004-11-191-1/+3
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@173 232f8b59-042b-4e1e-8c03-345bb8c30851
* Partial fix for Issue 42: Problems invoking GLU functions Kenneth Russel2004-11-182-6/+31
| | | | | | | | | | | Incorporated the LWJGL team's port of the GLU quadric and projection routines to be able to eliminate calls to the native GLU library for these cases, which was problematic on certain Linux distributions. Still need to port at least some of the mipmap routines and the NURBS tesselator. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@172 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 22: GLException hides user exception Kenneth Russel2004-11-181-7/+33
| | | | | | | | | | | | The central try/finally cause in GLException.invokeGL() called GLContext.free() after catching and rethrowing the end user's exception from the GLEventListenerdisplay() routine, which caused the end user's exception to be overwritten with the internal GLException. Fixed this by initializing the cause of the internal exception, and also continuing to propagate out the end user's exception. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@171 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 119: Dual-head problems on Windows XP Kenneth Russel2004-11-151-1/+3
| | | | | | | | | Added needed synchronization around creation of dummy windows for wglChoosePixelFormatARB calls. Fixed race condition in StaticGLInfo initialization. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@170 232f8b59-042b-4e1e-8c03-345bb8c30851
* Incremented version number to 1.1 b07Kenneth Russel2004-11-011-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@166 232f8b59-042b-4e1e-8c03-345bb8c30851
* Removed redundant code.gkw2004-10-291-7/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@163 232f8b59-042b-4e1e-8c03-345bb8c30851
* recomputeSingleThreadedWorkaround() erroneously disabled contextgkw2004-10-271-1/+3
| | | | | | | optimization when ATI_WORKAROUND=false. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@161 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 34: glutWireCube / glutSolidCube generate wrong cubesKenneth Russel2004-10-051-11/+15
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@156 232f8b59-042b-4e1e-8c03-345bb8c30851
* addShutdownHook needed to be wrapped in a call to ↵gkw2004-08-171-2/+8
| | | | | | AccessController.doPrivileged in order to work with applets and Web Start. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@153 232f8b59-042b-4e1e-8c03-345bb8c30851
* Incremented version number to 1.1 b06Kenneth Russel2004-08-061-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@152 232f8b59-042b-4e1e-8c03-345bb8c30851
* Bug fix from user GKW on the JOGL forums for problems reported by Kenneth Russel2004-08-035-81/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users in JOGL 1.1 betas where the code path for wglChoosePixelFormatARB (supporting full-scene antialiasing) was failing on older cards. The old drivers expect an OpenGL context to be current while the wglChoosePixelFormatARB and associated calls are being made, even though the documentation explicitly states that this is not necessary. GKW's fix creates a native window synchronously (independent of the AWT) and associates an OpenGL context with it which is used to choose pixel formats for other windows on the same GraphicsDevice. Upon VM shutdown, a native message pump is started which causes proper disposal of the native window and its OpenGL contexts. There is currently no bug ID associated with this fix, although it may be a component of completely addressing several open bugs. Also includes a bug fix from GKW and kbr for: Issue 98: Just 1st frame rendering on ATI Radeon This was a race condition between JOGL's automatic discovery that the ATI_WORKAROUND was needed and the creation of the first GLCanvas and associated Animator. The need for disabling the setRenderingThread optimization was computed too late, incorrectly locking out other threads (in particular, the AWT event queue thread) from performing rendering of the component. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@144 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 96: Off-by-one error in pixel format selection on WindowsKenneth Russel2004-07-151-2/+4
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@138 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed build problems on Linux after bug fixes to context destructionKenneth Russel2004-07-152-12/+13
| | | | | | | and recreation git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@137 232f8b59-042b-4e1e-8c03-345bb8c30851
* Bug fix to new context destruction / recreation code associated with Kenneth Russel2004-07-091-14/+14
| | | | | | | | | | | | recent checkin for following issues: Issue 59: GLContext Leak Issue 67: Java/Jogl app hangs some systems, not others, during reshape. Issue 69: Error on window resize Issue 89: Losing Backbuffer when Resizing/Moving a window git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@136 232f8b59-042b-4e1e-8c03-345bb8c30851
* fix build breakageGerard Ziemski2004-06-212-2/+2
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@135 232f8b59-042b-4e1e-8c03-345bb8c30851
* pbuffers have been implemented in Mac OS X jogl port for some time now, ↵Gerard Ziemski2004-06-201-3/+11
| | | | | | regsiter then as avaialable to developers, not just for internal use git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@133 232f8b59-042b-4e1e-8c03-345bb8c30851
* This putback attempts to address the following issues: Kenneth Russel2004-06-1912-32/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue 59: GLContext Leak Issue 67: Java/Jogl app hangs some systems, not others, during reshape. Issue 69: Error on window resize Issue 89: Losing Backbuffer when Resizing/Moving a window The primary change is to support handing off of the display() implementation to the AWT event queue thread via a new class called SingleThreadedWorkaround in the impl package. This was done to cause the AWT's reshape code to execute on the same thread as all other OpenGL rendering without changing the threading model (e.g., Animator and the ability to manually call display()) visible to the end user. This set of changes appears to work around the problems seen on ATI cards with random corruption when resizing animating windows due to multithreading bugs in the drivers. More testing by a larger community will confirm this fix. Currently the workaround is enabled by default on ATI cards. A secondary but related change is to properly destroy the OpenGL context when a heavyweight component is removed from its container. In order to implement the above workaround, it was necessary to override addNotify and removeNotify to properly track whether GLCanvases were realized; at that point it was a fairly small step to properly delete and recreate OpenGL contexts. The previous heuristics which attempted to determine when a heavyweight had been realized have been removed. A new demo, TestContextDestruction, exercises the new functionality. It does still appear to exhibit resource leaks, however; removing and re-adding the GLCanvas from its parent multiple times causes the system to eventually slow down significantly. More work is needed in this area. However, the demo does now execute as opposed to throwing an exception which was the previous behavior. The current code has been tested on Windows on NVidia hardware with all existing demos with the workaround both enabled and disabled, and on ATI hardware with the existing compatible demos with the workaround enabled. The new abstract method in GLContext, destroyImpl(), has been implemented but not yet tested on X11 and Mac OS X. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@132 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed (?) Issue 78: Re-assigning rendering thread causes subsequent ↵Kenneth Russel2004-04-301-30/+85
| | | | | | | | | | | | | | display() to fail Fixed Issue 80: redraw after reshape, swapBuffer() gives Exception Restructured and simplified context handling and optimization in GLContext.invokeGL(). Fixes issue 80 (verified); believe it will also fix issue 78 (unable to verify; no test case). Retested with all demos, some of which rely on the proper functioning of this code. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@131 232f8b59-042b-4e1e-8c03-345bb8c30851
* Incremented version number to 1.1b04Kenneth Russel2004-04-301-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@130 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 79: PBuffers on macintosh fail to glCopyTexSubImage2DKenneth Russel2004-04-292-41/+77
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@128 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed problem identified by William Denniss on JOGL forums where Kenneth Russel2004-04-261-5/+9
| | | | | | | | PIXELFORMATDESCRIPTOR didn't have its size or version fields initialized git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@126 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 77: Creation of dummy GL context fails in some configurationsKenneth Russel2004-04-261-0/+2
| | | | | | | | Applied patch from Yuri Vl. Gushchin to disable auto-redraw and auto-swap buffer modes on dummy GLCanvas. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@125 232f8b59-042b-4e1e-8c03-345bb8c30851
* Applied patches from Yuri Vl. Gushchin on JOGL forums: Kenneth Russel2004-04-261-1/+2
| | | | | | | | - Added KTX_buffer_region to glext.h - Used Dialog instead of Frame for dummy window on Windows git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@124 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed Issue 76: Multisampling (FSAA) does not work on ATIKenneth Russel2004-04-262-21/+28
| | | | | | | | Applied patch from Yuri Vl. Gushchin to fetch extensions while dummy context is current. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@123 232f8b59-042b-4e1e-8c03-345bb8c30851
* Worked around incidence of 4796548 on Mac OS XKenneth Russel2004-04-231-1/+17
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@121 232f8b59-042b-4e1e-8c03-345bb8c30851
* Updated webstart jogl.jar to 1.1b02 and bumped version number to 1.1b03Kenneth Russel2004-04-231-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@120 232f8b59-042b-4e1e-8c03-345bb8c30851
* Bumped version number to 1.1b02Kenneth Russel2004-04-221-1/+1
| | | | git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@119 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed (?) Issue 75: Dummy window confuses users and maximizing it can cause ↵Kenneth Russel2004-04-221-1/+7
| | | | | | trouble git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@118 232f8b59-042b-4e1e-8c03-345bb8c30851
* Fixed problems in WindowsGLContext and TraceGL pointed out by jonmeyer Kenneth Russel2004-04-221-1/+8
| | | | | | | on JOGL forums git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@114 232f8b59-042b-4e1e-8c03-345bb8c30851
* Updated context creation code to unpack GLCapabilities object in JavaKenneth Russel2004-04-211-1/+14
| | | | | | | rather than in C using JNI. Added full-scene antialiasing (FSAA) support. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@113 232f8b59-042b-4e1e-8c03-345bb8c30851