eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replaced fill prefix by poly

Browse Source
This commit is contained in:
codeanticode
2012-05-21 16:28:07 +00:00
parent a037c50788
commit 8bb1910b9c
19 changed files with 1267 additions and 1263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/libraries/opengl/src/processing/opengl/LineShaderFrag.glsl
+4 -5
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +16,8 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
#ifdef GL_ES
precision mediump float;
precision mediump int;
java/libraries/opengl/src/processing/opengl/LineShaderVert.glsl
+3 -6
View File
@@ -1,14 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Based on glsl code from the dpix library:
http://gfx.cs.princeton.edu/proj/dpix/
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 modelviewMatrix;
uniform mat4 projectionMatrix;
java/libraries/opengl/src/processing/opengl/PFontTexture.java
+1 -2
View File
@@ -3,8 +3,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 2004-08 Ben Fry and Casey Reas
Copyright (c) 2011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
java/libraries/opengl/src/processing/opengl/PFramebuffer.java
+4 -4
View File
@@ -3,12 +3,12 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 2010 Ben Fry and Casey Reas
Copyright (c) 2011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
package processing.opengl;
java/libraries/opengl/src/processing/opengl/PGL.java
+4 -4
View File
@@ -3,12 +3,12 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 2010 Ben Fry and Casey Reas
Copyright (c) 2011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
package processing.opengl;
java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+769 -756
View File
File diff suppressed because it is too large Load Diff
java/libraries/opengl/src/processing/opengl/PShader.java
+6 -4
View File
@@ -1,14 +1,16 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 2010 Ben Fry and Casey Reas
Copyright (c) 2011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +21,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
package processing.opengl;
java/libraries/opengl/src/processing/opengl/PShapeOpenGL.java
+430 -428
View File
File diff suppressed because it is too large Load Diff
java/libraries/opengl/src/processing/opengl/PTexture.java
+13 -13
View File
@@ -3,12 +3,12 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 2010 Ben Fry and Casey Reas
Copyright (c) 2011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -58,8 +58,8 @@ public class PTexture implements PConstants {
public int glHeight;
protected boolean usingMipmaps;
protected float maxTexCoordU;
protected float maxTexCoordV;
protected float maxTexcoordU;
protected float maxTexcoordV;
protected boolean flippedX;
protected boolean flippedY;
@@ -346,8 +346,8 @@ public class PTexture implements PConstants {
* Returns the maximum possible value for the texture coordinate U (horizontal).
* @return float
*/
public float getMaxTexCoordU() {
return maxTexCoordU;
public float getMaxU() {
return maxTexcoordU;
}
@@ -355,8 +355,8 @@ public class PTexture implements PConstants {
* Returns the maximum possible value for the texture coordinate V (vertical).
* @return float
*/
public float getMaxTexCoordV() {
return maxTexCoordV;
public float getMaxV() {
return maxTexcoordV;
}
@@ -742,8 +742,8 @@ public class PTexture implements PConstants {
// is non-power-of-two, then glWidth (glHeight) will be greater than w (h) because it
// is chosen to be the next power of two, and this quotient will give the appropriate
// maximum texture coordinate value given this situation.
maxTexCoordU = (float)width / glWidth;
maxTexCoordV = (float)height / glHeight;
maxTexcoordU = (float)width / glWidth;
maxTexcoordV = (float)height / glHeight;
}
@@ -877,8 +877,8 @@ public class PTexture implements PConstants {
glHeight = src.glHeight;
usingMipmaps = src.usingMipmaps;
maxTexCoordU = src.maxTexCoordU;
maxTexCoordV = src.maxTexCoordV;
maxTexcoordU = src.maxTexcoordU;
maxTexcoordV = src.maxTexcoordV;
flippedX = src.flippedX;
flippedY = src.flippedY;
java/libraries/opengl/src/processing/opengl/PointShaderFrag.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
#ifdef GL_ES
precision mediump float;
java/libraries/opengl/src/processing/opengl/PointShaderVert.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 projectionMatrix;
uniform mat4 modelviewMatrix;
java/libraries/opengl/src/processing/opengl/FillShaderFragNoTex.glsl → java/libraries/opengl/src/processing/opengl/PolyShaderFragNoTex.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
#ifdef GL_ES
precision mediump float;
java/libraries/opengl/src/processing/opengl/FillShaderVertFull.glsl → java/libraries/opengl/src/processing/opengl/PolyShaderVertFull.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 modelviewMatrix;
uniform mat4 projmodelviewMatrix;
java/libraries/opengl/src/processing/opengl/FillShaderVertLit.glsl → java/libraries/opengl/src/processing/opengl/PolyShaderVertLit.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 modelviewMatrix;
uniform mat4 projmodelviewMatrix;
java/libraries/opengl/src/processing/opengl/FillShaderVertSimple.glsl → java/libraries/opengl/src/processing/opengl/PolyShaderVertSimple.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 projmodelviewMatrix;
java/libraries/opengl/src/processing/opengl/FillShaderVertTex.glsl → java/libraries/opengl/src/processing/opengl/PolyShaderVertTex.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
uniform mat4 projmodelviewMatrix;
uniform mat4 texcoordMatrix;
java/libraries/opengl/src/processing/opengl/FillShaderFragTex.glsl → java/libraries/opengl/src/processing/opengl/PolylShaderFragTex.glsl
+3 -4
View File
@@ -1,12 +1,11 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2011 Andres Colubri
Copyright (c) 20011-12 Ben Fry and Casey Reas
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,7 +16,7 @@
Public License along with this library; if not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
Boston, MA 02111-1307 USA
*/
*/
#ifdef GL_ES
precision mediump float;