Skip to content

Commit

Permalink
fold as android example
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Hamblen committed Apr 9, 2010
1 parent a9f9a00 commit 07db921
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -5,4 +5,4 @@ project/plugins/project/
lib_managed/
Loop/data
Scratch/data
Android/src/main/java/us/technically/spde/example/R.java
Android/src/main/java/spde/example/R.java
4 changes: 2 additions & 2 deletions Android/src/main/AndroidManifest.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="us.technically.spde.example"
package="spde.example"
android:versionCode="1"
android:versionName="1.0">

<uses-sdk android:minSdkVersion="6" />

<application android:label="@string/app_name">
<activity android:name= "StraightScala">
<activity android:name="Fold">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
2 changes: 1 addition & 1 deletion Android/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
<resources>
<string name="app_name">View</string>
<string name="app_name">Fold</string>
</resources>
26 changes: 26 additions & 0 deletions Android/src/main/scala/Fold.scala
@@ -0,0 +1,26 @@
package spde.example

import processing.core._
import spde.core._
import PConstants._

class Fold extends PApplet {
override def setup() {
frameRate(25)
h = random_seq
}

def random_seq = (0 until width) map { (_, random(height)) }
var h: Seq[(Int, Float)] = null
override def mouseReleased { h = random_seq }

override def draw() {
background(255)
h foreach { case (x, h) => line(x, 0, x, h) }
h = (List.empty[(Int, Float)] /: h) {
case (Nil, (x1, h1)) => (x1, h1) :: Nil
case ((x2, h2) :: t, (x1, h1)) =>
(x1, (h1 + h2) /2) :: (x2, h2) :: t
}
}
}
20 changes: 0 additions & 20 deletions Android/src/main/scala/StraightScala.scala

This file was deleted.

2 changes: 1 addition & 1 deletion project/build/ExamplesProject.scala
Expand Up @@ -24,7 +24,7 @@ class ExamplesProject(info: ProjectInfo) extends ParentProject(info) with poster
})
lazy val android = project("Android", "Android", new AndroidProject(_) with SpdeAndroidProject {
def androidPlatformName="android-2.0"
override def sketchClass = "StraightScala"
override def sketchClass = "Fold"
})
lazy val straight_java = project("Straight_Java", "Straight_Java", new DefaultSpdeProject(_) {
override def sketchClass = "StraightJava"
Expand Down

0 comments on commit 07db921

Please sign in to comment.