Skip to content

Commit f43998b

Browse files
author
monkstone
committed
add COPYING.md
1 parent 075b962 commit f43998b

5 files changed

Lines changed: 148 additions & 60 deletions

File tree

‎COPYING.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
### Copyright
2+
The original processing library was developed by Ricard Marxer
3+
4+
https://github.com/rikrd/geomerative
5+
6+
Copyright 2006-2008 Ricard Marxer <email@ricardmarxer.com>
7+
8+
This product includes software developed by the Solution Engineering, Inc. (http://www.seisw.com/).
9+
10+
This product includes software developed by the The Apache Software Foundation (http://www.apache.org/).
11+
12+
Modifications and variations thereof to be compatible with (take advantage of new syntax etc) jdk8, processing-3.0 and thence JRubyArt
13+
Copyright (c) 2015-2016 Martin Prout
14+
15+
I have not further polluted the headers of the original code so it may not clear that such code has been modified, but if you care you should check the [original][]
16+
17+
[original]://github.com/rikrd/geomerative

‎examples/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The sketches here seem to be require the `--nojruby` flag to run, which seems to be Catch-22, since conventionally it was thought you needed an installed jruby to use gems. However it works absolutely fine for me on my linux box, suggesting that jruby-complete-9.0.4.0 is respecting the `GEM_PATH` and or `GEM_HOME` environmental variables set in my `.bashrc` Archlinux or `.profile` Mint (Ubuntu/Debian). Will it work with `rvm` or `rbenv` I wonder?
22

33
```bash
4-
export GEM_HOME="/home/tux/.gem/ruby/2.2.0"
5-
export GEM_PATH="/home/tux/.gem/ruby/2.2.0"
4+
export GEM_HOME="/home/tux/.gem/ruby/2.3.0"
5+
export GEM_PATH="/home/tux/.gem/ruby/2.3.0"
66
export PATH="${PATH}:${GEM_PATH}/bin"
77
```

‎examples/jruby_merge.rb‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
#######################/
2+
# --------- GEOMERATIVE EXAMPLES ---------------
3+
#######################
4+
# Title : TypoGeo_Merge
5+
# Date : 31/08/2011
6+
# Version : v0.5
7+
#
8+
# Merges two words in an random fashion.
9+
# Key 'f' = freezes motion
10+
# key 's' saves the frame in png format
11+
#
12+
# Code adapted from an original idea by Bertrand _fevre
13+
# during the Générative Typos workshop in Lure 2011.
14+
#
15+
# Licensed under GNU General Public License (GPL) version 3.
16+
# http://www.gnu.org/licenses/gpl.html
17+
#
18+
# A series of tutorials for using the Geomerative Library
19+
# developed by Ricard Marxer.
20+
# http://www.ricardmarxer.com/geomerative/
21+
#
22+
# More info on these tutorials and workshops at :
23+
# www.freeartbureau.org/blog
24+
#
25+
# Adapted for JRubyArt by Martin Prout
26+
#######################
27+
require 'geomerative'
28+
29+
attr_reader :my_font, :stop, :xoff, :yoff, :x_inc, :y_inc
30+
31+
TEXT = %w{RubyArt Processing}
32+
33+
def settings
34+
size(960, 640)
35+
end
36+
37+
def setup
38+
sketch_title TEXT.join ' '
39+
RG.init(self)
40+
@my_font = RFont.new('FreeSans.ttf', 200, CENTER)
41+
@stop = false
42+
no_fill
43+
stroke(255)
44+
stroke_weight(0.5)
45+
rect_mode(CENTER)
46+
@xoff = 0.0
47+
@yoff = 0.0
48+
@x_inc= 0.01
49+
@y_inc = 0.015
50+
end
51+
52+
def draw
53+
background(0, 50)
54+
displace_x = noise(xoff) * width
55+
displace_y = noise(yoff) * height
56+
@xoff += x_inc
57+
@yoff += y_inc
58+
translate(width / 2, height / 1.7)
59+
frequency = map1d(displace_x, (300..500), (3..200))
60+
RCommand.set_segment_length(frequency)
61+
my_points = my_font.to_group(TEXT[0]).get_points
62+
begin_shape
63+
my_points.each do |point|
64+
vertex(point.x, point.y)
65+
rotation = map1d(displace_y, (0..height), (0..TWO_PI))
66+
push_matrix
67+
translate(point.x, point.y)
68+
rotate(rotation)
69+
size = frequency / 6
70+
rect(0, 0, size, size)
71+
pop_matrix
72+
end
73+
end_shape
74+
frequency2 = map1d(displace_x, (300..500), (200..3))
75+
RCommand.set_segment_length(frequency2)
76+
my_points = my_font.to_group(TEXT[1]).get_points
77+
begin_shape
78+
my_points.each do |point|
79+
vertex(point.x, point.y)
80+
size = frequency2 / 7
81+
ellipse(point.x, point.y, size, size)
82+
end
83+
end_shape
84+
end
85+
86+
def key_pressed
87+
case key
88+
when 'f', 'F'
89+
@stop = !stop
90+
stop ? no_loop : loop
91+
when 's', 'S'
92+
save_frame('000_###.png')
93+
end
94+
end

‎pom.rb‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
roles 'developer'
1515
end
1616

17+
license 'GPL 3', 'http://www.gnu.org/licenses/gpl-3.0-standalone.html'
18+
1719
issue_management 'https://github.com/ruby-processing/geomerative/issues', 'Github'
1820

1921
source_control( :url => 'https://github.com/ruby-processing/geomerative',

‎pom.xml‎

Lines changed: 33 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,57 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<!--
3+
4+
AUTOGENERATED do not edit
5+
6+
-->
7+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
8+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
39
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.ruby-processing</groupId>
10+
<groupId>ruby-processing</groupId>
511
<artifactId>geomerative</artifactId>
612
<version>0.3.1</version>
7-
<packaging>jar</packaging>
8-
<description>
9-
geomerative-library for JRubyArt
10-
</description>
11-
12-
<parent>
13-
<groupId>org.sonatype.oss</groupId>
14-
<artifactId>oss-parent</artifactId>
15-
<version>7</version>
16-
</parent>
17-
18-
<issueManagement>
19-
<system>Github</system>
20-
<url>https://github.com/ruby-processing/geomerativegem/issues</url>
21-
</issueManagement>
22-
23-
<scm>
24-
<connection>scm:git:git://github.com/ruby-processing/geomerativegem.git</connection>
25-
<developerConnection>scm:git:git@github.com:ruby-processing/geomerativegem.git</developerConnection>
26-
<url>https://github.com/ruby-processing/geomerative</url>
27-
</scm>
28-
29-
<licenses>
30-
<license>
31-
<name>AGPL 3</name>
32-
<url>http://www.gnu.org/licenses/agpl-3.0.html</url>
33-
</license>
34-
<license>
35-
<name>Apache 2</name>
36-
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
37-
</license>
38-
</licenses>
39-
13+
<name>geomerative</name>
14+
<description>geomerative-library for JRubyArt</description>
15+
<organization>
16+
<name>ruby-processing</name>
17+
<url>https://ruby-processing.github.io</url>
18+
</organization>
4019
<developers>
4120
<developer>
4221
<id>monkstone</id>
4322
<name>Martin Prout</name>
4423
<email>martin_p@lineone.net</email>
24+
<roles>
25+
<role>developer</role>
26+
</roles>
4527
</developer>
4628
</developers>
47-
29+
<scm>
30+
<connection>scm:git:git://github.com/ruby-processing/geomerative.git</connection>
31+
<developerConnection>scm:git:git@github.com:ruby-processing/geomerative.git</developerConnection>
32+
<url>https://github.com/ruby-processing/geomerative</url>
33+
</scm>
34+
<issueManagement>
35+
<system>Github</system>
36+
<url>https://github.com/ruby-processing/geomerative/issues</url>
37+
</issueManagement>
38+
<properties>
39+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
40+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
41+
<maven.compiler.source>1.8</maven.compiler.source>
42+
<maven.compiler.target>1.8</maven.compiler.target>
43+
</properties>
4844
<dependencies>
4945
<dependency>
5046
<groupId>org.processing</groupId>
5147
<artifactId>core</artifactId>
5248
<version>3.0.1</version>
5349
</dependency>
5450
</dependencies>
55-
<properties>
56-
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
57-
<maven.compiler.source>1.8</maven.compiler.source>
58-
<maven.compiler.target>1.8</maven.compiler.target>
59-
</properties>
6051
<build>
6152
<sourceDirectory>src</sourceDirectory>
53+
<defaultGoal>package</defaultGoal>
6254
<finalName>geomerative</finalName>
63-
<extensions>
64-
<extension>
65-
<groupId>org.apache.maven.wagon</groupId>
66-
<artifactId>wagon-webdav-jackrabbit</artifactId>
67-
<version>2.1</version>
68-
</extension>
69-
</extensions>
7055
<plugins>
7156
<plugin>
7257
<artifactId>maven-compiler-plugin</artifactId>
@@ -89,16 +74,6 @@
8974
<artifactId>maven-resources-plugin</artifactId>
9075
<version>2.6</version>
9176
</plugin>
92-
<plugin>
93-
<groupId>org.apache.maven.plugins</groupId>
94-
<artifactId>maven-dependency-plugin</artifactId>
95-
<version>2.10</version>
96-
<executions>
97-
<execution>
98-
<id>default-cli</id>
99-
</execution>
100-
</executions>
101-
</plugin>
10277
</plugins>
10378
</build>
10479
</project>

0 commit comments

Comments
 (0)