modules/graphics/src/main/java/com/sun/prism/es2/ES2Context.java

Print this page

        

*** 23,45 **** * questions. */ package com.sun.prism.es2; - import java.util.HashMap; import com.sun.glass.ui.Screen; - import com.sun.javafx.PlatformUtil; import com.sun.javafx.geom.Rectangle; import com.sun.javafx.geom.Vec3d; import com.sun.javafx.geom.transform.Affine2D; import com.sun.javafx.geom.transform.BaseTransform; import com.sun.javafx.geom.transform.GeneralTransform3D; import com.sun.javafx.sg.prism.NGCamera; import com.sun.javafx.sg.prism.NGDefaultCamera; import com.sun.prism.CompositeMode; import com.sun.prism.Material; - import com.sun.prism.PixelFormat; import com.sun.prism.RTTexture; import com.sun.prism.RenderTarget; import com.sun.prism.Texture; import com.sun.prism.impl.PrismSettings; import com.sun.prism.impl.ps.BaseShaderContext; --- 23,43 ---- * questions. */ package com.sun.prism.es2; import com.sun.glass.ui.Screen; import com.sun.javafx.geom.Rectangle; import com.sun.javafx.geom.Vec3d; import com.sun.javafx.geom.transform.Affine2D; import com.sun.javafx.geom.transform.BaseTransform; import com.sun.javafx.geom.transform.GeneralTransform3D; import com.sun.javafx.sg.prism.NGCamera; import com.sun.javafx.sg.prism.NGDefaultCamera; import com.sun.prism.CompositeMode; + import com.sun.prism.Graphics; import com.sun.prism.Material; import com.sun.prism.RTTexture; import com.sun.prism.RenderTarget; import com.sun.prism.Texture; import com.sun.prism.impl.PrismSettings; import com.sun.prism.impl.ps.BaseShaderContext;
*** 444,462 **** glContext.blitFBO(srcFboID, dstFboID, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1); } ! void renderMeshView(long nativeHandle, BaseTransform xform, ES2MeshView meshView) { ES2Shader shader = (ES2Shader) getPhongShader(meshView); setShaderProgram(shader.getProgramObject()); updateRawMatrix(projViewTx); shader.setMatrix("viewProjectionMatrix", rawMatrix); ! shader.setConstant("camPos", (float) cameraPos.x, ! (float) cameraPos.y, (float)cameraPos.z); updateWorldTransform(xform); updateRawMatrix(worldTx); shader.setMatrix("worldMatrix", rawMatrix); --- 442,464 ---- glContext.blitFBO(srcFboID, dstFboID, srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1); } ! void renderMeshView(long nativeHandle, Graphics g, ES2MeshView meshView) { ES2Shader shader = (ES2Shader) getPhongShader(meshView); setShaderProgram(shader.getProgramObject()); + BaseTransform xform = g.getTransformNoClone(); + float pixelScaleFactor = g.getPixelScaleFactor(); updateRawMatrix(projViewTx); shader.setMatrix("viewProjectionMatrix", rawMatrix); ! shader.setConstant("camPos", ! (float) cameraPos.x * pixelScaleFactor, ! (float) cameraPos.y * pixelScaleFactor, ! (float) cameraPos.z * pixelScaleFactor); updateWorldTransform(xform); updateRawMatrix(worldTx); shader.setMatrix("worldMatrix", rawMatrix);