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

Merge branch 'master' of https://github.com/processing/processing.git

Browse Source
This commit is contained in:
codeanticode
2013-02-13 10:57:58 -05:00
parent d0f8e1a206 957ec92588
commit e620dbb516
6 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/ContributionListing.java
+1 -1
View File
@@ -368,7 +368,7 @@ public class ContributionListing {
URL url = null;
try {
url = new URL("http://processing.googlecode.com/svn/trunk/web/contrib_generate/contributions.txt");
url = new URL("https://raw.github.com/processing/processing-web/master/contrib_generate/contributions.txt");
} catch (MalformedURLException e) {
progressMonitor.error(e);
progressMonitor.finished();
core/src/processing/core/PApplet.java
+3 -3
View File
@@ -1974,8 +1974,8 @@ public class PApplet extends Applet
//screen.drawImage(g.image, 0, 0, null); // not retina friendly
screen.drawImage(g.image, 0, 0, width, height, null);
}
//} else {
// System.out.println(insideDraw + " " + g + " " + ((g != null) ? g.image : "-"));
} else {
debug(insideDraw + " " + g + " " + ((g != null) ? g.image : "-"));
}
}
@@ -2181,6 +2181,7 @@ public class PApplet extends Applet
} else { // sleepTime <= 0; the frame took longer than the period
// excess -= sleepTime; // store excess time value
overSleepTime = 0L;
noDelays++;
if (noDelays > NO_DELAYS_PER_YIELD) {
Thread.yield(); // give another thread a chance to run
@@ -2288,7 +2289,6 @@ public class PApplet extends Applet
}
insideDraw = false;
// 1.5.1 version
if (useActive) {
if (useStrategy) {
render();
core/todo.txt
+18 -10
View File
@@ -41,6 +41,9 @@ X http://code.google.com/p/processing/issues/detail?id=1488
_ waiting on reference from Casey
X fixes for removeColumn()
X remove SVG warning about "#text" ignored
X fix bug where noDelays wasn't being used in PApplet
X remove "ignoring #text tag" from SVG loader
X can ignore any # items altogether
andres
A P3D sketches failing to run
@@ -53,6 +56,18 @@ A several key/mouse event issues in the db
A http://code.google.com/p/processing/issues/detail?id=1464
A finalize shader API
A https://github.com/processing/processing/issues/13
A "focused" become false when window is clicked in OPENGL and P2D renderer
A http://code.google.com/p/processing/issues/detail?id=1483
A https://github.com/processing/processing/issues/1521
A cursor(...) and noCursor() having trouble in P2D or P3D mode
A noCursor() seems quite/somewhat broken
X started some work, ignores 'invisible' already being set
X http://code.google.com/p/processing/issues/detail?id=1574
X https://github.com/processing/processing/issues/1612
A OpenGL/P3D sketches show graphical corruption
A needs to be set to other color
X http://code.google.com/p/processing/issues/detail?id=1452
X https://github.com/processing/processing/issues/1490
cleaning/earlier
C textureWrap() CLAMP and REPEAT now added
@@ -74,6 +89,7 @@ X makeEmptyNull() -> replace("", null);
X saveTable("filename.tsv") or saveTable("filename.txt", "tsv")
X createTable() method in PApplet
X removed getUniqueXxxx() and some others, pending names
X added listUnique() and tallyUnique()
xml library
X removed 'name' field to avoid possibility of random errors
@@ -148,22 +164,14 @@ _ decide on getAmount() and weirdness w/ clickCount
_ get mouseWheel() added to api ref
_ also added to keywords.txt
_ remove "ignoring #text tag" from SVG loader
_ can ignore any # items altogether
andres
_ with DISABLE_STROKE_PERSPECTIVE, use GL lines, not triangles to draw lines
_ http://code.google.com/p/processing/issues/detail?id=1560
_ https://github.com/processing/processing/issues/1598
X http://code.google.com/p/processing/issues/detail?id=1560
A disable stroke perspective by default (but this didn't fix it)
_ P2D/P3D sketches don't get focus until click
_ also problem for Java2D when canvas is used?
_ need to standardize canvas handling
A OpenGL/P3D sketches show graphical corruption
_ needs to be set to other color
_ http://code.google.com/p/processing/issues/detail?id=1452
_ cursor(...) and noCursor() having trouble in P2D or P3D mode
_ noCursor() seems quite/somewhat broken
X started some work, ignores 'invisible' already being set
_ remap() instead of map()
java/examples/Topics/Create Shapes/PolygonPShapeOOP3/PolygonPShapeOOP3.pde
-2
View File
@@ -42,8 +42,6 @@ void setup() {
// Make an ArrayList
polygons = new ArrayList<Polygon>();
polygons = new ArrayList<Polygon>();
for (int i = 0; i < 25; i++) {
int selection = int(random(shapes.length)); // Pick a random index
Polygon p = new Polygon(shapes[selection]); // Use corresponding PShape to create Polygon
java/keywords.txt
+16 -5
View File
@@ -9,6 +9,7 @@ ALPHA LITERAL2
ALPHA_MASK LITERAL2
ALT LITERAL2
AMBIENT LITERAL2
ARC LITERAL2 createShape_
ARROW LITERAL2 cursor_
ARGB LITERAL2
BACKSPACE LITERAL2 keyCode
@@ -18,6 +19,7 @@ BLEND LITERAL2 blend_
BLUE_MASK LITERAL2
BLUR LITERAL2 filter_
BOTTOM LITERAL2 textAlign_
BOX LITERAL2 createShape_
BURN LITERAL2 blend_
CENTER LITERAL2
CHATTER LITERAL2
@@ -61,6 +63,7 @@ DODGE LITERAL2 blend_
DOWN LITERAL2 keyCode
DRAG LITERAL2
DXF LITERAL2 size_
ELLIPSE LITERAL2 createShape_
ENABLE_ACCURATE_2D LITERAL2
ENABLE_DEPTH_MASK LITERAL2
ENABLE_DEPTH_SORT LITERAL2
@@ -92,6 +95,7 @@ INVERT LITERAL2 filter_
JPEG LITERAL2
LEFT LITERAL2 keyCode
LIGHTEST LITERAL2 blend_
LINE LITERAL2 createShape_
LINES LITERAL2 beginShape_
LINUX LITERAL2
MACOSX LITERAL2
@@ -126,12 +130,14 @@ POSTERIZE LITERAL2 filter_
PRESS LITERAL2
PROBLEM LITERAL2
PROJECT LITERAL2 strokeCap_
QUAD LITERAL2 createShape_
QUAD_STRIP LITERAL2 beginShape_
QUADS LITERAL2 beginShape_
QUARTER_PI LITERAL2 QUARTER_PI
RAD_TO_DEG LITERAL2
RADIUS LITERAL2
RADIANS LITERAL2
RECT LITERAL2
RED_MASK LITERAL2
RELEASE LITERAL2
REPEAT LITERAL2
@@ -145,6 +151,7 @@ SECAM LITERAL2
SHAPE LITERAL2 textMode_
SHIFT LITERAL2
SPECULAR LITERAL2
SPHERE LITERAL2 createShape_
SOFT_LIGHT LITERAL2 blend_
SQUARE LITERAL2 strokeCap_
SUBTRACT LITERAL2 blend_
@@ -157,6 +164,7 @@ THIRD_PI LITERAL2
THRESHOLD LITERAL2 filter_
TIFF LITERAL2
TOP LITERAL2 textAlign_
TRIANGLE LITERAL2 createShape_
TRIANGLE_FAN LITERAL2 beginShape_
TRIANGLES LITERAL2 beginShape_
TRIANGLE_STRIP LITERAL2 beginShape_
@@ -404,7 +412,9 @@ createInput FUNCTION1 createInput_
createOutput FUNCTION1 createOutput_
createReader FUNCTION1 createReader_
createShape FUNCTION1 createShape_
loadTable FUNCTION1 createTable_
createWriter FUNCTION1 createWriter_
createXML FUNCTION1 createXML_
cursor FUNCTION1 cursor_
curve FUNCTION1 curve_
curveDetail FUNCTION1 curveDetail_
@@ -511,6 +521,7 @@ noStroke FUNCTION1 noStroke_
noTint FUNCTION1 noTint_
open FUNCTION1 open_
ortho FUNCTION1 ortho_
parseXML FUNCTION1 parseXML_
perspective FUNCTION1 perspective_
PFont KEYWORD5 PFont
list FUNCTION1 PFont_list_
@@ -551,8 +562,8 @@ addChild FUNCTION2 PShape_addChild_
beginContour FUNCTION2 PShape_beginContour_
disableStyle FUNCTION2 PShape_disableStyle_
enableStyle FUNCTION2 PShape_enableStyle_
end FUNCTION2 PShape_end_
endContour FUNCTION2 PShape_endContour_
end FUNCTION2 PShape_endShape_
getChild FUNCTION2 PShape_getChild_
getVertex FUNCTION2 PShape_getVertex_
getVertexCount FUNCTION2 PShape_getVertexCount_
@@ -617,9 +628,9 @@ saveBytes FUNCTION1 saveBytes_
saveFrame FUNCTION1 saveFrame_
saveStream FUNCTION1 saveStream_
saveStrings FUNCTION1 saveStrings_
loadTable FUNCTION1 saveTable_
saveXML FUNCTION1 saveXML_
scale FUNCTION1 scale_
screenHeight KEYWORD4 screenHeight
screenWidth KEYWORD4 screenWidth
screenX FUNCTION1 screenX_
screenY FUNCTION1 screenY_
screenZ FUNCTION1 screenZ_
@@ -679,9 +690,9 @@ updatePixels FUNCTION1 updatePixels_
vertex FUNCTION1 vertex_
XML KEYWORD5 XML
addChild FUNCTION2 XML_addChild_
format FUNCTION2 XML_format_
getAttributeCount FUNCTION2 XML_getAttributeCount_
getChild FUNCTION2 XML_getChild_
getChildCount FUNCTION2 XML_getChildCount_
getChildren FUNCTION2 XML_getChildren_
getContent FUNCTION2 XML_getContent_
getFloat FUNCTION2 XML_getFloat_
@@ -693,11 +704,11 @@ hasAttribute FUNCTION2 XML_hasAttribute_
hasChildren FUNCTION2 XML_hasChildren_
listAttributes FUNCTION2 XML_listAttributes_
listChildren FUNCTION2 XML_listChildren_
parse FUNCTION2 XML_parse_
removeChild FUNCTION2 XML_removeChild_
setContent FUNCTION2 XML_setContent_
setFloat FUNCTION2 XML_setFloat_
setInt FUNCTION2 XML_setInt_
setName FUNCTION2 XML_setName_
setString FUNCTION2 XML_setString_
toString FUNCTION2 XML_toString_
year FUNCTION1 year_
todo.txt
+1
View File
@@ -107,6 +107,7 @@ _ needs to be reset for this release, maybe others
2.0 FINAL / library/tool/mode manager cleanup
_ boogers still being left around
_ Add Mode is also reporting that it's a library that contains multiple
_ Add Tool is having problems
_ http://code.google.com/p/processing/issues/detail?id=1569
_ make already installed libraries distinguishable in the list