aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* j3dcore: update constants from GL2ES1 interfaceJulien Gouesse2012-05-031-121/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL.GL_EXP -> GL2.GL_EXP GL.GL_PRIMARY_COLOR -> GL2.GL_PRIMARY_COLOR GL.GL_CONSTANT -> GL2.GL_CONSTANT GL.GL_PREVIOUS -> GL2.GL_PREVIOUS GL.GL_COMBINE -> GL2.GL_COMBINE GL.GL_MODULATE -> GL2.GL_MODULATE GL.GL_DECAL -> GL2.GL_DECAL GL.GL_ADD -> GL2.GL_ADD GL.GL_ADD_SIGNED -> GL2.GL_ADD_SIGNED GL.GL_SUBTRACT -> GL2.GL_SUBTRACT GL.GL_INTERPOLATE -> GL2.GL_INTERPOLATE GL.GL_DOT3_RGB -> GL2.GL_DOT3_RGB GL.GL_DOT3_RGBA -> GL2.GL_DOT3_RGBA GL.GL_ALPHA_SCALE -> GL2.GL_ALPHA_SCALE GL.GL_ALPHA_TEST -> GL2.GL_ALPHA_TEST GL.GL_TEXTURE_ENV -> GL2.GL_TEXTURE_ENV GL.GL_TEXTURE_ENV_COLOR -> GL2.GL_TEXTURE_ENV_COLOR GL.GL_TEXTURE_ENV_MODE -> GL2.GL_TEXTURE_ENV_MODE GL.GL_TEXTURE_GEN_MODE -> GL2.GL_TEXTURE_GEN_MODE GL.GL_CLIP_PLANE0 -> GL2.GL_CLIP_PLANE0 GL.GL_CLIP_PLANE1 -> GL2.GL_CLIP_PLANE1 GL.GL_CLIP_PLANE2 -> GL2.GL_CLIP_PLANE2 GL.GL_CLIP_PLANE3 -> GL2.GL_CLIP_PLANE3 GL.GL_CLIP_PLANE4 -> GL2.GL_CLIP_PLANE4 GL.GL_CLIP_PLANE5 -> GL2.GL_CLIP_PLANE5 GL.GL_COMBINE_RGB -> GL2.GL_COMBINE_RGB GL.GL_COMBINE_ALPHA -> GL2.GL_COMBINE_ALPHA GL.GL_LIGHT_MODEL_AMBIENT -> GL2.GL_LIGHT_MODEL_AMBIENT GL.GL_FOG -> GL2.GL_FOG GL.GL_NORMAL_MAP -> GL2.GL_NORMAL_MAP GL.GL_REFLECTION_MAP -> GL2.GL_REFLECTION_MAP GL.GL_FOG_COLOR -> GL2.GL_FOG_COLOR GL.GL_FOG_MODE -> GL2.GL_FOG_MODE GL.GL_FOG_DENSITY -> GL2.GL_FOG_DENSITY GL.GL_FOG_START -> GL2.GL_FOG_START GL.GL_FOG_END -> GL2.GL_FOG_END GL.GL_GENERATE_MIPMAP -> GL2.GL_GENERATE_MIPMAP GL.GL_LIGHT_MODEL_TWO_SIDE -> GL2.GL_LIGHT_MODEL_TWO_SIDE GL.GL_MAX_LIGHTS -> GL2.GL_MAX_LIGHTS GL.GL_MAX_TEXTURE_UNITS -> GL2.GL_MAX_TEXTURE_UNITS GL.GL_OPERAND0_RGB -> GL2.GL_OPERAND0_RGB GL.GL_OPERAND1_RGB -> GL2.GL_OPERAND1_RGB GL.GL_OPERAND2_RGB -> GL2.GL_OPERAND2_RGB GL.GL_OPERAND0_ALPHA -> GL2.GL_OPERAND0_ALPHA GL.GL_OPERAND1_ALPHA -> GL2.GL_OPERAND1_ALPHA GL.GL_OPERAND2_ALPHA -> GL2.GL_OPERAND2_ALPHA GL.GL_PERSPECTIVE_CORRECTION_HINT -> GL2.GL_PERSPECTIVE_CORRECTION_HINT GL.GL_POINT_SMOOTH -> GL2.GL_POINT_SMOOTH GL.GL_RESCALE_NORMAL -> GL2.GL_RESCALE_NORMAL GL.GL_RGB_SCALE -> GL2.GL_RGB_SCALE Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update constants from GL2ES2 interfaceJulien Gouesse2012-05-031-39/+39
| | | | | | | | | | | | | | | | GL.GL_DEPTH_COMPONENT -> GL2.GL_DEPTH_COMPONENT GL.GL_TEXTURE_3D -> GL2.GL_TEXTURE_3D GL.GL_TEXTURE_WRAP_R -> GL2.GL_TEXTURE_WRAP_R GL.GL_INT -> GL2.GL_INT GL.GL_CONSTANT_COLOR -> GL2.GL_CONSTANT_COLOR GL.GL_VERTEX_SHADER_ARB -> GL2.GL_VERTEX_SHADER GL.GL_FRAGMENT_SHADER_ARB -> GL2.GL_FRAGMENT_SHADER GL.GL_MAX_3D_TEXTURE_SIZE -> GL2.GL_MAX_3D_TEXTURE_SIZE GL.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB -> GL2.GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS GL.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB -> GL2.GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update constants from GLLightingFunc interfaceJulien Gouesse2012-05-031-68/+68
| | | | | | | | | | | | | | | | | | | | | | | | | GL.GL_AMBIENT -> GL2.GL_AMBIENT GL.GL_DIFFUSE -> GL2.GL_DIFFUSE GL.GL_SPECULAR -> GL2.GL_SPECULAR GL.GL_NORMALIZE -> GL2.GL_NORMALIZE GL.GL_AMBIENT_AND_DIFFUSE -> GL2.GL_AMBIENT_AND_DIFFUSE GL.GL_EMISSION -> GL2.GL_EMISSION GL.GL_SHININESS -> GL2.GL_SHININESS GL.GL_COLOR_MATERIAL -> GL2.GL_COLOR_MATERIAL GL.GL_POSITION -> GL2.GL_POSITION GL.GL_CONSTANT_ATTENUATION -> GL2.GL_CONSTANT_ATTENUATION GL.GL_LINEAR_ATTENUATION -> GL2.GL_LINEAR_ATTENUATION GL.GL_QUADRATIC_ATTENUATION -> GL2.GL_QUADRATIC_ATTENUATION GL.GL_LIGHT0 -> GL2.GL_LIGHT0 GL.GL_LIGHTING -> GL2.GL_LIGHTING GL.GL_FLAT -> GL2.GL_FLAT GL.GL_SMOOTH -> GL2.GL_SMOOTH GL.GL_SPOT_EXPONENT -> GL2.GL_SPOT_EXPONENT GL.GL_SPOT_CUTOFF -> GL2.GL_SPOT_CUTOFF GL.GL_SPOT_DIRECTION -> GL2.GL_SPOT_DIRECTION Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update constants from GLPointerFunc interfaceJulien Gouesse2012-05-031-22/+23
| | | | | | | | | | GL.GL_NORMAL_ARRAY -> GL2.GL_NORMAL_ARRAY GL.GL_COLOR_ARRAY -> GL2.GL_COLOR_ARRAY GL.GL_VERTEX_ARRAY -> GL2.GL_VERTEX_ARRAY GL.GL_TEXTURE_COORD_ARRAY -> GL2.GL_TEXTURE_COORD_ARRAY Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: update to use the new Buffers helpers rather than BufferUtilsJulien Gouesse2012-05-031-17/+17
| | | | | Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: the vertex attribute functions have moved to the GL2 profileJulien Gouesse2012-05-031-7/+7
| | | | | Signed-off-by: Julien Gouesse <[email protected]> Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove static feature boolean for CG libraryHarvey Harrison2012-05-031-4/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove the JOGL CG shader support codeHarvey Harrison2012-05-034-251/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate GeometryRetained userslistHarvey Harrison2012-05-033-40/+28
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove d3d callback from GeometryArrayRetainedHarvey Harrison2012-05-036-41/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate users list in Screen3DHarvey Harrison2012-05-031-25/+16
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove more D3D only codeHarvey Harrison2012-05-036-136/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: beginScene/endScene was only used by D3D...remove itHarvey Harrison2012-05-036-52/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove all CG-shader support code (well, most of it anyways)Harvey Harrison2012-05-036-1801/+22
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove the ability to set the shading language to CG, assume GLSLHarvey Harrison2012-05-034-103/+2
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: simplify Pipeline singleton creationHarvey Harrison2012-05-031-31/+25
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove a bunch of the native support code and classesHarvey Harrison2012-05-0367-61462/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: default to JOGL pipeline always, remove option to set native pipelinesHarvey Harrison2012-05-031-15/+2
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: use an explicit boolean when a PhysicalEnvironment has no more usersHarvey Harrison2012-03-051-20/+20
| | | | | | Then test that boolean to determine if it needs to be removed from the Hastable. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate PhysicalEnvironment static hashmapHarvey Harrison2012-03-052-6/+8
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate the PhysicalEnvironment::devices listHarvey Harrison2012-03-052-60/+52
| | | | | | | Ensure this list is consistantly synchronized which will make it easier to use ArrayList if desired in a future patch. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate PhysicalEnvironment::users list as holding ViewsHarvey Harrison2012-03-053-51/+45
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: ViewPlatformRetained::getViewList cannot return nullHarvey Harrison2012-03-051-10/+9
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove unneeded casts to View in SoundStructureHarvey Harrison2012-03-051-4/+4
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove the unused SoundRenderer class...never seems to be usedHarvey Harrison2012-03-033-97/+0
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: change getViewPlatformList() to never return null and remove checksHarvey Harrison2012-03-032-65/+37
| | | | | | Also, consistently lock the cached array using the List it caches. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: add an early return to the enable/disable event functions to reduce ↵Harvey Harrison2012-03-031-148/+120
| | | | | | indentation Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: preparation patch for cleanup of getViewList() users in VirtualUniverseHarvey Harrison2012-03-031-137/+132
| | | | | | No functional changes, just making the whitespace consistent. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: only mark the cached view list as dirty if we actually change itHarvey Harrison2012-03-031-5/+3
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate list of Views in ViewPlatformRetainedHarvey Harrison2012-03-031-30/+30
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate GroupRetained's list of child nodes and compiled child nodesHarvey Harrison2012-02-265-90/+60
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate NodeRetained::branchGroupPathsHarvey Harrison2012-02-269-30/+27
| | | | | | - also use the copy constructor rather than clone() Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: fix raster code in the JOGL backend to match the native OpenGL codeHarvey Harrison2012-02-221-6/+6
| | | | | | | This appears to have been a typo from the initial implementation and likely never worked. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove code that was stubbed-out in issue 458Harvey Harrison2012-02-212-36/+1
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: use annotated ArrayList of AWTEvents in WakeupOnAWTEventHarvey Harrison2012-02-201-16/+12
| | | | | | Make the locking explicit where used. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove the DVR backdoor in ViewHarvey Harrison2012-02-201-47/+0
| | | | | | Dynamic Video Resize is effectively unused internally, kill it. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate the ThreadLocals in JoglPipelineHarvey Harrison2012-01-271-15/+15
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove the unneeded centroid from BoundingBoxHarvey Harrison2012-01-241-15/+8
| | | | | | | Return a temp Point3d as it's not that much more expensive than the math we're already doing. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: switch the orderedBin array expansion to happen at set, rather than ↵Harvey Harrison2012-01-241-7/+18
| | | | | | | | | get time Add early return of null for the viewIndex >= array length and only expand the allocation when we set a non-null orderedBin. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: format whitespace and move some variables into loops around callers ↵Harvey Harrison2012-01-241-67/+50
| | | | | | | | of OrderedGroupRetained::[gs]etOrderedBin Preparation patch to change where the OrderedBin array is expanded. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: ensure the orderedBin array in OrderedGroupRetained is consistently ↵Harvey Harrison2012-01-241-29/+24
| | | | | | | | | | | | locked Introduce a lock object to lock all access as you cannot use an object to lock itself if that reference is ever written over, as is the case here. You can get surprising nullpointer exceptions and indexOutOfbounds from concurrent thread access when you have multiple active views. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: use the Bounds::getCenter(Point3d) function in the trivial casesHarvey Harrison2012-01-244-36/+29
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: add a getCenter(Point3d) to the Bounds interface and implement it ↵Harvey Harrison2012-01-234-15/+27
| | | | | | in the implementing classes Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: annotate lists of LightRetained, FogRetained, ModelClipRetained and ↵Harvey Harrison2012-01-175-333/+322
| | | | | | AlternateAppearanceRetained used by setlivestate Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: further reduce sizes of BoundingSphere and BoundingBoxHarvey Harrison2012-01-162-64/+17
| | | | | | | | | | Essentially this undoes all the code added for issue 561. Just rely on escape analysis to allocate on-stack. On 64-bit: Reduces BoundingSphere from 54 -> 38 bytes Reduces BoundingBox from 62 -> 46 bytes Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: remove temporary Point3d from BoundingBoxHarvey Harrison2012-01-161-9/+1
| | | | | | | | | Rely on escape analysis in the VM here, this method could be coded more carefully anyway to avoid most of the floating point math. On 64-bit reduces BoundingBox from 70->62 bytes Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: small optimization in BoundingSphere/BoundingBox::transform(Bounds, ↵Harvey Harrison2012-01-162-19/+4
| | | | | | | | | | | Transform3d) When the type of Bounds being passed matches the current Object, this method can simply set the state and then transform the current object, avoid the need for a temporary object in BoundingBox's case. BoundingSphere was already open-coding this pattern, make it explicit. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: use the BoundingSphere constructor to get an empty bounds where desiredHarvey Harrison2012-01-153-12/+6
| | | | Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: match behavior of constructor and set() method in BoundingSphereHarvey Harrison2012-01-151-1/+1
| | | | | | | Make the BoundingSphere(Bounds) match the set(Bounds) behavior when passing an empty Bounds into it. Signed-off-by: Harvey Harrison <[email protected]>
* j3dcore: one more use of the emptyBounds helper in BoundingSphereHarvey Harrison2012-01-151-5/+3
| | | | Signed-off-by: Harvey Harrison <[email protected]>