From cf4227621623845b831a4983c50d9f06dfca5c51 Mon Sep 17 00:00:00 2001
From: MasDennis <ippeldv@gmail.com>
Date: Thu, 7 Jul 2011 11:38:02 +0100
Subject: [PATCH] initial commit

---
 .classpath                                    |   7 +
 .gitignore                                    |   3 +
 .project                                      |  33 ++
 AndroidManifest.xml                           |  27 ++
 default.properties                            |  11 +
 proguard.cfg                                  |  36 ++
 res/drawable-hdpi/icon.png                    | Bin 0 -> 8214 bytes
 res/drawable-ldpi/icon.png                    | Bin 0 -> 3038 bytes
 res/drawable-mdpi/icon.png                    | Bin 0 -> 8214 bytes
 res/layout/main.xml                           |   7 +
 res/values/defaultvalues.xml                  |   4 +
 res/values/strings.xml                        |   6 +
 res/xml/albums.xml                            |   5 +
 res/xml/settings.xml                          |  13 +
 src/net/rbgrn/opengl/BaseConfigChooser.java   | 132 ++++++
 .../rbgrn/opengl/DefaultContextFactory.java   |  46 ++
 .../opengl/DefaultWindowSurfaceFactory.java   |  46 ++
 src/net/rbgrn/opengl/EglHelper.java           | 183 ++++++++
 src/net/rbgrn/opengl/GLThread.java            | 415 +++++++++++++++++
 src/net/rbgrn/opengl/GLWallpaperService.java  | 230 ++++++++++
 src/rajawali/BaseObject3D.java                | 424 ++++++++++++++++++
 src/rajawali/Camera3D.java                    |  79 ++++
 src/rajawali/IObject3D.java                   |  48 ++
 src/rajawali/RajawaliActivity.java            |  46 ++
 src/rajawali/SerializedObject3D.java          |  44 ++
 src/rajawali/lights/ALight.java               |  56 +++
 src/rajawali/lights/DirectionalLight.java     |  23 +
 src/rajawali/materials/AMaterial.java         | 233 ++++++++++
 src/rajawali/materials/CubeMapMaterial.java   | 113 +++++
 src/rajawali/materials/DiffuseMaterial.java   | 113 +++++
 src/rajawali/materials/GouraudMaterial.java   | 147 ++++++
 src/rajawali/materials/ParticleMaterial.java  |  55 +++
 src/rajawali/materials/PhongMaterial.java     | 181 ++++++++
 src/rajawali/materials/SimpleMaterial.java    |  28 ++
 src/rajawali/materials/TextureManager.java    | 179 ++++++++
 src/rajawali/parser/AParser.java              |  30 ++
 src/rajawali/parser/IParser.java              |   8 +
 src/rajawali/parser/ObjParser.java            | 161 +++++++
 .../preferences/ColorPickerPreference.java    | 104 +++++
 src/rajawali/preferences/ColorPickerView.java | 159 +++++++
 .../preferences/SeekbarPreference.java        |  84 ++++
 src/rajawali/primitives/Particle.java         |  51 +++
 src/rajawali/primitives/Plane.java            | 112 +++++
 src/rajawali/primitives/Sphere.java           |  91 ++++
 src/rajawali/renderer/RajawaliRenderer.java   | 203 +++++++++
 src/rajawali/wallpaper/Wallpaper.java         | 262 +++++++++++
 src/rajawali/wallpaper/WallpaperSettings.java |  36 ++
 47 files changed, 4274 insertions(+)
 create mode 100644 .classpath
 create mode 100644 .gitignore
 create mode 100644 .project
 create mode 100644 AndroidManifest.xml
 create mode 100644 default.properties
 create mode 100644 proguard.cfg
 create mode 100644 res/drawable-hdpi/icon.png
 create mode 100644 res/drawable-ldpi/icon.png
 create mode 100644 res/drawable-mdpi/icon.png
 create mode 100644 res/layout/main.xml
 create mode 100644 res/values/defaultvalues.xml
 create mode 100644 res/values/strings.xml
 create mode 100644 res/xml/albums.xml
 create mode 100644 res/xml/settings.xml
 create mode 100644 src/net/rbgrn/opengl/BaseConfigChooser.java
 create mode 100644 src/net/rbgrn/opengl/DefaultContextFactory.java
 create mode 100644 src/net/rbgrn/opengl/DefaultWindowSurfaceFactory.java
 create mode 100644 src/net/rbgrn/opengl/EglHelper.java
 create mode 100644 src/net/rbgrn/opengl/GLThread.java
 create mode 100644 src/net/rbgrn/opengl/GLWallpaperService.java
 create mode 100644 src/rajawali/BaseObject3D.java
 create mode 100644 src/rajawali/Camera3D.java
 create mode 100644 src/rajawali/IObject3D.java
 create mode 100644 src/rajawali/RajawaliActivity.java
 create mode 100644 src/rajawali/SerializedObject3D.java
 create mode 100644 src/rajawali/lights/ALight.java
 create mode 100644 src/rajawali/lights/DirectionalLight.java
 create mode 100644 src/rajawali/materials/AMaterial.java
 create mode 100644 src/rajawali/materials/CubeMapMaterial.java
 create mode 100644 src/rajawali/materials/DiffuseMaterial.java
 create mode 100644 src/rajawali/materials/GouraudMaterial.java
 create mode 100644 src/rajawali/materials/ParticleMaterial.java
 create mode 100644 src/rajawali/materials/PhongMaterial.java
 create mode 100644 src/rajawali/materials/SimpleMaterial.java
 create mode 100644 src/rajawali/materials/TextureManager.java
 create mode 100644 src/rajawali/parser/AParser.java
 create mode 100644 src/rajawali/parser/IParser.java
 create mode 100644 src/rajawali/parser/ObjParser.java
 create mode 100644 src/rajawali/preferences/ColorPickerPreference.java
 create mode 100644 src/rajawali/preferences/ColorPickerView.java
 create mode 100644 src/rajawali/preferences/SeekbarPreference.java
 create mode 100644 src/rajawali/primitives/Particle.java
 create mode 100644 src/rajawali/primitives/Plane.java
 create mode 100644 src/rajawali/primitives/Sphere.java
 create mode 100644 src/rajawali/renderer/RajawaliRenderer.java
 create mode 100644 src/rajawali/wallpaper/Wallpaper.java
 create mode 100644 src/rajawali/wallpaper/WallpaperSettings.java

diff --git a/.classpath b/.classpath
new file mode 100644
index 000000000..609aa00eb
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..e80a6d473
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+/bin
+/gen
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 000000000..a642dc362
--- /dev/null
+++ b/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Rajawali</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
new file mode 100644
index 000000000..0766b4b5b
--- /dev/null
+++ b/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.monyetmabuk.livewallpapers.photosdof"
+      android:versionCode="1"
+      android:versionName="1.0">
+
+
+    <application android:icon="@drawable/icon" android:label="@string/app_name">    	
+        <service android:name="com.monyetmabuk.livewallpapers.engine.wallpaper.Wallpaper"
+                  android:label="@string/app_name"
+                  android:permission="android.permission.BIND_WALLPAPER">
+            <intent-filter>
+                <action android:name="android.service.wallpaper.WallpaperService" />
+            </intent-filter>
+            <meta-data android:name="android.service.wallpaper" android:resource="@xml/albums" />
+        </service>
+        
+        <activity
+            android:label="@string/wallpaper_settings"
+            android:name="com.monyetmabuk.livewallpapers.engine.wallpaper.WallpaperSettings"            
+            android:exported="true">
+        </activity>
+    </application>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="8"/>
+    <uses-feature android:glEsVersion="0x00020000"/>
+    <uses-feature android:name="android.software.live_wallpaper" />
+</manifest>
\ No newline at end of file
diff --git a/default.properties b/default.properties
new file mode 100644
index 000000000..e2e8061f2
--- /dev/null
+++ b/default.properties
@@ -0,0 +1,11 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-8
diff --git a/proguard.cfg b/proguard.cfg
new file mode 100644
index 000000000..12dd0392c
--- /dev/null
+++ b/proguard.cfg
@@ -0,0 +1,36 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembernames class * {
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..02330252e5121661fcd6ffb542c718764713bab2
GIT binary patch
literal 8214
zcmaKRWmFu^+U)>?LvTxg41-N@cV{4YaCaCS1{quj3$DR~TLJ+B1PB@=SO_7(-8Hyt
z;F9y5_k8!qJ-65DE?Il;XIIs;dUaPttE;`l$9aka008h66`-1rrNZAE3-$3io5(=;
zSWqG4^buNc8-%xoI}9Lg4Y!1W6rC+>VVW=tYhSlPm>2+n2C~=IN9e1nh*-g$IV}ES
zIDDL4AK3tan52)Zg_R==0kVYI+PjE@4_m*0LH5?-U_E|SE>%}qn4P_XpF2#;Pfgp(
z&(TWQ8Z0RR67vyx6mW(iEI>ZaPA(oIKH}hi>54qo|8{eNLH~jv9L2%^V@h9D9V82P
zhk^JxxY(_@1h_x~+#KAze1d|4Y#<&kZZ1wP9!_o^c5XotULFxHF3`U(@MAQ0Ya0<w
zsQkZUJ+{Qbb_j&42q&kvw>O73F9+P+mXljpSop674-fkzg5AT{1!3XC?&3lJj{+3t
zVdZY`im->ffc`34Si(IK;^0T8|1$(<*Z;`6c>H^s9w&^`$HJA9n}h4`kp2Oxs{a3>
z&d&cqdmuDn|LgbvDeR%`>k8x4gn7U{-K`!M&W8SPC|40#cbEkN?ye1oJN+|@>UMAh
z+`|s;3X;|02kF_nSi`+N{)JXm6;X8YKv=j~!4#q5;72}(y}h-FkUW%2SWp@&%*!jt
z%`L|z#49T&EyKmfE5OIY4dvqchYN*Uc{;;f5dUzk|CcNGU%7u1!P)gOG8E=+?*+4#
zcZWNJ{xx6``~U7m=D+Iwn``~wy~zGoF6W~e&cDn0e=YMrU5~l*xB8!?eQf+E?O`sD
zx$gd$)QivML;wKlI7O(mw$JRIpKlWNl&{&P=*?Syn?tl#Tyr-<K@cGbJrt-AN@}m%
zsPe*%l(ib7_U5x@^xexM_srl`h+^|M4eRo6r7@-2q|7NWWf%>iVir&_i7+~~lX%L~
zyLM{tN8s7QpBA&NU8JQli&nZi;YP`oL#<BcewOdjZO5T^+a++N{dmy_-X^&C>@fba
zZ>fdu-Z>MPwl4EtiZDC#>FK<k?}Z;njuji00Yj7}>1nmaZUxj@*hYixYiN{eKk;g2
zgjk%64+h589j0XJ9rYUBn=^vMUW-h%omOur!DlcvMTxY759N^F9(t=>T~R!%KH=|%
zuk78v1~QyL<iqWfq1gPYsUWZ=SXuL{RS!?F3(`Vn^gW^${!afp9Wgv_@$6!z3G!rE
zZO)zkTesRAo<0O;_4lefA+~lh9bFJ5UEf!IKD=i<OqC+I^geM4#K>&fOyU=%6_S*c
zLEftx*1k>-zkf032_eq(*Xw`9lf+Qx?Cv5r3>xWUGUbr4x%~t>@SYzM@-<=ia|gjp
z3_9|3+B;WYiq0xr-G?!Ou9Gq}23!qc0Z+S8k6bRc$8C6A@3(qyp6wl70r<4a+xGaU
z@Q{NHE&`&agx#d<WBsTnSroBFYnT;f6O)tLs*|L-(hlHlS~W)15gRHX8atEghXD;z
z=}+0|#7TrF`Z^72O{ewvc!tgDzn{@Q9VU0zq~2*E<__NU-zu<0MWQFrU`VLinrEdd
zh!GgdO?YAmFLPg-081IQMou*tuB1bf-o0}GJirBfzJ_(CGEljpxZ{pscGM8E7niHf
z-B1--GUYs{rTqcpeX5d;n*zRVq`9glAf&*SZ-r4hn~W8(np>jwCE*Q3J-;Ht<z@oQ
zsHZ~6b=WtAy-53y<mGg+N{{rn{f|Nz6j5aW43rijU!4SExuTn=`De@Q=WpZ4VteCr
zno6{?-h`tKeaiOKfbRQ&u;{vqILeJ_%|p56kp$<=;dE%A=mL#`5h4aD1(>@VX*5b?
z67@&~h9(&!cE0*tV=|;WCY&zhd7CiK${*BJYcdITtU@YryD$D(+>o5Axki`lw*%i8
z5<gGztM;*Drl%Vby`qTKptP>D=Uz|W$6%|dsiLF}tNTs45S|E9)sB3E-7Tf#x!nX9
z4JAqhUmYc(hvdI~ss0+PuzE%Zg6stGQC4r2Y8oi&_zo;9N<AS5UV=WV2-I6m<wYOY
z#>rUry-SZV@|4!dN#DBd$ks$<n)RYkcBrj^@OTHpgw6IwDwLXZcM$O#ewC9BzDG%*
zIxH!aNh}MM6~V%kU6G&fxf6M2sK-IysiW1~Ycom`WQmJ`T3|(8b59@2&K|;vOZpDS
z&tKqM377=?{wG(*$%Xg8xL*Ac>nYZTsgX90tsD1i)V|f_?ROLVpUVo%wHocaq2-N-
z07Pd>QIA5YfLa3n6N1)+sU0sWD`GkjO;O2Dzl|(AY={O?MZ!zEHt}^LKK;&sygQ=a
zb`&DnBMr@b!gB(W%~xcj)jNZ)y<Fx5xFu%thjwFVMX0Ds-%wt82DWz#rC`^#(kywh
z_edFkx324OKJLUMb*#=PT%)kHwfNRj-IzU0P1NW#JI?(U|CvB1Ti{685f*V_F5prs
zLn;Js^T`J27x1!&P#suA=AVW^#9Wy@UXKM2yJ*eneD{G?{G>BAkyb}@=X^u1fHKWh
z@oW^w+4F-^v5_EZr)B+^G%DuRZ$3j1K6NoJt9|1fat$?}7{K!m@&hfA-w}V{;^#ow
zplVKyS+hB!r8I!HsKUDit1JSV34zWjzf58Eflohc|8xT7W;z2<Z4O4Qwi0#yDebNi
zJHI+I|8bE0{wMQ`_O(buYQ%h0v}N<`z8C)3vDET_w!@Tz1!X4%Ms+bnlPOKj_M`&r
z8P7p#z?2%sXEWNe(W3sc2Mx_osZvKzZ%Bvq#H&?{`f0PPvrU5``W^+zr**<NNp|z<
zQF2kIw__NA=nwaBt!PE^i2UmQg#EeWK@xxOEjO!%)01mfR7U;b4^!Dg6KX^5_!R0n
zGVxt+p}_Cqa|`L!<z#X;C}Y|S+;blbvfiX084?Obt^ff)6%Xr$l(xp$Y|?kV@of(-
zoEkKImoE16efHc!+K|aBX@>kSJ_;!+pH%AkhF*~{uECdU*F?)DJ_ailzCUlSi#=n`
zyUr}w2%B_hG+=F=cdFt|{{5cMV?mn<m))f5gK)yetk?T-g6&Pe>i*0rdl~UTVh&iW
z$d<{FDcpOsH^tt-W{xuF>FdGSM*3YUb-LjDRgZD*hZQa6NiE?>yV5ZOLo<9lG$E7a
zWy>TW4W&oYnJ@TBc{Cx;TJlu`q^~t`bd<|HH3Y1%l^7c|v_8Ol2_FI#5@Bgr1Qh<7
z;O*_W$LDjp?`17F8WzB`ITJI{g({}MC{+L|3|MOtX76T0Hp2pCLF>y@1ysvrDk7D3
z2C5j+DQ$(0SwkD16~BK5)m3y7e@;Lb(ZdU4&nbT{>0@_)GJ$Vp#adap;0TASZxm?^
z^(oL78A2;$>#GYKxrcEb8y}Wa6eQ0vV+;g2JD%R^I=HU(!&IcdehO8J^Q~~bh*!?e
zn@!_Hb^4f)^a6j;&{#vG#1RJ~#Zb-{-8ko|0Z=6!tf;WFub(r0|3;d6Fa~2>fSY^6
zchTLKD38sWHyWNyL^Hts;f-Uwm#DV;&fPYlrk!oW-P!2s{lqtVx>Vg7jof3D0#{B=
z(x36CIX&>Jd(xHu8fgdgz36HduueBc$6UaHGFmt+$vQuAk^AGDvJF!E!BrJaJ==^7
z)~Zhjhtmnqg%L}oRGLA@{GBU}wp-^xNeg2}US)iq&d#d3q-;{L%y?++U&TZfw84CD
z)SV|`?6BJ)fu)x`feOPVF+Dy3vbSk91T@q9B8@9YXs<8#7Q?JJ%mVJ#jAn<FCZ(nJ
z;$D*<2P9a<Wd6)0yk}z?UP*NFS&HO8Ph|Q*8AbGKwRWq8;?<wmYdKGd5Mwf&)t-+=
zEje&OwUeIgmAdufN&FG>M_;bLf63Y7l<-=GHqTs#E&aJH4UnHa>!*Dv-EnR;XE*s7
z@*UmP-n*rtbS^19Yd1rh?~LL#W?y;CPJpRuxdd0WnzP&vA38QGEMjtYL(5Fqb$uX#
zeXg?Mo9)By;pI6#K<)*4qgZ@o4eL00M?~*yBJ?V{km-z{6X)B455G8Rh26I|_w4fm
z(Q6U&bk*=Z#ae=kg(;d6R*&=ZK2c10hK6VKJ-=n5wZw6^-*A%WaO4Ynyw@}p58h#4
zrZg#gxDtFAM25A(IoZ5L)x3J-&9v)@O|sg>GoO23h}Zr3Ts6q@bdJ>K6fZq(H1fkO
zC8i8@Xk9^FUsZa4e(?P|E~gklWN=lTDI2M%{MIlae#gzZxW+8~OVsBdcUE9*tP%fX
z1=`@<=2Vig)L}oaj)W_9NSRFUj|<7OGcxzv{T6-+&8zr9)N5AS&tdf9Opwjf_irZc
z_>JO421>OX$9F#2!oLSx<C-}MR`70(=uA$@$H?*LTzZN7R9mKtIAESvJxh6xLAl)&
zti_tz1dE_YjimjES0E8X&(K%E<T@aINJJ;2;RI&XY_KVAb{k_-Db?%%xbMod884pd
zj|q8jIkd&~;JQIbWf^+yLu=ms3NSMDxnDo|J^K6m`O;_u2|gZD<NJQttHAsD{67ob
zb=fjCCZAQy`d&gZx`m*WgC9ee6Mfz}ve;=pJw5J_wtE&Doia&E)PB})23Q2jsh61h
z)V|?d<l?zDMEG4v6}*pbKxa;|Lt=fUMl~Rm6Gt17UWgXM#ycTpY@s8Pr$gzB=)9hu
zhLj<ktHgNt_Ciyd*n4ch1SbUhtw~jU0Z*z|F_xpd6CVfnu60j`RO^?UNuaZwjX^nL
zyWCPqIMS7}4i?L8SeY?dnzBe%6943yDVJ*6i{}nm8^u2@c=dJ~xY;Z)pousB4BD|p
z{8KX8C0dp?q=JaJ2&=sRrMC)An~2B(z*>q0#N`_BmM&BHBM*>aUIR0_@G$EJN*xj!
zGMy609~Z9HbARyAsKbcYU0ch2^ea|5b|FFIyY(iyiw^7JV)_HBG%dx1_L(TpKGt|W
zUcZ~QT)K3ID?-*Lr#~!1x4WxjemdRcVqKO<)5wDYdtd`!D+eJrv|gWoJ8!F*BJfL6
zv3HuU(v)yg6<0RfA_hrdsRhQdF4U_@?kW215P^l#iEb&e-K>t)wM&15lv%~_E$X7<
z%M0)Euj5bfBO@pQ`RNzb0tST5?8|sX2xn-}u}Yk0CIdyiIBGt;&B?uuxF0`GYIlg$
z3&a6rDcc{BMsaStKDm&?GpzREC$igkwsZ%l_tS2B=&3Oi^7b!P1*A$Zcw)66+^XJL
z*ZH|@p^bz~yY7C^V7MYzJxARpq9ddyEM%yy=h^DiDQHAFKug$Q5U$M}$YWqse|MLV
z7ZznsX5Jz$oJZ<PYysCPfz0Z^*F@?vwww>XR^!a@Xl|ppX(_XELetr<!0CSQYCb8~
z4%95-G)jQ>eqxgodts&z*3qDu!cCo&t3Ur*qUUgNp7AQ^6KQqFMO7JD;Y(W4o8{!o
z#Kd@N(F+Kpb_r>K@B}V&qF`FU*26r$(AI}iCM<+rMORe5J>uoyD{5Yjk0qVNrT7;R
z1s=3sj2d2jgDZ=V#DfI5MFU%*tbNbLZfyp+=Je;CKQ+e3Gc$?cNK4J>78#fy|33FB
zcDyJ*{#AQ0PJ1zUSs3iAKQAcdl<xGWo5CQ0rr0_o1$!VKGEM%GAO5yocrU~I75?W0
z*^ZmEC9AUhkrz-<1)kaR+<q@+qQobw9?9FAt>B#3KMKk|N0Z?k4A|1vGVn$dsf@1h
z=3_^T1HXcfi23M9>8xMahX^5ipzSys1RmEkf|R|?<xLGd2C<r(pF9M=sRx<o%0B)<
zMw{<pc1_*i?E-(Ti20eb9myhGGkfWpJD%(^$sKXCg>UpOXE%T5r;rd^HEvf+I9Tc!
z{p2`&U~L*|${ZV;0vDX%5B~HHk{#q>-}}kbPJ2r!5dFEXOp3)YnTj}D7$tMj@@t6+
zK7B|CfJ>1ON$|0Yo-;D0pDJtp>vSUOl!sH1jFcPa+eL{8%0BECsb?Ivb)<xEQjJRm
zB)v@zhalR~b|363rdgMWZ0LcUgs-jkA`GEs+-o>!NNf^9p@7uPalV9btKz;W)X@-I
zEuksNz=vh7T@in86(T8LefNm5UcbtkkTNDFhGg35FR7SUok!5Bj(~%2!cv@_j+r>x
zNGWLiJ7YX)yD%RD;y2-ZeLZ|_W_IvRS~UTW7TzhBMfDp8qoqSSJPVIFFdg?pK^#&J
zXIV7RyZG0z$i9*p(K;_g2r>>7N#&u)KNtz3ICc}CZ(%93ZI;_VZ2^Zv5<;W(KVXlO
zrI-+qN8~)eOWU9GDuxG(%oM*_g(>^3oKNhzB7w=Q(Ogt!${7fxWQ+5iVd-f*#g{+#
zJ<MLzEe~gdr+_7OD5E}sxT6S?p)}hx)5lFwnVKVUUOy9hu{NaFZRjfy(>~!|I5|U2
zZ$L7H(->pLp3QzEy=YfzViYSUj#Wo=%3r!5Y5u%DIN)Oa&QQ3eeuc<QpCuQv;I2%Y
z+a~#%$#&@A0(1QJrTCwj5s5)#*E%)QiGT}q0~sg+3|}6o*%v|pS8N^Q54z$-2Ny3#
z?vDp&jZQ&b0qSVlWdw`CK23XHtJ`4?v7yDQQY*ucZ!7rJ9NP(aoH?~;&b#96gvxz<
z))3ApR~aEK#ZJNYU7#gutbOZcm08>8dLf?k725*+>fkM3_+~&(er4PqYLW{HDa5dA
zg`MRG^-R6@$LGR@dPX;!JAylQ*eN^LC@L5?5;cym?z&&!+c&Y1Mz)^ot@ileB#Ko8
zZF=L&REp6i99K{$u6^d*@hCD8(sOQz>LfD}4!oE}OB8Dk-sQW(EmA<A^9KAd4L*->
z2rk@=40Lerzc9g1HI)di+Yc)r(<W`z2&kVWk`*vBjqr;?J5og!?Sktc&b9p#^L&T*
z#V*fl{`@`~KdT8o+uv+))SoQOt;CJh+uEWMd;*b;l)r6>f4k=Yetz9iFJf6$`i*M6
z^J_Ndm~$JFY_6(Hwb*sn?W{!WDO2~!-#-22+nFR8<P(EP<&DOk2%hM%B6s5w>S?X0
zPeU0Z(u5?l`5J&W`A7_*<h(ykUsM?sPu~MO#G@hv$ukaf=IcCnk=jc>J$njRcm?_T
zY?~-e9l{<|>3s5TN*ZCEIeCjhEuK?<riJPXN47IFIE-&fF%u5TZ^+7dZ!h9Y)6x<p
zj!^<Ug9_IC@4M%#-RQ9N&R3h0+oTy1-j(ij6deR#HxJao3^>x1e!ffC&1}qa8YV~^
z7k`-lbNHYrY)m>w5>U+p9x#vw*5gb2pmG9Dl@dHqpT3>8HqJybpClVK`<5~FZHu#`
zgG=(I)DI$H7T#)<eVwthV9oc1)us&NC2L(Y2(EMsV6O+zRuZLTPKEyKRJJKo(V2#0
zkLI~ajqb=7H;Ek8!`sf|NmjTE)9*5~0QW!Vr_F{iJG;B_Z#NAp2lHoY1Z(<Iz=4-4
zT&k;sL0dD0ba*Kd5uN5SW$$8~P%`>H++IuWJyE%0n+rN-yH172%vk6;x}Yw`C6o0k
zhqreb45qO_pU!l6uKp_Sjve9DZE;B7^Vr+zy4#jY@UZ|qrC6u29W;0n-9@9&vFpcV
z9*&7c<+g+$Qe|xLLc!8-;+CqZxs@=JeMY}2XW=Bi*|0%`k4wRW>ilbRpX1hEhF%og
z0_DN&^Nd9X$cIEY8G{K1kOIuYFj}~D%J#7*S#rT)kyuW3tg{NRhVqTb0Jg8@>Vf<Q
zgfFJRVGR#guklIm7kR&Y_tAc7sfVYGv?J`Cfe3`A?>H&NqQ;haAHEs={ctz>AmYAv
z{Ke;*fBRn4s4^x*+9+J=bL=Vny^;gMN48aqf4KS?5ELfe3`+3b(`3N@R8m4V<`fqX
zH#W>>&!I9XOifJ{0j06Tiv`}zzvn$|_`Ujl4qdfD{EN5{<GFUtv}gzbd0y*bOMW9i
zd4n6<i&|bX*FacSZABEF9T|`PL*n)WPYH|C%TC|8-jBw){Zg&8Q5vMNG}-EwDnO%{
z4QV>bT5kDi&t*An7TAbsd+n?p5f$@opEgHSow-q^j6%JG#n5Dr<sL`PB9}3zFsKXK
zy|Zo{&Ts~J`bz8eJJ!P6+$F)fhJ}3<IEG|{#-2Uya$)Z4CBadr;gLlgr>Vnd1Sja-
zXh}HYO{jOw0oOmn?8y=C=soqlgw$D2nVG#`=;$z32+ZMsc+bb%MS`-x7@9GPC{d>`
z0DVO+_lh1MaV-YmoKJ=FEHr-dq))=L)R)7T=aegf17x2>i8lz>uy!Fh%Y|848EjL1
zQK9YyT=XaidetZLsqF6LF)qtO^mY8y*3YUMb9F&vRl1^P1I#bQ+`7A)C^ozF!}I38
zKQRZ#wrkbo6~=dV3B~-bXo+%_c?xW!)bUJXd}(Fb!xv!ZFNeYS`zCM3E5inEmf7wy
zWt3-+ws2mJ6XJ2xk#{}L9E=-^Qg~5rCVna_3P?ghSH}7(N?dnSU|Z#1IL1o@j>1vT
zkjl{qq&y)+NMOkTNk_zM_JNDv?p7mB#&)!SPu|J2&ILMd;v})zZ3IX()z#tc(p1=c
zTjHWn%!$f}bh^TO2*w4F5orkOaMR9;iCHOqKwsKqMNY9k`A+4?{g17Rw8`078Q*h5
z--gp4M)rereP*o<U7c(SI8j-^4<F;+t;z*uUO}W}n2<foY{GZsAKzXv0w@{H$%(pS
zhB`DFB&#X~MV;#%U1sV$?d)6;0ppFi9=0QL8tc>dv&jCtJHm|)DcCz(92iyw&Ig%F
zhnfYOq0=4QrBkZi%1;R^#(geN`i>*?OIq%4@&ig~YGdC{p$cj;a09}YNXCgC6b}s<
z8Yy&ZoBXL!U-c`h0X9~68R8<ovM`sQ2?^&>yZ}qv)k4bj8=LKgI%c?Ygo4Z;BmjxS
zV>vMNFL$Fm4y6v62j{;Q7W)>a?N&QuMLZpY%5E=&yZBnpD>O{8*kt$iKZg0zON`Mt
z3Ya5R?5WvXB8wF&BaN_Aw3GsvIpZF*F=e4$KnHRNPgG`)3h_1ZpgNJ16d(x;$W)x?
zqxu7w!hXh;fSr;$8lROz<DzyTL@9Wq6xirISvirRmTOouzPVX#)@s6i>*BC<PhW3(
zYDi{7Wm8Xsj)ZFTZ+Ta|wk(Nx_bif1Cv1^QyF^&=Y2jCw300_W2wO44UWt5Rc%L#8
zj6#9;L=egP^Cl$p=VFnH-D-sY7GL{XUkRzypa%cO4Tt<ZI*EyqsK-8@$>*TmN;3>!
zrI4j(>~=6}W<BM*(k7Ch#l$|S9K;%$r^{Vz%7hE+lj;OA(j{oSa8}Z6=wv1@C>i!6
zL#5uy(7SDpfVSWcAxKfTL)xoJNpchgE{UkWH-7rfrF{Zr4zncn?Ikqeu=-Zw>{24=
zxI3aU<A+gRekP4;eq5<`Hp@Bp^KfNKAryH)uNd$c<K8S%7|r2l=cV!36KXWP;JRWW
z2E7te04t~rGMhda<YPJJ@KrZHVXf7paqVbYDZ$~vLG;L_8h|wM6q`DAUh-}O2}{^z
z>rORZ?k@%Tms+-Rtbfq{wuKX+$?bjgvx~<65&%OhEklT#K|-i{K!$In6wWkL_{4LW
zQgBphL)7co`%<cCD(8T%p?cJPK8GNzOD~Fo0a{v`p|C>6$G`a*m-1DSE`t1rC7Ai)
z8Ky!uOgQ>9jD?`srqbhdbFcgHt7a$JD$(Y2#-^Q)DKyqwltw1?8LqmGP1Brxli|5v
z>&$ke(UUfZY^iT=xg#_&Np0&qnau|n1`K|jR?L={7GmxRW!I<R+$EDtd7m3D9hXa7
zCBM3puWCE%eK^Uda9Ox{ru)RgM2GlI|2yZo_S;v-xz4spd?Z;P;%Y}^2^=J_M9Mrz
zT#6TZ{auz?eD_Z_&<OH{?goDK&O96T`_nH$8}>#Mg2Yjlf|9<0mLRLwo+$-JApB})
zK3Xn*WE(j>+~99*^*3tO_;Pf!bG(21>h9#V$&kKjCdIwTl~T9DEOWC8HaQ)NEQ3P@
zY6E7-x-=U7+o27|eXqJNo=pHBPPDKU;fon9PP^vO*Y{n_brJL3=Z@bmgN0beGZar3
zYbDnTJf$0=dD23m@)7OvEz_>KnI8G*lJ1gcTU67zJgq^;PQLcngJyruO>QqIz6}i<
z?sF!>`!H^j3DNvsa(~`Z&?Pmm=9)QN5BB|$57Kg1-J^Z!3FolXO@G|Y<~S5XtREFK
z;}!3J%6<{Yw|olWGp2}&V^j%ARi^UxdKC-|@@2cj>uYben0-I>xECZ|=QdPJ5ELb#
z$6Me>#O1S%9MWV+YE~3y>gQBsZCCb298O>&TRz{l>*+umXB}8dr{j>dD2%yIGnU!x
z>s^!AlCBNs4_TdlMyGc-bG$DM>Wr68=+!f1|A17dbCo%yCNHV!4(?HhOpMLeDQ6^D
z&n}NU(Z0+INVCXP1gtF3Tncg772@|ID%95<1WH$~9p;*OZatdE6A#?X-{v<r+nxBB
zgIWU*1GVOwI&wBHdGYY%8-D%i^ETxM|4Jy;TJlxAdT_EXpv4vbd;E8$*#AIe4u~d9
Vs}LIz$ozX!uPCPmt(Gwl{XgyKJ&*tZ

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..13d09979b1fbbe2faf32d5748d7c2fa84f2aea91
GIT binary patch
literal 3038
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
XkQH?BP4>vfAGd|M4Z7I$?4|zz5&=ko

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6eb49879c6f69b812b85260492d2f613a39c383
GIT binary patch
literal 8214
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
VRfvrUWd1#=SCmtOR?C=&{vVjDJ-+||

literal 0
HcmV?d00001

diff --git a/res/layout/main.xml b/res/layout/main.xml
new file mode 100644
index 000000000..4361cfe8a
--- /dev/null
+++ b/res/layout/main.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+</LinearLayout>
diff --git a/res/values/defaultvalues.xml b/res/values/defaultvalues.xml
new file mode 100644
index 000000000..919b6a35f
--- /dev/null
+++ b/res/values/defaultvalues.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<integer name="ribbon_default_amplitude">5</integer>
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
new file mode 100644
index 000000000..ef17ad290
--- /dev/null
+++ b/res/values/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name"></string>
+    <string name="wallpaper_settings"></string>
+    <string name="description"></string>
+</resources>
diff --git a/res/xml/albums.xml b/res/xml/albums.xml
new file mode 100644
index 000000000..fc01c6bc7
--- /dev/null
+++ b/res/xml/albums.xml
@@ -0,0 +1,5 @@
+<wallpaper xmlns:android="http://schemas.android.com/apk/res/android"
+	android:thumbnail="@drawable/icon"
+    android:description="@string/description"
+    android:settingsActivity="rajawali.wallpaper.WallpaperSettings"    
+/>
\ No newline at end of file
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
new file mode 100644
index 000000000..c33b8aedf
--- /dev/null
+++ b/res/xml/settings.xml
@@ -0,0 +1,13 @@
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/app_settings"
+        android:key="appsettings">
+
+	<PreferenceCategory>
+		<!-- CheckBoxPreference
+			android:key="touchAnimation"
+			android:title="@string/touch_animation_setting"
+			android:summary="@string/touch_animation_summary"
+			android:defaultValue="true" />
+	</PreferenceCategory>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/BaseConfigChooser.java b/src/net/rbgrn/opengl/BaseConfigChooser.java
new file mode 100644
index 000000000..c75fff7f8
--- /dev/null
+++ b/src/net/rbgrn/opengl/BaseConfigChooser.java
@@ -0,0 +1,132 @@
+package net.rbgrn.opengl;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+import android.opengl.GLSurfaceView.EGLConfigChooser;
+
+abstract class BaseConfigChooser implements EGLConfigChooser {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	protected int[] mConfigSpec;
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+	
+	public BaseConfigChooser(final int[] configSpec) {
+		this.mConfigSpec = configSpec;
+	}
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	abstract EGLConfig chooseConfig(EGL10 egl, EGLDisplay display, EGLConfig[] configs);
+
+	public EGLConfig chooseConfig(final EGL10 egl, final EGLDisplay display) {
+		final int[] num_config = new int[1];
+		egl.eglChooseConfig(display, this.mConfigSpec, null, 0, num_config);
+
+		final int numConfigs = num_config[0];
+
+		if (numConfigs <= 0) {
+			throw new IllegalArgumentException("No configs match configSpec");
+		}
+
+		final EGLConfig[] configs = new EGLConfig[numConfigs];
+		egl.eglChooseConfig(display, this.mConfigSpec, configs, numConfigs, num_config);
+		final EGLConfig config = this.chooseConfig(egl, display, configs);
+		if (config == null) {
+			throw new IllegalArgumentException("No config chosen");
+		}
+		return config;
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+
+	public static class ComponentSizeChooser extends BaseConfigChooser {
+		public ComponentSizeChooser(final int redSize, final int greenSize, final int blueSize, final int alphaSize, final int depthSize, final int stencilSize) {
+			super(new int[] { EGL10.EGL_RED_SIZE, redSize, EGL10.EGL_GREEN_SIZE, greenSize, EGL10.EGL_BLUE_SIZE, blueSize, EGL10.EGL_ALPHA_SIZE, alphaSize, EGL10.EGL_DEPTH_SIZE, depthSize, EGL10.EGL_STENCIL_SIZE, stencilSize, EGL10.EGL_NONE });
+			this.mValue = new int[1];
+			this.mRedSize = redSize;
+			this.mGreenSize = greenSize;
+			this.mBlueSize = blueSize;
+			this.mAlphaSize = alphaSize;
+			this.mDepthSize = depthSize;
+			this.mStencilSize = stencilSize;
+		}
+
+		@Override
+		public EGLConfig chooseConfig(final EGL10 egl, final EGLDisplay display, final EGLConfig[] configs) {
+			EGLConfig closestConfig = null;
+			int closestDistance = 1000;
+			for (final EGLConfig config : configs) {
+				final int d = this.findConfigAttrib(egl, display, config, EGL10.EGL_DEPTH_SIZE, 0);
+				final int s = this.findConfigAttrib(egl, display, config, EGL10.EGL_STENCIL_SIZE, 0);
+				if (d >= this.mDepthSize && s >= this.mStencilSize) {
+					final int r = this.findConfigAttrib(egl, display, config, EGL10.EGL_RED_SIZE, 0);
+					final int g = this.findConfigAttrib(egl, display, config, EGL10.EGL_GREEN_SIZE, 0);
+					final int b = this.findConfigAttrib(egl, display, config, EGL10.EGL_BLUE_SIZE, 0);
+					final int a = this.findConfigAttrib(egl, display, config, EGL10.EGL_ALPHA_SIZE, 0);
+					final int distance = Math.abs(r - this.mRedSize) + Math.abs(g - this.mGreenSize) + Math.abs(b - this.mBlueSize) + Math.abs(a - this.mAlphaSize);
+					if (distance < closestDistance) {
+						closestDistance = distance;
+						closestConfig = config;
+					}
+				}
+			}
+			return closestConfig;
+		}
+
+		private int findConfigAttrib(final EGL10 egl, final EGLDisplay display, final EGLConfig config, final int attribute, final int defaultValue) {
+
+			if (egl.eglGetConfigAttrib(display, config, attribute, this.mValue)) {
+				return this.mValue[0];
+			}
+			return defaultValue;
+		}
+
+		private final int[] mValue;
+		// Subclasses can adjust these values:
+		protected int mRedSize;
+		protected int mGreenSize;
+		protected int mBlueSize;
+		protected int mAlphaSize;
+		protected int mDepthSize;
+		protected int mStencilSize;
+	}
+
+	/**
+	 * This class will choose a supported surface as close to RGB565 as
+	 * possible, with or without a depth buffer.
+	 * 
+	 */
+	public static class SimpleEGLConfigChooser extends ComponentSizeChooser {
+		public SimpleEGLConfigChooser(final boolean withDepthBuffer) {
+			super(4, 4, 4, 0, withDepthBuffer ? 16 : 0, 0);
+			// Adjust target values. This way we'll accept a 4444 or
+			// 555 buffer if there's no 565 buffer available.
+			this.mRedSize = 5;
+			this.mGreenSize = 6;
+			this.mBlueSize = 5;
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/DefaultContextFactory.java b/src/net/rbgrn/opengl/DefaultContextFactory.java
new file mode 100644
index 000000000..4048e607d
--- /dev/null
+++ b/src/net/rbgrn/opengl/DefaultContextFactory.java
@@ -0,0 +1,46 @@
+package net.rbgrn.opengl;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+import android.opengl.GLSurfaceView.EGLContextFactory;
+
+class DefaultContextFactory implements EGLContextFactory {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	public EGLContext createContext(final EGL10 egl, final EGLDisplay display, final EGLConfig config) {
+		return egl.eglCreateContext(display, config, EGL10.EGL_NO_CONTEXT, null);
+	}
+
+	public void destroyContext(final EGL10 egl, final EGLDisplay display, final EGLContext context) {
+		egl.eglDestroyContext(display, context);
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/DefaultWindowSurfaceFactory.java b/src/net/rbgrn/opengl/DefaultWindowSurfaceFactory.java
new file mode 100644
index 000000000..452381986
--- /dev/null
+++ b/src/net/rbgrn/opengl/DefaultWindowSurfaceFactory.java
@@ -0,0 +1,46 @@
+package net.rbgrn.opengl;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+
+import android.opengl.GLSurfaceView.EGLWindowSurfaceFactory;
+
+class DefaultWindowSurfaceFactory implements EGLWindowSurfaceFactory {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	public EGLSurface createWindowSurface(final EGL10 egl, final EGLDisplay display, final EGLConfig config, final Object nativeWindow) {
+		return egl.eglCreateWindowSurface(display, config, nativeWindow, null);
+	}
+
+	public void destroySurface(final EGL10 egl, final EGLDisplay display, final EGLSurface surface) {
+		egl.eglDestroySurface(display, surface);
+	}
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/EglHelper.java b/src/net/rbgrn/opengl/EglHelper.java
new file mode 100644
index 000000000..62510d0cf
--- /dev/null
+++ b/src/net/rbgrn/opengl/EglHelper.java
@@ -0,0 +1,183 @@
+package net.rbgrn.opengl;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGL11;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+import javax.microedition.khronos.egl.EGLSurface;
+import javax.microedition.khronos.opengles.GL;
+
+import android.opengl.GLSurfaceView.EGLConfigChooser;
+import android.opengl.GLSurfaceView.EGLContextFactory;
+import android.opengl.GLSurfaceView.EGLWindowSurfaceFactory;
+import android.opengl.GLSurfaceView.GLWrapper;
+import android.view.SurfaceHolder;
+
+class EglHelper {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	private EGL10 mEgl;
+	private EGLDisplay mEglDisplay;
+	private EGLSurface mEglSurface;
+	private EGLContext mEglContext;
+	EGLConfig mEglConfig;
+
+	private final EGLConfigChooser mEGLConfigChooser;
+	private final EGLContextFactory mEGLContextFactory;
+	private final EGLWindowSurfaceFactory mEGLWindowSurfaceFactory;
+	private final GLWrapper mGLWrapper;
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	public EglHelper(final EGLConfigChooser chooser, final EGLContextFactory contextFactory, final EGLWindowSurfaceFactory surfaceFactory, final GLWrapper wrapper) {
+		this.mEGLConfigChooser = chooser;
+		this.mEGLContextFactory = contextFactory;
+		this.mEGLWindowSurfaceFactory = surfaceFactory;
+		this.mGLWrapper = wrapper;
+	}
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	/**
+	 * Initialize EGL for a given configuration spec.
+	 * 
+	 * @param configSpec
+	 */
+	public void start() {
+		/*
+		 * Get an EGL instance
+		 */
+		this.mEgl = (EGL10) EGLContext.getEGL();
+
+		/*
+		 * Get to the default display.
+		 */
+		this.mEglDisplay = this.mEgl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
+
+		/*
+		 * We can now initialize EGL for that display
+		 */
+		final int[] version = new int[2];
+		this.mEgl.eglInitialize(this.mEglDisplay, version);
+		this.mEglConfig = this.mEGLConfigChooser.chooseConfig(this.mEgl, this.mEglDisplay);
+
+		/*
+		 * Create an OpenGL ES context. This must be done only once, an OpenGL
+		 * context is a somewhat heavy object.
+		 */
+		this.mEglContext = this.mEGLContextFactory.createContext(this.mEgl, this.mEglDisplay, this.mEglConfig);
+		if (this.mEglContext == null || this.mEglContext == EGL10.EGL_NO_CONTEXT) {
+			throw new RuntimeException("createContext failed");
+		}
+
+		this.mEglSurface = null;
+	}
+
+	/*
+	 * React to the creation of a new surface by creating and returning an
+	 * OpenGL interface that renders to that surface.
+	 */
+	public GL createSurface(final SurfaceHolder holder) {
+		/*
+		 * The window size has changed, so we need to create a new surface.
+		 */
+		if (this.mEglSurface != null && this.mEglSurface != EGL10.EGL_NO_SURFACE) {
+
+			/*
+			 * Unbind and destroy the old EGL surface, if there is one.
+			 */
+			this.mEgl.eglMakeCurrent(this.mEglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+			this.mEGLWindowSurfaceFactory.destroySurface(this.mEgl, this.mEglDisplay, this.mEglSurface);
+		}
+
+		/*
+		 * Create an EGL surface we can render into.
+		 */
+		this.mEglSurface = this.mEGLWindowSurfaceFactory.createWindowSurface(this.mEgl, this.mEglDisplay, this.mEglConfig, holder);
+
+		if (this.mEglSurface == null || this.mEglSurface == EGL10.EGL_NO_SURFACE) {
+			throw new RuntimeException("createWindowSurface failed");
+		}
+
+		/*
+		 * Before we can issue GL commands, we need to make sure the context is
+		 * current and bound to a surface.
+		 */
+		if (!this.mEgl.eglMakeCurrent(this.mEglDisplay, this.mEglSurface, this.mEglSurface, this.mEglContext)) {
+			throw new RuntimeException("eglMakeCurrent failed.");
+		}
+
+		GL gl = this.mEglContext.getGL();
+		if (this.mGLWrapper != null) {
+			gl = this.mGLWrapper.wrap(gl);
+		}
+
+		/*
+		 * if ((mDebugFlags & (DEBUG_CHECK_GL_ERROR | DEBUG_LOG_GL_CALLS))!= 0)
+		 * { int configFlags = 0; Writer log = null; if ((mDebugFlags &
+		 * DEBUG_CHECK_GL_ERROR) != 0) { configFlags |=
+		 * GLDebugHelper.CONFIG_CHECK_GL_ERROR; } if ((mDebugFlags &
+		 * DEBUG_LOG_GL_CALLS) != 0) { log = new LogWriter(); } gl =
+		 * GLDebugHelper.wrap(gl, configFlags, log); }
+		 */
+		return gl;
+	}
+
+	/**
+	 * Display the current render surface.
+	 * 
+	 * @return false if the context has been lost.
+	 */
+	public boolean swap() {
+		this.mEgl.eglSwapBuffers(this.mEglDisplay, this.mEglSurface);
+
+		/*
+		 * Always check for EGL_CONTEXT_LOST, which means the context and all
+		 * associated data were lost (For instance because the device went to
+		 * sleep). We need to sleep until we get a new surface.
+		 */
+		return this.mEgl.eglGetError() != EGL11.EGL_CONTEXT_LOST;
+	}
+
+	public void destroySurface() {
+		if (this.mEglSurface != null && this.mEglSurface != EGL10.EGL_NO_SURFACE) {
+			this.mEgl.eglMakeCurrent(this.mEglDisplay, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_SURFACE, EGL10.EGL_NO_CONTEXT);
+			this.mEGLWindowSurfaceFactory.destroySurface(this.mEgl, this.mEglDisplay, this.mEglSurface);
+			this.mEglSurface = null;
+		}
+	}
+
+	public void finish() {
+		if (this.mEglContext != null) {
+			this.mEGLContextFactory.destroyContext(this.mEgl, this.mEglDisplay, this.mEglContext);
+			this.mEglContext = null;
+		}
+		if (this.mEglDisplay != null) {
+			this.mEgl.eglTerminate(this.mEglDisplay);
+			this.mEglDisplay = null;
+		}
+	}
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+}
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/GLThread.java b/src/net/rbgrn/opengl/GLThread.java
new file mode 100644
index 000000000..cf403dad6
--- /dev/null
+++ b/src/net/rbgrn/opengl/GLThread.java
@@ -0,0 +1,415 @@
+package net.rbgrn.opengl;
+
+import java.util.ArrayList;
+
+import javax.microedition.khronos.opengles.GL10;
+
+import net.rbgrn.opengl.GLWallpaperService.GLEngine;
+
+import android.opengl.GLSurfaceView.EGLConfigChooser;
+import android.opengl.GLSurfaceView.EGLContextFactory;
+import android.opengl.GLSurfaceView.EGLWindowSurfaceFactory;
+import android.opengl.GLSurfaceView.GLWrapper;
+import android.opengl.GLSurfaceView.Renderer;
+import android.util.Log;
+import android.view.SurfaceHolder;
+
+class GLThread extends Thread {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+	
+	private final static boolean LOG_THREADS = false;
+	public final static int DEBUG_CHECK_GL_ERROR = 1;
+	public final static int DEBUG_LOG_GL_CALLS = 2;
+
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	private final GLThreadManager sGLThreadManager = new GLThreadManager();
+	private GLThread mEglOwner;
+
+	private final EGLConfigChooser mEGLConfigChooser;
+	private final EGLContextFactory mEGLContextFactory;
+	private final EGLWindowSurfaceFactory mEGLWindowSurfaceFactory;
+	private final GLWrapper mGLWrapper;
+
+	public SurfaceHolder mHolder;
+	private boolean mSizeChanged = true;
+
+	// Once the thread is started, all accesses to the following member
+	// variables are protected by the sGLThreadManager monitor
+	public boolean mDone;
+	private boolean mPaused;
+	private boolean mHasSurface;
+	private boolean mWaitingForSurface;
+	private boolean mHaveEgl;
+	private int mWidth;
+	private int mHeight;
+	private int mRenderMode;
+	private boolean mRequestRender;
+	private boolean mEventsWaiting;
+	// End of member variables protected by the sGLThreadManager monitor.
+
+	private final Renderer mRenderer;
+	private final ArrayList<Runnable> mEventQueue = new ArrayList<Runnable>();
+	private EglHelper mEglHelper;
+	
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	GLThread(final Renderer renderer, final EGLConfigChooser chooser, final EGLContextFactory contextFactory, final EGLWindowSurfaceFactory surfaceFactory, final GLWrapper wrapper) {
+		super();
+		this.mDone = false;
+		this.mWidth = 0;
+		this.mHeight = 0;
+		this.mRequestRender = true;
+		this.mRenderMode = GLEngine.RENDERMODE_CONTINUOUSLY;
+		this.mRenderer = renderer;
+		this.mEGLConfigChooser = chooser;
+		this.mEGLContextFactory = contextFactory;
+		this.mEGLWindowSurfaceFactory = surfaceFactory;
+		this.mGLWrapper = wrapper;
+	}
+	
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+
+	@Override
+	public void run() {
+		this.setName("GLThread " + this.getId());
+		if (LOG_THREADS) {
+			Log.i("GLThread", "starting tid=" + this.getId());
+		}
+
+		try {
+			this.guardedRun();
+		} catch (final InterruptedException e) {
+			// fall thru and exit normally
+		} finally {
+			this.sGLThreadManager.threadExiting(this);
+		}
+	}
+	
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	/*
+	 * This private method should only be called inside a
+	 * synchronized(sGLThreadManager) block.
+	 */
+	private void stopEglLocked() {
+		if (this.mHaveEgl) {
+			this.mHaveEgl = false;
+			this.mEglHelper.destroySurface();
+			this.mEglHelper.finish();
+			this.sGLThreadManager.releaseEglSurface(this);
+		}
+	}
+
+	private void guardedRun() throws InterruptedException {
+		this.mEglHelper = new EglHelper(this.mEGLConfigChooser, this.mEGLContextFactory, this.mEGLWindowSurfaceFactory, this.mGLWrapper);
+		try {
+			GL10 gl = null;
+			boolean tellRendererSurfaceCreated = true;
+			boolean tellRendererSurfaceChanged = true;
+
+			/*
+			 * This is our main activity thread's loop, we go until asked to
+			 * quit.
+			 */
+			while (!this.isDone()) {
+				/*
+				 * Update the asynchronous state (window size)
+				 */
+				int w = 0;
+				int h = 0;
+				boolean changed = false;
+				boolean needStart = false;
+				boolean eventsWaiting = false;
+
+				synchronized (this.sGLThreadManager) {
+					while (true) {
+						// Manage acquiring and releasing the SurfaceView
+						// surface and the EGL surface.
+						if (this.mPaused) {
+							this.stopEglLocked();
+						}
+						if (!this.mHasSurface) {
+							if (!this.mWaitingForSurface) {
+								this.stopEglLocked();
+								this.mWaitingForSurface = true;
+								this.sGLThreadManager.notifyAll();
+							}
+						} else {
+							if (!this.mHaveEgl) {
+								if (this.sGLThreadManager.tryAcquireEglSurface(this)) {
+									this.mHaveEgl = true;
+									this.mEglHelper.start();
+									this.mRequestRender = true;
+									needStart = true;
+								}
+							}
+						}
+
+						// Check if we need to wait. If not, update any state
+						// that needs to be updated, copy any state that
+						// needs to be copied, and use "break" to exit the
+						// wait loop.
+
+						if (this.mDone) {
+							return;
+						}
+
+						if (this.mEventsWaiting) {
+							eventsWaiting = true;
+							this.mEventsWaiting = false;
+							break;
+						}
+
+						if ((!this.mPaused) && this.mHasSurface && this.mHaveEgl && (this.mWidth > 0) && (this.mHeight > 0) && (this.mRequestRender || (this.mRenderMode == GLEngine.RENDERMODE_CONTINUOUSLY))) {
+							changed = this.mSizeChanged;
+							w = this.mWidth;
+							h = this.mHeight;
+							this.mSizeChanged = false;
+							this.mRequestRender = false;
+							if (this.mHasSurface && this.mWaitingForSurface) {
+								changed = true;
+								this.mWaitingForSurface = false;
+								this.sGLThreadManager.notifyAll();
+							}
+							break;
+						}
+
+						// By design, this is the only place where we wait().
+
+						if (LOG_THREADS) {
+							Log.i("GLThread", "waiting tid=" + this.getId());
+						}
+						this.sGLThreadManager.wait();
+					}
+				} // end of synchronized(sGLThreadManager)
+
+				/*
+				 * Handle queued events
+				 */
+				if (eventsWaiting) {
+					Runnable r;
+					while ((r = this.getEvent()) != null) {
+						r.run();
+						if (this.isDone()) {
+							return;
+						}
+					}
+					// Go back and see if we need to wait to render.
+					continue;
+				}
+
+				if (needStart) {
+					tellRendererSurfaceCreated = true;
+					changed = true;
+				}
+				if (changed) {
+					gl = (GL10) this.mEglHelper.createSurface(this.mHolder);
+					tellRendererSurfaceChanged = true;
+				}
+				if (tellRendererSurfaceCreated) {
+					this.mRenderer.onSurfaceCreated(gl, this.mEglHelper.mEglConfig);
+					tellRendererSurfaceCreated = false;
+				}
+				if (tellRendererSurfaceChanged) {
+					this.mRenderer.onSurfaceChanged(gl, w, h);
+					tellRendererSurfaceChanged = false;
+				}
+				if ((w > 0) && (h > 0)) {
+					/* draw a frame here */
+					this.mRenderer.onDrawFrame(gl);
+
+					/*
+					 * Once we're done with GL, we need to call swapBuffers() to
+					 * instruct the system to display the rendered frame
+					 */
+					this.mEglHelper.swap();
+				}
+			}
+		} finally {
+			/*
+			 * clean-up everything...
+			 */
+			synchronized (this.sGLThreadManager) {
+				this.stopEglLocked();
+			}
+		}
+	}
+
+	private boolean isDone() {
+		synchronized (this.sGLThreadManager) {
+			return this.mDone;
+		}
+	}
+
+	public void setRenderMode(final int renderMode) {
+		if (!((GLEngine.RENDERMODE_WHEN_DIRTY <= renderMode) && (renderMode <= GLEngine.RENDERMODE_CONTINUOUSLY))) {
+			throw new IllegalArgumentException("renderMode");
+		}
+		synchronized (this.sGLThreadManager) {
+			this.mRenderMode = renderMode;
+			if (renderMode == GLEngine.RENDERMODE_CONTINUOUSLY) {
+				this.sGLThreadManager.notifyAll();
+			}
+		}
+	}
+
+	public int getRenderMode() {
+		synchronized (this.sGLThreadManager) {
+			return this.mRenderMode;
+		}
+	}
+
+	public void requestRender() {
+		synchronized (this.sGLThreadManager) {
+			this.mRequestRender = true;
+			this.sGLThreadManager.notifyAll();
+		}
+	}
+
+	public void surfaceCreated(final SurfaceHolder holder) {
+		this.mHolder = holder;
+		synchronized (this.sGLThreadManager) {
+			if (LOG_THREADS) {
+				Log.i("GLThread", "surfaceCreated tid=" + this.getId());
+			}
+			this.mHasSurface = true;
+			this.sGLThreadManager.notifyAll();
+		}
+	}
+
+	public void surfaceDestroyed() {
+		synchronized (this.sGLThreadManager) {
+			if (LOG_THREADS) {
+				Log.i("GLThread", "surfaceDestroyed tid=" + this.getId());
+			}
+			this.mHasSurface = false;
+			this.sGLThreadManager.notifyAll();
+			while (!this.mWaitingForSurface && this.isAlive() && !this.mDone) {
+				try {
+					this.sGLThreadManager.wait();
+				} catch (final InterruptedException e) {
+					Thread.currentThread().interrupt();
+				}
+			}
+		}
+	}
+
+	public void onPause() {
+		synchronized (this.sGLThreadManager) {
+			this.mPaused = true;
+			this.sGLThreadManager.notifyAll();
+		}
+	}
+
+	public void onResume() {
+		synchronized (this.sGLThreadManager) {
+			this.mPaused = false;
+			this.mRequestRender = true;
+			this.sGLThreadManager.notifyAll();
+		}
+	}
+
+	public void onWindowResize(final int w, final int h) {
+		synchronized (this.sGLThreadManager) {
+			this.mWidth = w;
+			this.mHeight = h;
+			this.mSizeChanged = true;
+			this.sGLThreadManager.notifyAll();
+		}
+	}
+
+	public void requestExitAndWait() {
+		// don't call this from GLThread thread or it is a guaranteed
+		// deadlock!
+		synchronized (this.sGLThreadManager) {
+			this.mDone = true;
+			this.sGLThreadManager.notifyAll();
+		}
+		try {
+			this.join();
+		} catch (final InterruptedException ex) {
+			Thread.currentThread().interrupt();
+		}
+	}
+
+	/**
+	 * Queue an "event" to be run on the GL rendering thread.
+	 * 
+	 * @param r
+	 *            the runnable to be run on the GL rendering thread.
+	 */
+	public void queueEvent(final Runnable r) {
+		synchronized (this) {
+			this.mEventQueue.add(r);
+			synchronized (this.sGLThreadManager) {
+				this.mEventsWaiting = true;
+				this.sGLThreadManager.notifyAll();
+			}
+		}
+	}
+
+	private Runnable getEvent() {
+		synchronized (this) {
+			if (this.mEventQueue.size() > 0) {
+				return this.mEventQueue.remove(0);
+			}
+
+		}
+		return null;
+	}
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+
+	private class GLThreadManager {
+
+		public synchronized void threadExiting(final GLThread thread) {
+			if (LOG_THREADS) {
+				Log.i("GLThread", "exiting tid=" + thread.getId());
+			}
+			thread.mDone = true;
+			if (GLThread.this.mEglOwner == thread) {
+				GLThread.this.mEglOwner = null;
+			}
+			this.notifyAll();
+		}
+
+		/*
+		 * Tries once to acquire the right to use an EGL surface. Does not
+		 * block.
+		 * 
+		 * @return true if the right to use an EGL surface was acquired.
+		 */
+		public synchronized boolean tryAcquireEglSurface(final GLThread thread) {
+			if (GLThread.this.mEglOwner == thread || GLThread.this.mEglOwner == null) {
+				GLThread.this.mEglOwner = thread;
+				this.notifyAll();
+				return true;
+			}
+			return false;
+		}
+
+		public synchronized void releaseEglSurface(final GLThread thread) {
+			if (GLThread.this.mEglOwner == thread) {
+				GLThread.this.mEglOwner = null;
+			}
+			this.notifyAll();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/net/rbgrn/opengl/GLWallpaperService.java b/src/net/rbgrn/opengl/GLWallpaperService.java
new file mode 100644
index 000000000..d13e73e37
--- /dev/null
+++ b/src/net/rbgrn/opengl/GLWallpaperService.java
@@ -0,0 +1,230 @@
+package net.rbgrn.opengl;
+
+import net.rbgrn.opengl.BaseConfigChooser.ComponentSizeChooser;
+import net.rbgrn.opengl.BaseConfigChooser.SimpleEGLConfigChooser;
+
+import android.opengl.GLSurfaceView.EGLConfigChooser;
+import android.opengl.GLSurfaceView.EGLContextFactory;
+import android.opengl.GLSurfaceView.EGLWindowSurfaceFactory;
+import android.opengl.GLSurfaceView.GLWrapper;
+import android.opengl.GLSurfaceView.Renderer;
+import android.service.wallpaper.WallpaperService;
+import android.util.Log;
+import android.view.SurfaceHolder;
+
+public class GLWallpaperService extends WallpaperService {
+	// ===========================================================
+	// Constants
+	// ===========================================================
+
+	private static final String TAG = "GLWallpaperService";
+	
+	// ===========================================================
+	// Fields
+	// ===========================================================
+
+	// ===========================================================
+	// Constructors
+	// ===========================================================
+
+	@Override
+	public void onCreate() {
+		super.onCreate();
+	}
+
+	// ===========================================================
+	// Getter & Setter
+	// ===========================================================
+
+	// ===========================================================
+	// Methods for/from SuperClass/Interfaces
+	// ===========================================================
+	
+	@Override
+	public void onDestroy() {
+		super.onDestroy();
+	}	
+
+	@Override
+	public Engine onCreateEngine() {
+		return new GLEngine();
+	}
+	
+	// ===========================================================
+	// Methods
+	// ===========================================================
+
+	// ===========================================================
+	// Inner and Anonymous Classes
+	// ===========================================================
+
+	public class GLEngine extends Engine {
+		// ===========================================================
+		// Constants
+		// ===========================================================
+		
+		public final static int RENDERMODE_WHEN_DIRTY = 0;
+		public final static int RENDERMODE_CONTINUOUSLY = 1;
+
+		// ===========================================================
+		// Fields
+		// ===========================================================
+		
+		private GLThread mGLThread;
+		private EGLConfigChooser mEGLConfigChooser;
+		private EGLContextFactory mEGLContextFactory;
+		private EGLWindowSurfaceFactory mEGLWindowSurfaceFactory;
+		private GLWrapper mGLWrapper;
+		private int mDebugFlags;
+
+		// ===========================================================
+		// Constructors
+		// ===========================================================
+
+		public GLEngine() {
+			super();
+		}
+
+		// ===========================================================
+		// Getter & Setter
+		// ===========================================================
+
+		// ===========================================================
+		// Methods for/from SuperClass/Interfaces
+		// ===========================================================
+
+		@Override
+		public void onVisibilityChanged(final boolean visible) {
+			if (visible) {
+				this.onResume();
+			} else {
+				this.onPause();
+			}
+			super.onVisibilityChanged(visible);
+		}
+
+		@Override
+		public void onCreate(final SurfaceHolder surfaceHolder) {
+			super.onCreate(surfaceHolder);
+			// Log.d(TAG, "GLEngine.onCreate()");
+		}
+
+		@Override
+		public void onDestroy() {
+			super.onDestroy();
+			// Log.d(TAG, "GLEngine.onDestroy()");
+		}
+
+		@Override
+		public void onSurfaceChanged(final SurfaceHolder holder, final int format, final int width, final int height) {
+			// Log.d(TAG, "onSurfaceChanged()");
+			this.mGLThread.onWindowResize(width, height);
+			super.onSurfaceChanged(holder, format, width, height);
+		}
+
+		@Override
+		public void onSurfaceCreated(final SurfaceHolder holder) {
+			Log.d(TAG, "onSurfaceCreated()");
+			this.mGLThread.surfaceCreated(holder);
+			super.onSurfaceCreated(holder);
+		}
+
+		@Override
+		public void onSurfaceDestroyed(final SurfaceHolder holder) {
+			Log.d(TAG, "onSurfaceDestroyed()");
+			this.mGLThread.surfaceDestroyed();
+			super.onSurfaceDestroyed(holder);
+		}
+		
+		// ===========================================================
+		// Methods
+		// ===========================================================
+
+		/**
+		 * An EGL helper class.
+		 */
+		public void setGLWrapper(final GLWrapper glWrapper) {
+			this.mGLWrapper = glWrapper;
+		}
+
+		public void setDebugFlags(final int debugFlags) {
+			this.mDebugFlags = debugFlags;
+		}
+
+		public int getDebugFlags() {
+			return this.mDebugFlags;
+		}
+
+		public void setRenderer(final Renderer renderer) {
+			this.checkRenderThreadState();
+			if (this.mEGLConfigChooser == null) {
+				this.mEGLConfigChooser = new SimpleEGLConfigChooser(true);
+			}
+			if (this.mEGLContextFactory == null) {
+				this.mEGLContextFactory = new DefaultContextFactory();
+			}
+			if (this.mEGLWindowSurfaceFactory == null) {
+				this.mEGLWindowSurfaceFactory = new DefaultWindowSurfaceFactory();
+			}
+			this.mGLThread = new GLThread(renderer, this.mEGLConfigChooser, this.mEGLContextFactory, this.mEGLWindowSurfaceFactory, this.mGLWrapper);
+			this.mGLThread.start();
+		}
+
+		public void setEGLContextFactory(final EGLContextFactory factory) {
+			this.checkRenderThreadState();
+			this.mEGLContextFactory = factory;
+		}
+
+		public void setEGLWindowSurfaceFactory(final EGLWindowSurfaceFactory factory) {
+			this.checkRenderThreadState();
+			this.mEGLWindowSurfaceFactory = factory;
+		}
+
+		public void setEGLConfigChooser(final EGLConfigChooser configChooser) {
+			this.checkRenderThreadState();
+			this.mEGLConfigChooser = configChooser;
+		}
+
+		public void setEGLConfigChooser(final boolean needDepth) {
+			this.setEGLConfigChooser(new SimpleEGLConfigChooser(needDepth));
+		}
+
+		public void setEGLConfigChooser(final int redSize, final int greenSize, final int blueSize, final int alphaSize, final int depthSize, final int stencilSize) {
+			this.setEGLConfigChooser(new ComponentSizeChooser(redSize, greenSize, blueSize, alphaSize, depthSize, stencilSize));
+		}
+
+		public void setRenderMode(final int renderMode) {
+			this.mGLThread.setRenderMode(renderMode);
+		}
+
+		public int getRenderMode() {
+			return this.mGLThread.getRenderMode();
+		}
+
+		public void requestRender() {
+			this.mGLThread.requestRender();
+		}
+
+		public void onPause() {
+			this.mGLThread.onPause();
+		}
+
+		public void onResume() {
+			this.mGLThread.onResume();
+		}
+
+		public void queueEvent(final Runnable r) {
+			this.mGLThread.queueEvent(r);
+		}
+
+		private void checkRenderThreadState() {
+			if (this.mGLThread != null) {
+				throw new IllegalStateException("setRenderer has already been called for this instance.");
+			}
+		}
+		
+		// ===========================================================
+		// Inner and Anonymous Classes
+		// ===========================================================
+	}
+}
\ No newline at end of file
diff --git a/src/rajawali/BaseObject3D.java b/src/rajawali/BaseObject3D.java
new file mode 100644
index 000000000..960ae86e4
--- /dev/null
+++ b/src/rajawali/BaseObject3D.java
@@ -0,0 +1,424 @@
+package rajawali;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.FloatBuffer;
+import java.nio.ShortBuffer;
+import java.util.ArrayList;
+
+import rajawali.lights.ALight;
+import rajawali.materials.AMaterial;
+import rajawali.materials.TextureManager.TextureInfo;
+
+import android.opengl.GLES20;
+import android.opengl.GLU;
+import android.opengl.Matrix;
+import android.util.Log;
+
+
+public class BaseObject3D implements IObject3D, Comparable<BaseObject3D> {
+	public static String TAG = "AlbumCoverWallpaper";
+	
+    protected final int FLOAT_SIZE_BYTES = 4;
+    protected final int SHORT_SIZE_BYTES = 2;
+	
+	protected float x, y, z, rotX, rotY, rotZ, scaleX = 1.0f, scaleY = 1.0f, scaleZ = 1.0f;
+    protected int numVertices;
+	
+	protected float[] mMVPMatrix = new float[16];
+	protected float[] mMMatrix = new float[16];
+	protected float[] mProjMatrix;
+	
+	protected float[] mScalematrix = new float[16];
+	protected float[] mTranslateMatrix = new float[16];
+	protected float[] mRotateMatrix = new float[16];
+	
+	protected FloatBuffer mVertices;
+	protected FloatBuffer mNormals;
+	protected FloatBuffer mTextureCoords;
+	protected ShortBuffer mIndices;
+	protected int mNumIndices;
+	
+	protected AMaterial mMaterial;
+	protected ALight mLight;
+	
+	protected ArrayList<BaseObject3D> mChildren;
+	protected int mNumChildren;
+	protected String mName;
+	
+	protected boolean mDoubleSided = false;
+	protected boolean mTransparent = false;
+	protected boolean mForcedDepth = false;
+	protected int mDrawingMode = GLES20.GL_TRIANGLES;
+	
+	protected boolean mIsContainerOnly = true;
+	
+	public BaseObject3D() {
+		mChildren = new ArrayList<BaseObject3D>();
+	}
+	
+	public BaseObject3D(String name) {
+		this();
+		mName = name;
+	}
+	
+	public BaseObject3D(SerializedObject3D ser) {
+		this();
+		setData(ser.getVertices(), ser.getNormals(), ser.getTextureCoords(), ser.getIndices());
+	}
+
+	@Override 
+	public void setData(float[] vertices, float[] normals, float[] textureCoords, short[] indices) {
+		mVertices = ByteBuffer.allocateDirect(vertices.length
+	            * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+	    mVertices.put(vertices).position(0);
+		
+		mNormals = ByteBuffer.allocateDirect(normals.length
+	            * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+		mNormals.put(normals).position(0);
+
+		mTextureCoords = ByteBuffer.allocateDirect(textureCoords.length
+	            * FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
+		mTextureCoords.put(textureCoords).position(0);
+		
+		mIndices = ByteBuffer.allocateDirect(indices.length
+				* SHORT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asShortBuffer();
+		mIndices.put(indices).position(0);
+		
+		mNumIndices = indices.length;
+		
+		mIsContainerOnly = false;
+	}
+
+	@Override
+	public void render(Camera3D camera, float[] projMatrix, float[] vMatrix) {
+		render(camera, projMatrix, vMatrix, null);
+	}
+	
+	@Override
+	public void render(Camera3D camera, float[] projMatrix, float[] vMatrix, final float[] parentMatrix) {
+		if(!mIsContainerOnly) {
+			mProjMatrix = projMatrix;
+	        if(!mDoubleSided) GLES20.glEnable(GLES20.GL_CULL_FACE);
+	        if(mTransparent) {
+	        	GLES20.glEnable(GLES20.GL_BLEND);
+	        	GLES20.glBlendFunc(GLES20.GL_SRC_ALPHA, GLES20.GL_ONE);
+	        	GLES20.glDepthMask(false);
+	        } else {
+	        	GLES20.glEnable(GLES20.GL_DEPTH_TEST);
+	        	GLES20.glDepthMask(true);
+	        }
+	
+	        mMaterial.useProgram();
+	        mMaterial.bindTextures();
+	        mMaterial.setCamera(camera);
+	        mMaterial.setVertices(mVertices);
+	        mMaterial.setTextureCoords(mTextureCoords);
+	        mMaterial.setNormals(mNormals); 
+	        
+	        setShaderParams();
+		}
+		
+        doTransformations();
+        
+        Matrix.setIdentityM(mMMatrix, 0);
+        Matrix.setIdentityM(mScalematrix, 0);
+        Matrix.scaleM(mScalematrix, 0, scaleX, scaleY, scaleZ);
+        
+        Matrix.setIdentityM(mRotateMatrix, 0);
+        
+        Matrix.rotateM(mRotateMatrix, 0, (float)rotX, 1.0f, 0.0f, 0.0f);
+        Matrix.rotateM(mRotateMatrix, 0, (float)rotY, 0.0f, 1.0f, 0.0f);
+        Matrix.rotateM(mRotateMatrix, 0, (float)rotZ, 0.0f, 0.0f, 1.0f);
+        
+        Matrix.translateM(mMMatrix, 0, x, y, z);
+        float[] tmpMatrix = new float[16];
+        Matrix.multiplyMM(tmpMatrix, 0, mMMatrix, 0, mScalematrix, 0);
+        Matrix.multiplyMM(mMMatrix, 0, tmpMatrix, 0, mRotateMatrix, 0);
+        if(parentMatrix != null)
+        {
+        	Matrix.multiplyMM(tmpMatrix, 0, parentMatrix, 0, mMMatrix, 0);
+        	mMMatrix = tmpMatrix;
+        }
+        Matrix.multiplyMM(mMVPMatrix, 0, vMatrix, 0, mMMatrix, 0);
+        Matrix.multiplyMM(mMVPMatrix, 0, projMatrix, 0, mMVPMatrix, 0);
+        
+        if(!mIsContainerOnly) {
+	        mMaterial.setMVPMatrix(mMVPMatrix);
+	        mMaterial.setModelMatrix(mMMatrix);
+	        mMaterial.setViewMatrix(vMatrix);
+        
+	        mIndices.position(0);
+	        GLES20.glDrawElements(mDrawingMode, mNumIndices, GLES20.GL_UNSIGNED_SHORT, mIndices);
+        
+	        GLES20.glDisable(GLES20.GL_CULL_FACE);
+	        GLES20.glDisable(GLES20.GL_BLEND);
+	        GLES20.glDisable(GLES20.GL_DEPTH_TEST);
+        }
+		
+        int i;
+        for(i=0; i<mNumChildren; ++i) {
+        	mChildren.get(i).render(camera, projMatrix, vMatrix, mMMatrix);
+        }
+	}
+	
+	protected void setShaderParams() {
+		mMaterial.setLight(mLight);
+	};
+	
+	protected void doTransformations() {}
+
+	public void addTexture(TextureInfo textureInfo) {
+		mMaterial.addTexture(textureInfo);
+	}
+	
+	protected void checkGlError(String op) {
+		int error;
+		while ((error = GLES20.glGetError()) != GLES20.GL_NO_ERROR) {
+			 
+			Log.e(TAG, op + ": glError " + error + " in class " + this.getClass().getName());
+			throw new RuntimeException(op + ": glError " + error);
+		}
+	}	
+
+	@Override
+	public void setPosition(float x, float y, float z) {
+		this.x = x; this.y = y; this.z = z;
+	}
+	
+	@Override
+	public void setScreenCoordinates(float x, float y, int viewportWidth, int viewportHeight, float eyeZ) {
+		float[] r1 = new float[16]; 
+		int[] viewport = new int[] {0, 0, viewportWidth, viewportHeight};
+		float[] modelMatrix = new float[16];
+		Matrix.setIdentityM(modelMatrix, 0);
+
+		GLU.gluUnProject(x, viewportHeight - y, 0.0f, modelMatrix, 0, mProjMatrix, 0, viewport, 0, r1, 0);
+		setPosition(r1[0] * eyeZ, r1[1] * -eyeZ, 0);
+	}
+	
+	@Override
+	public float[] getModelMatrix() {
+		return mMMatrix;
+	}
+
+	@Override
+	public void setX(float x) {
+		this.x = x;
+	}
+
+	@Override
+	public float getX() {
+		return x;
+	}
+
+	@Override
+	public void setY(float y) {
+		this.y = y;
+	}
+
+	@Override
+	public float getY() {
+		return y;
+	}
+
+	@Override
+	public void setZ(float z) {
+		this.z = z;
+	}
+
+	@Override
+	public float getZ() {
+		return z;
+	}
+
+	@Override
+	public void setRotation(float rotX, float rotY, float rotZ) {
+		this.rotX = rotX; this.rotY = rotY; this.rotZ = rotZ;
+	}
+
+	@Override
+	public void setRotX(float rotX) {
+		this.rotX = rotX;
+	}
+
+	@Override
+	public float getRotX() {
+		return rotX;
+	}
+
+	@Override
+	public void setRotY(float rotY) {
+		this.rotY = rotY;
+	}
+
+	@Override
+	public float getRotY() {
+		return rotY;
+	}
+
+	@Override
+	public void setRotZ(float rotZ) {
+		this.rotZ = rotZ;
+	}
+
+	@Override
+	public float getRotZ() {
+		return rotZ;
+	}
+	
+	@Override
+	public void setScale(float scale) {
+		this.scaleX = scale; this.scaleY = scale; this.scaleZ = scale;
+	}
+
+	@Override
+	public void setScale(float scaleX, float scaleY, float scaleZ) {
+		this.scaleX = scaleX; this.scaleY = scaleY; this.scaleZ = scaleZ;
+	}
+
+	@Override
+	public void setScaleX(float scaleX) {
+		this.scaleX = scaleX;
+	}
+
+	@Override
+	public float getScaleX() {
+		return scaleX;
+	}
+
+	@Override
+	public void setScaleY(float scaleY) {
+		this.scaleY = scaleY;
+	}
+
+	@Override
+	public float getScaleY() {
+		return scaleY;
+	}
+
+	@Override
+	public void setScaleZ(float scaleZ) {
+		this.scaleZ = scaleZ;
+	}
+
+	@Override
+	public float getScaleZ() {
+		return scaleZ;
+	}
+
+	public boolean isDoubleSided() {
+		return mDoubleSided;
+	}
+
+	public void setDoubleSided(boolean doubleSided) {
+		this.mDoubleSided = doubleSided;
+	}
+
+	public boolean isTransparent() {
+		return mTransparent;
+	}
+
+	public void setTransparent(boolean transparent) {
+		this.mTransparent = transparent;
+	}
+	
+	public void setLight(ALight light) {
+		mLight = light;
+	}
+
+	public ALight getLight() {
+		return mLight;
+	}
+	
+	public int getDrawingMode() {
+		return mDrawingMode;
+	}
+
+	public void setDrawingMode(int drawingMode) {
+		this.mDrawingMode = drawingMode;
+	}
+	
+	@Override
+	public int compareTo(BaseObject3D another) {
+		if(mForcedDepth) return -1;
+		if(z < another.z) return 1;
+		else if(z > another.z) return -1;
+		else return 0;
+	}
+
+	public void addChild(BaseObject3D child) {
+		mChildren.add(child);
+		mNumChildren++;
+	}
+
+	public int getNumChildren() {
+		return mNumChildren;
+	}
+	
+	public BaseObject3D getChildAt(int index) {
+		return mChildren.get(index);
+	}
+	
+	public BaseObject3D getChildByName(String name) {
+		for(int i=0; i<mNumChildren; ++i)
+			if(mChildren.get(i).getName().equals(name)) return mChildren.get(i);
+		
+		return null;
+	}
+	
+	public void setShader(AMaterial material) {
+		setMaterial(material, true);
+	}
+	
+	public void setMaterial(AMaterial material, boolean copyTextures) {
+		if(mMaterial != null && copyTextures)
+			mMaterial.copyTexturesTo(material);
+		mMaterial = material;
+	}
+	
+	public void setName(String name) {
+		mName = name;
+	}
+	
+	public String getName() {
+		return mName;
+	}
+
+	public boolean isForcedDepth() {
+		return mForcedDepth;
+	}
+
+	public void setForcedDepth(boolean forcedDepth) {
+		this.mForcedDepth = forcedDepth;
+	}
+	
+	public ArrayList<TextureInfo> getTextureInfoList()
+	{
+		int i;
+		ArrayList<TextureInfo> ti = mMaterial.getTextureInfoList();
+
+		for(i=0; i<mNumChildren; ++i) {
+			ti.addAll(mChildren.get(i).getTextureInfoList());
+		}
+		return ti;
+	}
+	
+	public SerializedObject3D toSerializedObject3D() {
+		SerializedObject3D ser = new SerializedObject3D(
+				mVertices.capacity(),
+				mNormals.capacity(),
+				mTextureCoords.capacity(),
+				mIndices.capacity()
+		);
+		
+		int i;
+		
+		for(i=0; i<mVertices.capacity(); i++) ser.getVertices()[i] = mVertices.get(i); 
+		for(i=0; i<mNormals.capacity(); i++) ser.getNormals()[i] = mNormals.get(i);
+		for(i=0; i<mTextureCoords.capacity(); i++) ser.getTextureCoords()[i] = mTextureCoords.get(i);
+		for(i=0; i<mIndices.capacity(); i++) ser.getIndices()[i] = mIndices.get(i);
+		
+		return ser;
+	}
+}
diff --git a/src/rajawali/Camera3D.java b/src/rajawali/Camera3D.java
new file mode 100644
index 000000000..6c42609b3
--- /dev/null
+++ b/src/rajawali/Camera3D.java
@@ -0,0 +1,79 @@
+package rajawali;
+
+import android.opengl.Matrix;
+
+public class Camera3D {
+	protected float x, y, z, lookAtX, lookAtY, lookAtZ;
+	protected float[] mVMatrix = new float[16];
+	
+	public Camera3D(){}
+	
+	public float[] getViewMatrix() {
+		 Matrix.setLookAtM(mVMatrix, 0, x, y, z, lookAtX, lookAtY, lookAtZ, 0f, 1.0f, 0.0f);
+		 return mVMatrix;
+	}
+	
+	public void setPosition(float x, float y, float z) {
+		this.x = x; this.y = y; this.z = z;
+	}
+	
+	public void setLookAt(float lookAtX, float lookAtY, float lookAtZ) {
+		this.lookAtX = lookAtX;
+		this.lookAtY = lookAtY;
+		this.lookAtZ = lookAtZ;
+	}
+	
+	public void lookAt(BaseObject3D lookatObject) {
+		this.lookAtX = lookatObject.getX();
+		this.lookAtY = lookatObject.getY();
+		this.lookAtZ = lookatObject.getZ();
+	}
+
+	public float getX() {
+		return x;
+	}
+
+	public void setX(float x) {
+		this.x = x;
+	}
+
+	public float getY() {
+		return y;
+	}
+
+	public void setY(float y) {
+		this.y = y;
+	}
+
+	public float getZ() {
+		return z;
+	}
+
+	public void setZ(float z) {
+		this.z = z;
+	}
+
+	public float getLookAtX() {
+		return lookAtX;
+	}
+
+	public void setLookAtX(float lookAtX) {
+		this.lookAtX = lookAtX;
+	}
+
+	public float getLookAtY() {
+		return lookAtY;
+	}
+
+	public void setLookAtY(float lookAtY) {
+		this.lookAtY = lookAtY;
+	}
+
+	public float getLookAtZ() {
+		return lookAtZ;
+	}
+
+	public void setLookAtZ(float lookAtZ) {
+		this.lookAtZ = lookAtZ;
+	}
+}
diff --git a/src/rajawali/IObject3D.java b/src/rajawali/IObject3D.java
new file mode 100644
index 000000000..baf1a0333
--- /dev/null
+++ b/src/rajawali/IObject3D.java
@@ -0,0 +1,48 @@
+package rajawali;
+
+import java.util.ArrayList;
+
+import rajawali.materials.AMaterial;
+import rajawali.materials.TextureManager.TextureInfo;
+
+
+public interface IObject3D {
+	public void render(Camera3D camera, float[] projMatrix, float[] vMatrix);
+	public void render(Camera3D camera, float[] projMatrix, float[] vMatrix, float[] parentMatrix);
+	public void addTexture(TextureInfo textureInfo);
+	public void setData(float[] vertices, float[] normals, float[] textureCoords, short[] indices);
+
+	public void setPosition(float x, float y, float z);
+	public void setScreenCoordinates(float x, float y, int viewportWidth, int viewportHeight, float eyeZ);
+	public void setX(float x);
+	public float getX();
+	public void setY(float y);
+	public float getY();
+	public void setZ(float z);
+	public float getZ();
+
+	public void setRotation(float rotX, float rotY, float rotZ);
+	public void setRotX(float rotX);
+	public float getRotX();
+	public void setRotY(float rotY);
+	public float getRotY();
+	public void setRotZ(float rotZ);
+	public float getRotZ();
+
+	public void setScale(float scale);
+	public void setScale(float scaleX, float scaleY, float scaleZ);
+	public void setScaleX(float scaleX);
+	public float getScaleX();
+	public void setScaleY(float scaleY);
+	public float getScaleY();
+	public void setScaleZ(float scaleZ);
+	public float getScaleZ();
+
+	public float[] getModelMatrix();
+	
+	public void addChild(BaseObject3D child);
+	public int getNumChildren();
+	public void setShader(AMaterial shader);
+	
+	public ArrayList<TextureInfo> getTextureInfoList();
+}
diff --git a/src/rajawali/RajawaliActivity.java b/src/rajawali/RajawaliActivity.java
new file mode 100644
index 000000000..0a38ee7e3
--- /dev/null
+++ b/src/rajawali/RajawaliActivity.java
@@ -0,0 +1,46 @@
+package rajawali;
+
+import rajawali.renderer.RajawaliRenderer;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.Context;
+import android.content.pm.ConfigurationInfo;
+import android.opengl.GLSurfaceView;
+import android.os.Bundle;
+
+public class RajawaliActivity extends Activity {
+	protected GLSurfaceView mSurfaceView;
+	
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        
+        mSurfaceView = new GLSurfaceView(this);
+        
+        ActivityManager am = (ActivityManager)getSystemService(Context.ACTIVITY_SERVICE);
+        ConfigurationInfo info = am.getDeviceConfigurationInfo();
+        if(info.reqGlEsVersion <  0x20000)
+        	throw new Error("OpenGL ES 2.0 is not supported by this device");
+                mSurfaceView.setEGLContextClientVersion(2);
+        
+        setContentView(mSurfaceView);
+    }
+    
+    protected void setRenderer(RajawaliRenderer renderer) {
+    	mSurfaceView.setRenderer(renderer);
+    }
+    
+    @Override
+    protected void onResume() {
+    	super.onResume();
+    	mSurfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+    	mSurfaceView.onResume();
+    }
+    
+    @Override
+    protected void onPause() {
+    	super.onPause();
+    	mSurfaceView.onPause();
+    }
+}
\ No newline at end of file
diff --git a/src/rajawali/SerializedObject3D.java b/src/rajawali/SerializedObject3D.java
new file mode 100644
index 000000000..fb09dbdd9
--- /dev/null
+++ b/src/rajawali/SerializedObject3D.java
@@ -0,0 +1,44 @@
+package rajawali;
+
+import java.io.Serializable;
+
+public class SerializedObject3D implements Serializable {
+	private static final long serialVersionUID = 5264861128471177349L;
+
+	protected float[] mVertices;
+	protected float[] mNormals;
+	protected float[] mTextureCoords;
+	protected short[] mIndices;
+	
+	public SerializedObject3D(int numVertices, int numNormals, int numTextureCoords, int numIndices) {
+		mVertices = new float[numVertices];
+		mNormals = new float[numNormals];
+		mTextureCoords = new float[numTextureCoords];
+		mIndices = new short[numIndices];
+	}
+	
+	public float[] getVertices() {
+		return mVertices;
+	}
+	public void setVertices(float[] vertices) {
+		this.mVertices = vertices;
+	}
+	public float[] getNormals() {
+		return mNormals;
+	}
+	public void setNormals(float[] normals) {
+		this.mNormals = normals;
+	}
+	public float[] getTextureCoords() {
+		return mTextureCoords;
+	}
+	public void setTextureCoords(float[] textureCoords) {
+		this.mTextureCoords = textureCoords;
+	}
+	public short[] getIndices() {
+		return mIndices;
+	}
+	public void setIndices(short[] indices) {
+		this.mIndices = indices;
+	}
+}
diff --git a/src/rajawali/lights/ALight.java b/src/rajawali/lights/ALight.java
new file mode 100644
index 000000000..d297db361
--- /dev/null
+++ b/src/rajawali/lights/ALight.java
@@ -0,0 +1,56 @@
+package rajawali.lights;
+
+public abstract class ALight {
+	protected float[] mColor = new float[] { 1.0f, 1.0f, 1.0f };
+	
+	protected float mX, mY, mZ;
+	protected boolean mUseObjectTransform;
+	
+	public void setColor(final float r, final float g, final float b) {
+		mColor[0] = r; mColor[1] = g; mColor[2] = b;
+	}
+	
+	public float[] getColor() {
+		return mColor;
+	}
+	
+	public float getX() {
+		return mX;
+	}
+	
+	public void setPosition(float x, float y, float z) {
+		this.mX = x; this.mY = y; this.mZ = z;
+	}
+	
+	public float[] getPosition() {
+		return new float[] { this.mX, this.mY, this.mZ };
+	}
+
+	public void setX(final float x) {
+		this.mX = x;
+	}
+
+	public float getY() {
+		return mY;
+	}
+
+	public void setY(final float y) {
+		this.mY = y;
+	}
+
+	public float getZ() {
+		return mZ;
+	}
+
+	public void setZ(final float z) {
+		this.mZ = z;
+	}
+
+	public boolean shouldUseObjectTransform() {
+		return mUseObjectTransform;
+	}
+
+	public void shouldUseObjectTransform(boolean useObjectTransform) {
+		this.mUseObjectTransform = useObjectTransform;
+	}
+}
diff --git a/src/rajawali/lights/DirectionalLight.java b/src/rajawali/lights/DirectionalLight.java
new file mode 100644
index 000000000..10e0411ed
--- /dev/null
+++ b/src/rajawali/lights/DirectionalLight.java
@@ -0,0 +1,23 @@
+package rajawali.lights;
+
+public class DirectionalLight extends ALight {
+	protected float[] mDirection = new float[3];
+	
+	public DirectionalLight() {
+		super();
+		setDirection(0, -1.0f, 1.0f);
+	}
+	
+	public DirectionalLight(float xDir, float yDir, float zDir) {
+		super();
+		setDirection(xDir, yDir, zDir);
+	}
+	
+	public void setDirection(float x, float y, float z) {
+		mDirection[0] = x; mDirection[1] = y; mDirection[2] = z;
+	}
+	
+	public float[] getDirection() {
+		return mDirection;
+	}
+}
diff --git a/src/rajawali/materials/AMaterial.java b/src/rajawali/materials/AMaterial.java
new file mode 100644
index 000000000..21a7e92ca
--- /dev/null
+++ b/src/rajawali/materials/AMaterial.java
@@ -0,0 +1,233 @@
+package rajawali.materials;
+
+import java.nio.FloatBuffer;
+import java.util.ArrayList;
+
+import rajawali.Camera3D;
+import rajawali.lights.ALight;
+import rajawali.materials.TextureManager.TextureInfo;
+import rajawali.wallpaper.Wallpaper;
+
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public abstract class AMaterial {
+	protected String mVertexShader;
+	protected String mFragmentShader;
+	
+	protected int mProgram;
+	protected int muMVPMatrixHandle;
+	protected int maPositionHandle;
+	protected int maTextureHandle;
+	protected int maNormalHandle;
+	protected int muCameraPositionHandle;
+	protected int muMMatrixHandle;
+	protected int muVMatrixHandle;
+	protected ALight mLight;
+	
+	protected int numTextures = 0;
+	protected float[] mModelViewMatrix;
+	protected float[] mViewMatrix;
+	protected ArrayList<TextureInfo> mTextureInfoList;
+	protected boolean usesCubeMap = false;
+	
+	public AMaterial() {
+		mTextureInfoList = new ArrayList<TextureManager.TextureInfo>();
+	}
+	public AMaterial(String vertexShader, String fragmentShader) {
+		this();
+		mVertexShader = vertexShader;
+		mFragmentShader = fragmentShader;
+		setShaders(vertexShader, fragmentShader);
+	}
+	
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		mProgram = createProgram(mVertexShader, fragmentShader);
+		if(mProgram == 0) return;
+		
+		maPositionHandle = GLES20.glGetAttribLocation(mProgram, "aPosition");
+		if(maPositionHandle == -1) {
+			throw new RuntimeException("Could not get attrib location for aPosition");
+		}
+		
+		maNormalHandle = GLES20.glGetAttribLocation(mProgram, "aNormal");
+		if(maNormalHandle == -1) {
+			//Log.d(Wallpaper.TAG, "Could not get attrib location for aNormal " + getClass().toString());
+		}
+
+		maTextureHandle = GLES20.glGetAttribLocation(mProgram, "aTextureCoord");
+		if(maTextureHandle == -1) {
+			throw new RuntimeException("Could not get attrib location for aTextureCoord");
+		}
+		
+		muCameraPositionHandle = GLES20.glGetUniformLocation(mProgram, "uCameraPosition");
+		if(muCameraPositionHandle == -1) {
+			//throw new RuntimeException("Could not get attrib location for uCameraPosition");
+		}		
+		
+		muMVPMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMVPMatrix");
+		if(muMVPMatrixHandle == -1) {
+			throw new RuntimeException("Could not get attrib location for uMVPMatrix");
+		}
+		
+		muMMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uMMatrix");
+		if(muMMatrixHandle == -1) {
+			//Log.d(Wallpaper.TAG, "Could not get attrib location for uMMatrix");
+		}
+		
+		muVMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uVMatrix");
+		if(muVMatrixHandle == -1) {
+			//Log.d(Wallpaper.TAG, "Could not get attrib location for uVMatrix");
+		}
+	}
+	
+	protected int loadShader(int shaderType, String source) {
+        int shader = GLES20.glCreateShader(shaderType);
+        if (shader != 0) {
+            GLES20.glShaderSource(shader, source);
+            GLES20.glCompileShader(shader);
+            int[] compiled = new int[1];
+            GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0);
+            if (compiled[0] == 0) {
+                Log.e(Wallpaper.TAG, "Could not compile " + (shaderType == 35632 ? "fragment" : "vertex") + " shader:");
+                Log.e(Wallpaper.TAG, "Shader log: " + GLES20.glGetShaderInfoLog(shader));
+                GLES20.glDeleteShader(shader);
+                shader = 0;
+            }
+        }
+        return shader;
+    }
+
+    protected int createProgram(String vertexSource, String fragmentSource) {
+        int vertexShader = loadShader(GLES20.GL_VERTEX_SHADER, vertexSource);
+        if (vertexShader == 0) {
+            return 0;
+        }
+
+        int pixelShader = loadShader(GLES20.GL_FRAGMENT_SHADER, fragmentSource);
+        if (pixelShader == 0) {
+            return 0;
+        }
+
+        int program = GLES20.glCreateProgram();
+        if (program != 0) {
+            GLES20.glAttachShader(program, vertexShader);
+            GLES20.glAttachShader(program, pixelShader);
+            GLES20.glLinkProgram(program);
+
+            int[] linkStatus = new int[1];
+            GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linkStatus, 0);
+            if (linkStatus[0] != GLES20.GL_TRUE) {
+                Log.e(Wallpaper.TAG, "Could not link program: ");
+                Log.e(Wallpaper.TAG, GLES20.glGetProgramInfoLog(program));
+                GLES20.glDeleteProgram(program);
+                program = 0;
+            }
+        }
+        return program;
+    }
+
+    public void useProgram() {
+    	GLES20.glUseProgram(mProgram);
+    }
+    
+    public void bindTextures() {
+    	int num = mTextureInfoList.size();
+    	
+        for(int i=0; i<num; i++)
+        {
+        	TextureInfo ti = mTextureInfoList.get(i);
+        	int type = usesCubeMap ? GLES20.GL_TEXTURE_CUBE_MAP : GLES20.GL_TEXTURE_2D;
+        	GLES20.glEnable(type);
+            GLES20.glActiveTexture(ti.getTextureSlot());
+            GLES20.glBindTexture(type, ti.getTextureId());
+            GLES20.glUniform1i(ti.getUniformHandle(), ti.getTextureSlot() - GLES20.GL_TEXTURE0);
+        }
+    }
+    
+    public ArrayList<TextureInfo> getTextureInfoList() {
+    	return mTextureInfoList;
+    }
+    
+    public void addTexture(TextureInfo textureInfo) {
+    	int count = mTextureInfoList.size();
+        int textureHandle = GLES20.glGetUniformLocation(mProgram, "uTexture" + count);
+		if(textureHandle == -1) {
+			Log.d(Wallpaper.TAG, toString());
+			throw new RuntimeException("Could not get attrib location for uTexture" + count);
+		}
+        textureInfo.setUniformHandle(textureHandle);
+        mTextureInfoList.add(textureInfo);
+        numTextures++;
+    }
+    
+    public void setVertices(FloatBuffer vertices) {
+    	vertices.position(0);
+    	GLES20.glVertexAttribPointer(maPositionHandle, 3, GLES20.GL_FLOAT, false, 0, vertices);
+    	GLES20.glEnableVertexAttribArray(maPositionHandle);
+    }
+    
+    public void setTextureCoords(FloatBuffer textureCoords) {
+    	textureCoords.position(0);
+    	GLES20.glVertexAttribPointer(maTextureHandle, 2, GLES20.GL_FLOAT, false, 0, textureCoords);
+        GLES20.glEnableVertexAttribArray(maTextureHandle);
+    }
+    
+    public void setNormals(FloatBuffer normals) {
+        if(maNormalHandle > -1)
+        {
+	        normals.position(0);
+	        GLES20.glVertexAttribPointer(maNormalHandle, 3, GLES20.GL_FLOAT, false,
+	        		0, normals);
+	        GLES20.glEnableVertexAttribArray(maNormalHandle);
+        }
+    }
+    
+    public void setMVPMatrix(float[] mvpMatrix) {
+    	GLES20.glUniformMatrix4fv(muMVPMatrixHandle, 1, false, mvpMatrix, 0);
+    }
+    
+    public void setModelMatrix(float[] modelMatrix) {
+    	mModelViewMatrix = modelMatrix;
+        if(muMMatrixHandle > -1)
+        	GLES20.glUniformMatrix4fv(muMMatrixHandle, 1, false, modelMatrix, 0);
+    }
+    
+    public void setViewMatrix(float[] viewMatrix) {
+    	mViewMatrix = viewMatrix;
+    	if(muVMatrixHandle > -1)
+    		GLES20.glUniformMatrix4fv(muVMatrixHandle, 1, false, viewMatrix, 0);
+    }
+    
+    public void setLight(ALight light)
+    {
+    	mLight = light;
+    }
+    
+    public void setCamera(Camera3D camera) {
+    	if(muCameraPositionHandle > -1)
+    		GLES20.glUniform3fv(muCameraPositionHandle, 1, new float[]{ camera.getX(), camera.getY(), camera.getZ() }, 0);
+    }
+    
+    public String toString() {
+    	StringBuffer out = new StringBuffer();
+    	out.append("____ VERTEX SHADER ____\n");
+    	out.append(mVertexShader);
+    	out.append("____ FRAGMENT SHADER ____\n");
+    	out.append(mFragmentShader);
+    	return out.toString();
+    }
+    
+	public float[] getModelViewMatrix() {
+		return mModelViewMatrix;
+	}
+	
+	public void copyTexturesTo(AMaterial shader) {
+		int num = mTextureInfoList.size();
+		
+		for(int i=0; i<num; ++i)
+			shader.addTexture(mTextureInfoList.get(i));
+	}
+}
diff --git a/src/rajawali/materials/CubeMapMaterial.java b/src/rajawali/materials/CubeMapMaterial.java
new file mode 100644
index 000000000..c40544131
--- /dev/null
+++ b/src/rajawali/materials/CubeMapMaterial.java
@@ -0,0 +1,113 @@
+package rajawali.materials;
+
+import rajawali.lights.ALight;
+import rajawali.lights.DirectionalLight;
+import rajawali.wallpaper.Wallpaper;
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public class CubeMapMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"uniform mat4 uMMatrix;\n" +
+		"uniform mat3 uNMatrix;\n" +
+		"uniform vec3 uLightPos;\n" +
+		"uniform vec3 uCameraPosition;\n" +
+		"attribute vec4 aPosition;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		"attribute vec3 aNormal;\n" +
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 vReflectDir;\n" +
+		"varying vec3 vNormal;\n" +
+		"varying vec3 N, L;\n" +
+		
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"	vec4 transfPos = uMMatrix * aPosition;\n" +
+		"	vec3 eyeDir = normalize(transfPos.xyz - uCameraPosition.xyz);\n" +
+		"	N = uNMatrix * aNormal;\n" +
+		"	vReflectDir = reflect(eyeDir, N);\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		"	L = uLightPos.xyz - aPosition.xyz;\n" +
+		"	vNormal = aNormal;\n" +
+		"}\n";
+	
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 vReflectDir;\n" +
+		"uniform samplerCube uTexture0;\n" +
+		"varying vec3 N, L;\n" +
+		"varying vec3 vNormal;\n" +
+
+		"void main() {\n" +
+		"	float intensity = max(0.0, dot(normalize(N), normalize(L)));\n" +
+		"	gl_FragColor = textureCube(uTexture0, vReflectDir);\n" +
+		"	gl_FragColor.rgb *= intensity;\n" +
+		//"	gl_FragColor = vec4(normalize(vNormal), 1.0);\n" +
+		"}\n";
+	
+	protected int muLightPosHandle;
+	protected int muNormalMatrixHandle;
+
+	protected float[] mLightPos;
+	protected float[] mNormalMatrix;
+	
+	public CubeMapMaterial() {
+		super(mVShader, mFShader);
+		usesCubeMap = true;
+		mNormalMatrix = new float[9];
+	}
+	
+	@Override
+	public void setLight(ALight light) {
+		super.setLight(light);
+
+		DirectionalLight dirLight = (DirectionalLight)light;
+		mLightPos = dirLight.getPosition();
+		GLES20.glUniform3fv(muLightPosHandle, 1, mLightPos, 0);
+	}
+
+	@Override
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		super.setShaders(vertexShader, fragmentShader);
+		muLightPosHandle = GLES20.glGetUniformLocation(mProgram, "uLightPos");
+		if(muLightPosHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uLightPos");
+		}
+		muNormalMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uNMatrix");
+		if(muNormalMatrixHandle == -1) {
+			throw new RuntimeException("Could not get uniform location for uNMatrix");
+		}
+	}
+	
+	@Override
+	public void setModelMatrix(float[] modelMatrix) {
+		super.setModelMatrix(modelMatrix);
+		android.graphics.Matrix normalMatrix = new android.graphics.Matrix();
+		android.graphics.Matrix mvMatrix = new android.graphics.Matrix();
+		
+		mvMatrix.setValues(new float[]{
+				modelMatrix[0], modelMatrix[1], modelMatrix[2], 
+				modelMatrix[4], modelMatrix[5], modelMatrix[6],
+				modelMatrix[8], modelMatrix[9], modelMatrix[10]
+		});
+		
+		normalMatrix.reset();
+		mvMatrix.invert(normalMatrix);
+		float[] values = new float[9];
+		normalMatrix.getValues(values);
+		
+		normalMatrix.setValues(new float[] {
+				values[0], values[3], values[6],
+				values[1], values[4], values[7],
+				values[2], values[5], values[8]
+		});
+		normalMatrix.getValues(mNormalMatrix);
+
+	    GLES20.glUniformMatrix3fv(muNormalMatrixHandle, 1, false, mNormalMatrix, 0);
+	}
+}
diff --git a/src/rajawali/materials/DiffuseMaterial.java b/src/rajawali/materials/DiffuseMaterial.java
new file mode 100644
index 000000000..42f1931ec
--- /dev/null
+++ b/src/rajawali/materials/DiffuseMaterial.java
@@ -0,0 +1,113 @@
+package rajawali.materials;
+
+import rajawali.lights.ALight;
+import rajawali.lights.DirectionalLight;
+import rajawali.wallpaper.Wallpaper;
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public class DiffuseMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"uniform mat3 uNMatrix;\n" +
+		"uniform mat4 uMMatrix;\n" +
+		"uniform mat4 uVMatrix;\n" +
+		"uniform vec3 uLightPos;\n" +
+		"uniform bool uUseObjectTransform;\n" +
+		"attribute vec4 aPosition;\n" +
+		"attribute vec3 aNormal;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 N, L;\n" +
+		
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		"	N = uNMatrix * aNormal;\n" +
+		"	vec4 V = uMMatrix * aPosition;\n" +
+		"   vec4 lightPos = uUseObjectTransform ? uMMatrix * vec4(uLightPos, 1.0) : vec4(uLightPos, 1.0);\n" +
+		"	L = lightPos.xyz - V.xyz;\n" +
+		"}";
+		
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 N, L;\n" +
+ 
+		"uniform sampler2D uTexture0;\n" +
+
+		"void main() {\n" +
+		"	float intensity = max(0.0, dot(normalize(N), normalize(L)));\n" +
+		"	gl_FragColor = texture2D(uTexture0, vTextureCoord);\n" +
+		"	gl_FragColor.rgb *= intensity;\n" +
+		"}";
+	
+	protected int muLightPosHandle;
+	protected int muNormalMatrixHandle;
+	protected int muUseObjectTransformHandle;
+	
+	protected float[] mNormalMatrix;
+	protected float[] mLightPos;
+	
+	public DiffuseMaterial() {
+		super(mVShader, mFShader);
+		mNormalMatrix = new float[9];
+	}
+
+	@Override
+	public void setLight(ALight light) {
+		super.setLight(light);
+
+		DirectionalLight dirLight = (DirectionalLight)light;
+		mLightPos = dirLight.getPosition();
+		GLES20.glUniform3fv(muLightPosHandle, 1, mLightPos, 0);
+		GLES20.glUniform1i(muUseObjectTransformHandle, light.shouldUseObjectTransform() ? 1 : 0);
+	}
+	
+	@Override
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		super.setShaders(vertexShader, fragmentShader);
+		muLightPosHandle = GLES20.glGetUniformLocation(mProgram, "uLightPos");
+		if(muLightPosHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uLightPos");
+		}
+		muNormalMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uNMatrix");
+		if(muNormalMatrixHandle == -1) {
+			throw new RuntimeException("Could not get uniform location for uNMatrix");
+		}
+		muUseObjectTransformHandle = GLES20.glGetUniformLocation(mProgram, "uUseObjectTransform");
+		if(muUseObjectTransformHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uUseObjectTransform");
+		}
+	}
+	
+	@Override
+	public void setModelMatrix(float[] modelMatrix) {
+		super.setModelMatrix(modelMatrix);
+		android.graphics.Matrix normalMatrix = new android.graphics.Matrix();
+		android.graphics.Matrix mvMatrix = new android.graphics.Matrix();
+		
+		mvMatrix.setValues(new float[]{
+				modelMatrix[0], modelMatrix[1], modelMatrix[2], 
+				modelMatrix[4], modelMatrix[5], modelMatrix[6],
+				modelMatrix[8], modelMatrix[9], modelMatrix[10]
+		});
+		
+		normalMatrix.reset();
+		mvMatrix.invert(normalMatrix);
+		float[] values = new float[9];
+		normalMatrix.getValues(values);
+		
+		normalMatrix.setValues(new float[] {
+				values[0], values[3], values[6],
+				values[1], values[4], values[7],
+				values[2], values[5], values[8]
+		});
+		normalMatrix.getValues(mNormalMatrix);
+
+	    GLES20.glUniformMatrix3fv(muNormalMatrixHandle, 1, false, mNormalMatrix, 0);
+	}
+}
\ No newline at end of file
diff --git a/src/rajawali/materials/GouraudMaterial.java b/src/rajawali/materials/GouraudMaterial.java
new file mode 100644
index 000000000..5a24d0838
--- /dev/null
+++ b/src/rajawali/materials/GouraudMaterial.java
@@ -0,0 +1,147 @@
+package rajawali.materials;
+
+import rajawali.lights.ALight;
+import rajawali.lights.DirectionalLight;
+import rajawali.wallpaper.Wallpaper;
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public class GouraudMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"uniform mat3 uNMatrix;\n" +
+		"uniform mat4 uMMatrix;\n" +
+		"uniform mat4 uVMatrix;\n" +
+		"uniform vec3 uLightPos;\n" +
+		"uniform bool uUseObjectTransform;\n" +
+		
+		"attribute vec4 aPosition;\n" +
+		"attribute vec3 aNormal;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		
+		"varying vec2 vTextureCoord;\n" +
+		"varying float vSpecularIntensity;\n" +
+		"varying float vDiffuseIntensity;\n" +
+		
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		
+		"	vec4 vertexPosCam = uMMatrix * aPosition;\n" +
+		"	vec3 normalCam = normalize(uNMatrix * aNormal);\n" +
+		"	vec4 lightPosCam = vec4(uLightPos, 1.0);\n" +
+
+		"	vec3 lightVert = normalize(vec3(lightPosCam - vertexPosCam));\n" +
+		"	vec3 lightRefl = normalize(reflect(lightVert, normalCam));\n" +
+
+		"	vDiffuseIntensity = max(dot(lightVert, normalCam), 0.0);\n" +
+		"	vSpecularIntensity = max(dot(lightRefl, normalize(vec3(vertexPosCam))), 0.0);\n" +
+		"	vSpecularIntensity = pow(vSpecularIntensity, 6.0);\n" +
+		"}";
+		
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"varying float vSpecularIntensity;\n" +
+		"varying float vDiffuseIntensity;\n" +
+		
+		"uniform vec4 uSpecularColor;\n" +
+		"uniform sampler2D uTexture0;\n" +
+
+		"void main() {\n" +
+		"	vec4 texColor = texture2D(uTexture0, vTextureCoord);\n" +
+		"	gl_FragColor = texColor * vDiffuseIntensity + uSpecularColor * vSpecularIntensity;\n" +
+		"}";
+	
+	protected int muLightPosHandle;
+	protected int muNormalMatrixHandle;
+	protected int muUseObjectTransformHandle;
+	protected int muSpecularColorHandle;
+	
+	protected float[] mNormalMatrix;
+	protected float[] mLightPos;
+	protected float[] mSpecularColor;
+	
+	public GouraudMaterial() {
+		super(mVShader, mFShader);
+		mNormalMatrix = new float[9];
+		mSpecularColor = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
+	}
+	
+	public GouraudMaterial(float[] specularColor) {
+		this();
+		mSpecularColor = specularColor;
+	}
+
+	@Override
+	public void setLight(ALight light) {
+		super.setLight(light);
+
+		DirectionalLight dirLight = (DirectionalLight)light;
+		mLightPos = dirLight.getPosition();
+		GLES20.glUniform3fv(muLightPosHandle, 1, mLightPos, 0);
+		GLES20.glUniform1i(muUseObjectTransformHandle, light.shouldUseObjectTransform() ? 1 : 0);
+	}
+	
+	@Override
+	public void useProgram() {
+		super.useProgram();
+		GLES20.glUniform4fv(muSpecularColorHandle, 1, mSpecularColor, 0);
+	}
+	
+	public void setSpecularColor(float[] color) {
+		mSpecularColor = color;
+	}
+	
+	@Override
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		super.setShaders(vertexShader, fragmentShader);
+		muLightPosHandle = GLES20.glGetUniformLocation(mProgram, "uLightPos");
+		if(muLightPosHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uLightPos");
+		}
+		muNormalMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uNMatrix");
+		if(muNormalMatrixHandle == -1) {
+			throw new RuntimeException("Could not get uniform location for uNMatrix");
+		}
+		muUseObjectTransformHandle = GLES20.glGetUniformLocation(mProgram, "uUseObjectTransform");
+		if(muUseObjectTransformHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uUseObjectTransform");
+		}
+
+		muSpecularColorHandle = GLES20.glGetUniformLocation(mProgram, "uSpecularColor");
+		if(muSpecularColorHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uSpecularColor");
+		}
+	}
+	
+	@Override
+	public void setModelMatrix(float[] modelMatrix) {
+		super.setModelMatrix(modelMatrix);
+		android.graphics.Matrix normalMatrix = new android.graphics.Matrix();
+		android.graphics.Matrix mvMatrix = new android.graphics.Matrix();
+		
+		mvMatrix.setValues(new float[]{
+				modelMatrix[0], modelMatrix[1], modelMatrix[2], 
+				modelMatrix[4], modelMatrix[5], modelMatrix[6],
+				modelMatrix[8], modelMatrix[9], modelMatrix[10]
+		});
+		
+		normalMatrix.reset();
+		mvMatrix.invert(normalMatrix);
+		float[] values = new float[9];
+		normalMatrix.getValues(values);
+		
+		normalMatrix.setValues(new float[] {
+				values[0], values[3], values[6],
+				values[1], values[4], values[7],
+				values[2], values[5], values[8]
+		});
+		normalMatrix.getValues(mNormalMatrix);
+
+	    GLES20.glUniformMatrix3fv(muNormalMatrixHandle, 1, false, mNormalMatrix, 0);
+	}
+}
\ No newline at end of file
diff --git a/src/rajawali/materials/ParticleMaterial.java b/src/rajawali/materials/ParticleMaterial.java
new file mode 100644
index 000000000..68973b5ab
--- /dev/null
+++ b/src/rajawali/materials/ParticleMaterial.java
@@ -0,0 +1,55 @@
+package rajawali.materials;
+
+import rajawali.wallpaper.Wallpaper;
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public class ParticleMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"uniform float uPointSize;\n" +
+		"uniform mat4 uMMatrix;\n" +
+		"attribute vec4 aPosition;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		"varying vec2 vTextureCoord;\n" +
+
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"   vec4 pos = uMMatrix * aPosition;\n" +
+		"	gl_PointSize = uPointSize / (pos.z + 4.0);\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		"}\n";
+	
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"uniform sampler2D uTexture0;\n" +
+
+		"void main() {\n" +
+		"	gl_FragColor = texture2D(uTexture0, gl_PointCoord);\n" +
+		"}\n";
+	
+	protected float mPointSize = 10.0f;
+	protected int muPointSizeHandle;
+	
+	public ParticleMaterial() {
+		super(mVShader, mFShader);
+	}
+	
+	public void setPointSize(float pointSize) {
+		mPointSize = pointSize;
+       	GLES20.glUniform1f(muPointSizeHandle, mPointSize);
+	}
+	
+	@Override
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		super.setShaders(vertexShader, fragmentShader);
+		muPointSizeHandle = GLES20.glGetUniformLocation(mProgram, "uPointSize");
+		if(muPointSizeHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uPointSize");
+		}
+	}
+}
diff --git a/src/rajawali/materials/PhongMaterial.java b/src/rajawali/materials/PhongMaterial.java
new file mode 100644
index 000000000..bdd70ce7e
--- /dev/null
+++ b/src/rajawali/materials/PhongMaterial.java
@@ -0,0 +1,181 @@
+package rajawali.materials;
+
+import rajawali.lights.ALight;
+import rajawali.lights.DirectionalLight;
+import rajawali.wallpaper.Wallpaper;
+import android.opengl.GLES20;
+import android.util.Log;
+
+
+public class PhongMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"uniform mat3 uNMatrix;\n" +
+		"uniform mat4 uMMatrix;\n" +
+		"uniform mat4 uVMatrix;\n" +
+		"uniform vec3 uLightPos;\n" +
+		"uniform bool uUseObjectTransform;\n" +
+		
+		"attribute vec4 aPosition;\n" +
+		"attribute vec3 aNormal;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 N, L, E, H;\n" +
+		
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		
+		"	vec4 eyePosition = uMMatrix  * aPosition;\n" + 
+		"	vec4 eyeLightPos = vec4(uLightPos, 1.0);\n" +
+		"	N = normalize(uNMatrix * aNormal);\n" +
+		"	L = normalize(eyeLightPos.xyz - eyePosition.xyz);\n" + 
+		"	E = -normalize(eyePosition.xyz);\n" +
+		"	H = normalize(L + E);\n" +
+		"}";
+		
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"varying vec3 N, L, E, H;\n" +
+		
+		"uniform vec4 uSpecularColor;\n" +
+		"uniform vec4 uAmbientColor;\n" +
+		"uniform sampler2D uTexture0;\n" +
+		"uniform float uShininess;\n" +
+
+		"void main() {\n" +
+		"	vec3 Normal = normalize(N);\n" +
+		"	vec3 Light  = normalize(L);\n" +
+		"	vec3 Eye    = normalize(E);\n" +
+		"	vec3 Half   = normalize(H);\n" +
+		
+		"	float Kd = max(dot(Normal, Light), 0.0);\n" + 
+		"	float Ks = pow(max(dot(Half, Normal), 0.0), uShininess);\n" + 
+	    "	float Ka = 0.0;\n" +
+	    "	vec4 diffuse  = Kd * texture2D(uTexture0, vTextureCoord);\n" + 
+	    "	vec4 specular = Ks * uSpecularColor;\n" + 
+	    "	vec4 ambient  = Ka * uAmbientColor;\n" + 
+	    "	gl_FragColor = ambient + diffuse + specular;\n" + 
+		"}";
+	
+	protected int muLightPosHandle;
+	protected int muNormalMatrixHandle;
+	protected int muUseObjectTransformHandle;
+	protected int muSpecularColorHandle;
+	protected int muAmbientColorHandle;
+	protected int muShininessHandle;
+	
+	protected float[] mNormalMatrix;
+	protected float[] mLightPos;
+	protected float[] mSpecularColor;
+	protected float[] mAmbientColor;
+	protected float mShininess;
+	
+	public PhongMaterial() {
+		super(mVShader, mFShader);
+		mNormalMatrix = new float[9];
+		mSpecularColor = new float[] { 1.0f, 1.0f, 1.0f, 1.0f };
+		mAmbientColor = new float[] { 0.2f, 0.2f, 0.2f, 1.0f };
+		mShininess = 96.0f;//
+	}
+	
+	public PhongMaterial(float[] specularColor, float[] ambientColor, float shininess) {
+		this();
+		mSpecularColor = specularColor;
+		mAmbientColor = ambientColor;
+		mShininess = shininess;
+	}
+
+	@Override
+	public void setLight(ALight light) {
+		super.setLight(light);
+
+		DirectionalLight dirLight = (DirectionalLight)light;
+		mLightPos = dirLight.getPosition();
+		GLES20.glUniform3fv(muLightPosHandle, 1, mLightPos, 0);
+		GLES20.glUniform1i(muUseObjectTransformHandle, light.shouldUseObjectTransform() ? 1 : 0);
+	}
+	
+	@Override
+	public void useProgram() {
+		super.useProgram();
+		GLES20.glUniform4fv(muSpecularColorHandle, 1, mSpecularColor, 0);
+		GLES20.glUniform4fv(muAmbientColorHandle, 1, mAmbientColor, 0);
+		GLES20.glUniform1f(muShininessHandle, mShininess);
+	}
+	
+	public void setSpecularColor(float[] color) {
+		mSpecularColor = color;
+	}
+	
+	public void setAmbientcolor(float[] color) {
+		mAmbientColor = color;
+	}
+	
+	public void setShininess(float shininess) {
+		mShininess = shininess;
+	}
+	
+	@Override
+	public void setShaders(String vertexShader, String fragmentShader)
+	{
+		super.setShaders(vertexShader, fragmentShader);
+		muLightPosHandle = GLES20.glGetUniformLocation(mProgram, "uLightPos");
+		if(muLightPosHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uLightPos");
+		}
+		muNormalMatrixHandle = GLES20.glGetUniformLocation(mProgram, "uNMatrix");
+		if(muNormalMatrixHandle == -1) {
+			throw new RuntimeException("Could not get uniform location for uNMatrix");
+		}
+		muUseObjectTransformHandle = GLES20.glGetUniformLocation(mProgram, "uUseObjectTransform");
+		if(muUseObjectTransformHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uUseObjectTransform");
+		}
+
+		muSpecularColorHandle = GLES20.glGetUniformLocation(mProgram, "uSpecularColor");
+		if(muSpecularColorHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uSpecularColor");
+		}
+
+		muAmbientColorHandle = GLES20.glGetUniformLocation(mProgram, "uAmbientColor");
+		if(muAmbientColorHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uAmbientColor");
+		}
+
+		muShininessHandle = GLES20.glGetUniformLocation(mProgram, "uShininess");
+		if(muShininessHandle == -1) {
+			Log.d(Wallpaper.TAG, "Could not get uniform location for uShininess");
+		}
+	}
+	
+	@Override
+	public void setModelMatrix(float[] modelMatrix) {
+		super.setModelMatrix(modelMatrix);
+		android.graphics.Matrix normalMatrix = new android.graphics.Matrix();
+		android.graphics.Matrix mvMatrix = new android.graphics.Matrix();
+		
+		mvMatrix.setValues(new float[]{
+				modelMatrix[0], modelMatrix[1], modelMatrix[2], 
+				modelMatrix[4], modelMatrix[5], modelMatrix[6],
+				modelMatrix[8], modelMatrix[9], modelMatrix[10]
+		});
+		
+		normalMatrix.reset();
+		mvMatrix.invert(normalMatrix);
+		float[] values = new float[9];
+		normalMatrix.getValues(values);
+		
+		normalMatrix.setValues(new float[] {
+				values[0], values[3], values[6],
+				values[1], values[4], values[7],
+				values[2], values[5], values[8]
+		});
+		normalMatrix.getValues(mNormalMatrix);
+
+	    GLES20.glUniformMatrix3fv(muNormalMatrixHandle, 1, false, mNormalMatrix, 0);
+	}
+}
\ No newline at end of file
diff --git a/src/rajawali/materials/SimpleMaterial.java b/src/rajawali/materials/SimpleMaterial.java
new file mode 100644
index 000000000..e862d4308
--- /dev/null
+++ b/src/rajawali/materials/SimpleMaterial.java
@@ -0,0 +1,28 @@
+package rajawali.materials;
+
+public class SimpleMaterial extends AMaterial {
+	protected static final String mVShader = 
+		"uniform mat4 uMVPMatrix;\n" +
+		"attribute vec4 aPosition;\n" +
+		"attribute vec2 aTextureCoord;\n" +
+		"varying vec2 vTextureCoord;\n" +
+
+		"void main() {\n" +
+		"	gl_Position = uMVPMatrix * aPosition;\n" +
+		"	vTextureCoord = aTextureCoord;\n" +
+		"}\n";
+	
+	protected static final String mFShader = 
+		"precision mediump float;\n" +
+
+		"varying vec2 vTextureCoord;\n" +
+		"uniform sampler2D uTexture0;\n" +
+
+		"void main() {\n" +
+		"	gl_FragColor = texture2D(uTexture0, vTextureCoord);\n" +
+		"}\n";
+	
+	public SimpleMaterial() {
+		super(mVShader, mFShader);
+	}
+}
diff --git a/src/rajawali/materials/TextureManager.java b/src/rajawali/materials/TextureManager.java
new file mode 100644
index 000000000..b7121d315
--- /dev/null
+++ b/src/rajawali/materials/TextureManager.java
@@ -0,0 +1,179 @@
+package rajawali.materials;
+
+import java.util.ArrayList;
+
+import rajawali.wallpaper.Wallpaper;
+
+
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.opengl.GLES20;
+import android.opengl.GLUtils;
+import android.util.Log;
+
+public class TextureManager {
+	private ArrayList<TextureInfo> mTextureInfoList;
+	private ArrayList<Integer> mTextureSlots;
+	
+	private int mMaxTextures;
+	private final int[] CUBE_FACES = new int[] {
+			GLES20.GL_TEXTURE_CUBE_MAP_POSITIVE_X,
+			GLES20.GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
+			GLES20.GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
+			GLES20.GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
+			GLES20.GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
+			GLES20.GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
+	};
+	
+	public TextureManager() {
+		int numTexUnits[] = new int[1];
+		GLES20.glGetIntegerv(GLES20.GL_MAX_TEXTURE_IMAGE_UNITS, numTexUnits, 0);
+		mMaxTextures = numTexUnits[0];
+		Log.d(Wallpaper.TAG, "MAX TEXTURES: " + mMaxTextures);
+		mTextureInfoList = new ArrayList<TextureInfo>(); 
+		mTextureSlots = new ArrayList<Integer>();
+		for(int i=0; i<mMaxTextures; ++i) {
+			mTextureSlots.add(GLES20.GL_TEXTURE0 + i);
+		}
+	}
+	
+	public TextureInfo addTexture(Bitmap texture) {
+		if(mTextureInfoList.size() > mMaxTextures)
+			throw new RuntimeException("Max number of textures used");
+		
+		int textureSlot = mTextureSlots.get(0);
+		mTextureSlots.remove(0);
+		
+		int bitmapFormat = texture.getConfig() == Config.ARGB_8888 ? GLES20.GL_RGBA : GLES20.GL_RGB;
+		
+		int[] textures = new int[1];
+		GLES20.glGenTextures(1, textures, 0);
+		int textureId = textures[0];
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId);
+		
+        GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmapFormat, texture, 0);
+        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR_MIPMAP_LINEAR);
+        GLES20.glTexParameterf(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_REPEAT);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_2D, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_REPEAT);
+        GLES20.glGenerateMipmap(GLES20.GL_TEXTURE_2D);
+        
+        TextureInfo textureInfo = new TextureInfo(textureId, textureSlot);
+        mTextureInfoList.add(textureInfo);
+
+        texture.recycle();
+        return textureInfo;
+	}
+	
+	public TextureInfo addCubemapTextures(Bitmap[] textures) {
+		int[] textureIds = new int[1];
+		
+		int textureSlot = mTextureSlots.get(0);
+		mTextureSlots.remove(0);
+		
+		GLES20.glEnable(GLES20.GL_TEXTURE_CUBE_MAP);
+		GLES20.glGenTextures(1, textureIds, 0);
+		int textureId = textureIds[0];
+
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_CUBE_MAP, textureId);
+		GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_NEAREST);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_NEAREST);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
+        GLES20.glGenerateMipmap(GLES20.GL_TEXTURE_CUBE_MAP);
+        /*GLES20.glTexParameterf(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR_MIPMAP_LINEAR);
+        GLES20.glTexParameterf(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_REPEAT);
+        GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_REPEAT);
+*/
+        for(int i=0; i<6; i++) {
+        	//GLES20.glTexParameteri(GLES20.GL_TEXTURE_CUBE_MAP, GLES20.GL_GENERATE_MIPMAP_HINT, GLES20.GL_TRUE);
+        	int bitmapFormat = textures[i].getConfig() == Config.ARGB_8888 ? GLES20.GL_RGBA : GLES20.GL_RGB;
+        	GLUtils.texImage2D(CUBE_FACES[i], 0, bitmapFormat, textures[i], 0);
+        	textures[i].recycle();
+        }
+        TextureInfo textureInfo = new TextureInfo(textureId, textureSlot);
+        mTextureInfoList.add(textureInfo);
+        
+        GLES20.glBindTexture(GLES20.GL_TEXTURE_CUBE_MAP, textureId);
+        GLES20.glDisable(GLES20.GL_TEXTURE_CUBE_MAP);
+        
+		return textureInfo;
+	}
+	
+	public int getNumTextures() {
+		return mTextureInfoList.size();
+	}
+	
+	public void updateTexture(Integer textureId, int textureIndex, Bitmap texture) {
+		GLES20.glActiveTexture(GLES20.GL_TEXTURE0 +  textureIndex);
+		GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, textureId.intValue());
+		GLUtils.texSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, texture, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE);
+	}
+	
+	public void reset() {
+		int count = mTextureInfoList.size();
+		int[] textures = new int[count];
+		for(int i=0; i<count; i++)
+		{
+			textures[i] = mTextureInfoList.get(i).getTextureId();
+		}
+
+		GLES20.glDeleteTextures(count, textures, 0);
+		
+		mTextureInfoList.clear();
+		mTextureSlots.clear();
+		for(int i=0; i<mMaxTextures; ++i) {
+			mTextureSlots.add(GLES20.GL_TEXTURE0 + i);
+		}
+	}
+	
+	public void removeTextures(ArrayList<TextureInfo> textureInfoList) {
+		int count = textureInfoList.size();
+		int[] textures = new int[count];
+		int i;
+		for(i=0; i<count; ++i) {
+			Integer textureId = textureInfoList.get(i).getTextureId();
+			textures[i] = textureId.intValue();
+			mTextureSlots.add(textureInfoList.get(i).getTextureSlot());
+			mTextureInfoList.remove(textureInfoList.get(i));
+		}
+		textureInfoList.clear();
+		GLES20.glDeleteTextures(count, textures, 0);
+	}
+	
+	public ArrayList<TextureInfo> getTextureInfoList() {
+		return mTextureInfoList;
+	}
+	
+	public class TextureInfo {
+		protected int mTextureId;
+		protected int mTextureSlot;
+		protected int mUniformHandle;
+		
+		public TextureInfo(int textureId, int textureSlot) {
+			mTextureId = textureId;
+			mTextureSlot = textureSlot;
+		}
+		
+		public int getTextureId() {
+			return mTextureId;
+		}
+		
+		public int getTextureSlot() {
+			return mTextureSlot;
+		}
+		
+		public void setUniformHandle(int handle) {
+			mUniformHandle = handle;
+		}
+		
+		public int getUniformHandle() {
+			return mUniformHandle;
+		}
+		
+		public String toString() {
+			return "id: " + mTextureId + " slot: " + mTextureSlot + " handle: " + mUniformHandle;
+		}
+	}
+}
diff --git a/src/rajawali/parser/AParser.java b/src/rajawali/parser/AParser.java
new file mode 100644
index 000000000..d85927115
--- /dev/null
+++ b/src/rajawali/parser/AParser.java
@@ -0,0 +1,30 @@
+package rajawali.parser;
+
+import rajawali.BaseObject3D;
+import rajawali.materials.TextureManager;
+import android.content.res.Resources;
+
+
+public abstract class AParser implements IParser {
+	protected TextureManager mTextureManager;
+	protected Resources mResources;
+	protected int mResourceId;
+	
+	protected BaseObject3D mRootObject;
+
+	public AParser(Resources resources, TextureManager textureManager, int resourceId) {
+		mTextureManager = textureManager;
+		mResources = resources;
+		mResourceId = resourceId;
+		mRootObject = new BaseObject3D();
+	}
+	
+	@Override
+	public void parse() {
+	}
+
+	@Override
+	public BaseObject3D getParsedObject() {
+		return mRootObject;
+	}
+}
diff --git a/src/rajawali/parser/IParser.java b/src/rajawali/parser/IParser.java
new file mode 100644
index 000000000..7827d87ec
--- /dev/null
+++ b/src/rajawali/parser/IParser.java
@@ -0,0 +1,8 @@
+package rajawali.parser;
+
+import rajawali.BaseObject3D;
+
+public interface IParser {
+	public void parse();
+	public BaseObject3D getParsedObject();
+}
diff --git a/src/rajawali/parser/ObjParser.java b/src/rajawali/parser/ObjParser.java
new file mode 100644
index 000000000..0dda352c0
--- /dev/null
+++ b/src/rajawali/parser/ObjParser.java
@@ -0,0 +1,161 @@
+package rajawali.parser;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.StringTokenizer;
+
+import rajawali.BaseObject3D;
+import rajawali.materials.SimpleMaterial;
+import rajawali.materials.TextureManager;
+import rajawali.wallpaper.Wallpaper;
+
+import android.content.res.Resources;
+import android.util.Log;
+
+
+public class ObjParser extends AParser {
+    protected final String VERTEX = "v";
+    protected final String FACE = "f";
+    protected final String TEXCOORD = "vt";
+    protected final String NORMAL = "vn";
+    protected final String OBJECT = "o";
+    protected final String MATERIAL_LIB = "mtllib";
+    protected final String USE_MATERIAL = "usemtl";
+    protected final String NEW_MATERIAL = "newmtl";
+    protected final String DIFFUSE_COLOR = "Kd";
+    protected final String DIFFUSE_TEX_MAP = "map_Kd";
+	
+	public ObjParser(Resources resources, TextureManager textureManager, int resourceId) {
+		super(resources, textureManager, resourceId);
+	}
+	
+	@Override
+	public void parse() {
+		InputStream fileIn = mResources.openRawResource(mResourceId);
+		BufferedReader buffer = new BufferedReader(new InputStreamReader(fileIn));
+		String line;
+		ObjIndexData currObjIndexData = null;
+		ArrayList<ObjIndexData> objIndices = new ArrayList<ObjIndexData>();
+				
+		ArrayList<Float> vertices = new ArrayList<Float>();
+		ArrayList<Float> texCoords = new ArrayList<Float>();
+		ArrayList<Float> normals = new ArrayList<Float>();
+		
+		try {
+			while((line = buffer.readLine()) != null) {
+				StringTokenizer parts = new StringTokenizer(line, " ");
+				int numTokens = parts.countTokens();
+				
+				if(numTokens == 0)
+					continue;
+				String type = parts.nextToken();
+				
+				if(type.equals(VERTEX)) {
+					vertices.add(Float.parseFloat(parts.nextToken()));
+					vertices.add(Float.parseFloat(parts.nextToken()));
+					vertices.add(Float.parseFloat(parts.nextToken()));
+				} else if(type.equals(FACE)) {
+					if(numTokens != 4) {
+						Log.d(Wallpaper.TAG, line);
+						throw new RuntimeException("Quads are not allowed. Make sure the model contains only triangles.");
+					} else {
+                        boolean emptyVt = line.indexOf("//") > -1;
+                        if(emptyVt) line = line.replace("//", "/");
+                        
+                        parts = new StringTokenizer(line);
+                        
+                        parts.nextToken();
+                        StringTokenizer subParts = new StringTokenizer(parts.nextToken(), "/");
+                        int partLength = subParts.countTokens();
+                        
+                        boolean hasuv = partLength >= 2 && !emptyVt;
+                        boolean hasn = partLength == 3 || (partLength == 2 && emptyVt);
+                        
+                        for (int i = 1; i < 4; i++) {
+                        	if(i > 1)
+                        		subParts = new StringTokenizer(parts.nextToken(), "/");
+
+                            currObjIndexData.vertexIndices.add((short) (Short.parseShort(subParts.nextToken()) - 1));
+                            if (hasuv)
+                                currObjIndexData.texCoordIndices.add((short) (Short.parseShort(subParts.nextToken()) - 1));
+                            if (hasn)
+                                currObjIndexData.normalIndices.add((short) (Short.parseShort(subParts.nextToken()) - 1));
+                        }
+					}
+				} else if(type.equals(TEXCOORD)) {
+					texCoords.add(Float.parseFloat(parts.nextToken()));
+                    texCoords.add(Float.parseFloat(parts.nextToken()) * -1f);
+				} else if(type.equals(NORMAL)) {
+					normals.add(Float.parseFloat(parts.nextToken()));
+                    normals.add(Float.parseFloat(parts.nextToken()));
+                    normals.add(Float.parseFloat(parts.nextToken()));
+				} else if(type.equals(OBJECT)) {
+					String objName = parts.hasMoreTokens() ? parts.nextToken() : "";
+
+					Log.d(Wallpaper.TAG, "Parsing object: " + objName);
+					currObjIndexData = new ObjIndexData(new BaseObject3D(objName));
+					objIndices.add(currObjIndexData);
+				}
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+		int numObjects = objIndices.size();
+		
+		for(int j=0; j<numObjects; ++j) {
+			ObjIndexData oid = objIndices.get(j);
+			
+			int i;
+			float[] aVertices 	= new float[oid.vertexIndices.size() * 3];
+			float[] aTexCoords 	= new float[oid.texCoordIndices.size() * 2];
+			float[] aNormals 	= new float[oid.normalIndices.size() * 3];
+			short[] aIndices 	= new short[oid.vertexIndices.size()];
+			
+			for(i=0; i<oid.vertexIndices.size(); ++i) {
+				short faceIndex = (short)(oid.vertexIndices.get(i) * 3);
+				int vertexIndex = i * 3;
+				aVertices[vertexIndex] = vertices.get(faceIndex);
+				aVertices[vertexIndex+1] = vertices.get(faceIndex + 1);
+				aVertices[vertexIndex+2] = vertices.get(faceIndex + 2);
+				aIndices[i] = (short) i; 
+			}
+			for(i=0; i<oid.texCoordIndices.size(); ++i) {
+				short texCoordIndex = (short)(oid.texCoordIndices.get(i) * 2);
+				int ti = i * 2;
+				aTexCoords[ti] = texCoords.get(texCoordIndex);
+				aTexCoords[ti + 1] = texCoords.get(texCoordIndex + 1);
+			}
+			for(i=0; i<oid.normalIndices.size(); ++i){
+				short normalIndex = (short)(oid.normalIndices.get(i) * 3);
+				int ni = i * 3;
+				aNormals[ni] = normals.get(normalIndex);
+				aNormals[ni+1] = normals.get(normalIndex + 1);
+				aNormals[ni+2] = normals.get(normalIndex + 2);
+			}
+			
+			oid.targetObj.setData(aVertices, aNormals, aTexCoords, aIndices);
+			oid.targetObj.setShader(new SimpleMaterial());
+			
+			mRootObject.addChild(oid.targetObj);
+		}
+	}
+	
+	protected class ObjIndexData {
+		public BaseObject3D targetObj;
+		
+		public ArrayList<Short> vertexIndices;
+		public ArrayList<Short> texCoordIndices;
+		public ArrayList<Short> normalIndices;
+		
+		public ObjIndexData(BaseObject3D targetObj) {
+			this.targetObj = targetObj;
+			vertexIndices = new ArrayList<Short>();
+			texCoordIndices = new ArrayList<Short>();
+			normalIndices = new ArrayList<Short>();
+		}
+	}
+}
diff --git a/src/rajawali/preferences/ColorPickerPreference.java b/src/rajawali/preferences/ColorPickerPreference.java
new file mode 100644
index 000000000..0d6342d72
--- /dev/null
+++ b/src/rajawali/preferences/ColorPickerPreference.java
@@ -0,0 +1,104 @@
+package rajawali.preferences;
+
+import android.content.*;
+import android.graphics.Color;
+import android.preference.*;
+import android.util.*;
+import android.view.*;
+import android.widget.EditText;
+
+/**
+ * A {@link Preference} that allows for string
+ * input.
+ * <p>
+ * It is a subclass of {@link DialogPreference} and shows the {@link EditText}
+ * in a dialog. This {@link EditText} can be modified either programmatically
+ * via {@link #getEditText()}, or through XML by setting any EditText
+ * attributes on the EditTextPreference.
+ * <p>
+ * This preference will store a string into the SharedPreferences.
+ * <p>
+ */
+public class ColorPickerPreference extends DialogPreference {
+    /**
+     * The edit text shown in the dialog.
+     */
+    
+	ColorPickerView mPickerView;
+	int mColor;
+	
+    public ColorPickerPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    public ColorPickerPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+	private void init(Context context, AttributeSet attrs) {
+		// Don't create view here
+	}
+
+    public ColorPickerPreference(Context context) {
+        this(context, null);
+    }
+   
+    
+    @Override
+    protected View onCreateDialogView() {
+		mPickerView = new ColorPickerView(getContext(),null);
+		mPickerView.setColor(mColor);
+        mPickerView.setEnabled(true);
+    	return mPickerView;
+    }
+    
+    @Override
+    protected void onSetInitialValue(boolean restorePersistedValue,
+    		Object defaultValue) {
+    	if(defaultValue instanceof Integer){
+    	   Integer intDefaultValue = (Integer)defaultValue;
+            setColor(restorePersistedValue ? getPersistedInt(mColor) : intDefaultValue);
+    	}
+    	else {
+            setColor(restorePersistedValue ? getPersistedInt(mColor) : Color.WHITE);
+    	}
+    }
+
+    private void setColor(int color) {
+    	mColor = color;
+	}
+
+	@Override
+    protected void onDialogClosed(boolean positiveResult) {
+    	super.onDialogClosed(positiveResult);
+        if (positiveResult) {
+            Integer value = new Integer(mPickerView.getColor());
+            if (callChangeListener(value)) {
+                storeColor(value);
+            }
+        }
+        ViewParent vp = mPickerView.getParent();
+        Log.d("",vp.toString());
+
+    }
+   
+    
+    /**
+     * Saves the color to the {@link SharedPreferences}.
+     * 
+     * @param color Color to save
+     */
+    public void storeColor(int color) {
+    	mColor = color;
+        final boolean wasBlocking = shouldDisableDependents();
+        persistInt(color);
+        final boolean isBlocking = shouldDisableDependents(); 
+        if (isBlocking != wasBlocking) {
+            notifyDependencyChange(isBlocking);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/rajawali/preferences/ColorPickerView.java b/src/rajawali/preferences/ColorPickerView.java
new file mode 100644
index 000000000..4cc13b3d2
--- /dev/null
+++ b/src/rajawali/preferences/ColorPickerView.java
@@ -0,0 +1,159 @@
+package rajawali.preferences;
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import android.content.Context;
+import android.graphics.*;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+ 
+ public class ColorPickerView extends View {
+        private Paint mPaint;
+        private Paint mCenterPaint;
+        private final int[] mColors;
+
+        ColorPickerView(Context c,AttributeSet attrs) {
+            super(c,attrs);
+            mColors = new int[] {
+                0xFF000000, 0xFFFFFFFF, 
+                0xFFFF8888, 0xFFFFFF88, 
+                0xFF88FF88, 0xFF88FFFF, 
+                0xFF8888FF, 0xFFFF88FF, 
+                0xFFFF0000, 0xFFFFFF00, 
+                0xFF00FF00, 0xFF00FFFF, 
+                0xFF0000FF, 0xFFFF00FF, 
+                0xFF000000
+            };  
+            Shader s = new SweepGradient(0, 0, mColors, null);
+
+            mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            mPaint.setShader(s);
+            mPaint.setStyle(Paint.Style.STROKE);
+            mPaint.setStrokeWidth(32);
+
+            mCenterPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            mCenterPaint.setStrokeWidth(5);
+        }
+
+        public int getColor(){
+        	return(mCenterPaint.getColor());
+        }
+
+        public void setColor(int color){
+        	mCenterPaint.setColor(color);
+        	invalidate();
+        }
+        
+        private boolean mTrackingCenter;
+
+        @Override 
+        protected void onDraw(Canvas canvas) {
+            float r = CENTER_X - mPaint.getStrokeWidth()*0.5f;
+
+            canvas.translate(CENTER_X, CENTER_X);
+
+            canvas.drawOval(new RectF(-r, -r, r, r), mPaint);            
+            canvas.drawCircle(0, 0, CENTER_RADIUS, mCenterPaint);
+
+            if (mTrackingCenter) {
+                int c = mCenterPaint.getColor();
+                mCenterPaint.setStyle(Paint.Style.STROKE);
+
+/*                if (mHighlightCenter) {
+                    mCenterPaint.setAlpha(0xFF);
+                } else {
+                    mCenterPaint.setAlpha(0x80);
+                }
+*/
+                canvas.drawCircle(0, 0,
+                                  CENTER_RADIUS + mCenterPaint.getStrokeWidth(),
+                                  mCenterPaint);
+
+                mCenterPaint.setStyle(Paint.Style.FILL);
+                mCenterPaint.setColor(c);
+            }
+        }
+
+        @Override
+        protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+            setMeasuredDimension(CENTER_X*2, CENTER_Y*2);
+        }
+
+        private static final int CENTER_X = 100;
+        private static final int CENTER_Y = 100;
+        private static final int CENTER_RADIUS = 32;
+
+ 
+        private int ave(int s, int d, float p) {
+            return s + java.lang.Math.round(p * (d - s));
+        }
+
+        private int interpColor(int colors[], float unit) {
+            if (unit <= 0) {
+                return colors[0];
+            }
+            if (unit >= 1) {
+                return colors[colors.length - 1];
+            }
+
+            float p = unit * (colors.length - 1);
+            int i = (int)p;
+            p -= i;
+
+            // now p is just the fractional part [0...1) and i is the index
+            int c0 = colors[i];
+            int c1 = colors[i+1];
+            int a = ave(Color.alpha(c0), Color.alpha(c1), p);
+            int r = ave(Color.red(c0), Color.red(c1), p);
+            int g = ave(Color.green(c0), Color.green(c1), p);
+            int b = ave(Color.blue(c0), Color.blue(c1), p);
+
+            return Color.argb(a, r, g, b);
+        }
+
+ 
+        private static final float PI = (float) Math.PI;
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            float x = event.getX() - CENTER_X;
+            float y = event.getY() - CENTER_Y;
+            boolean inCenter = java.lang.Math.sqrt(x*x + y*y) <= CENTER_RADIUS;
+
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                case MotionEvent.ACTION_MOVE:
+                	if(!inCenter){
+                        float angle = (float)java.lang.Math.atan2(y, x);
+                        // need to turn angle [-PI ... PI] into unit [0....1]
+                        float unit = angle/(2*PI);
+                        if (unit < 0) {
+                            unit += 1;
+                        }
+                        int color = interpColor(mColors, unit);
+                        mCenterPaint.setColor(color);
+                        this.setColor(color);
+                        invalidate();
+                    }
+                    break;
+            }
+            return true;
+        }
+    }
+
+ 
\ No newline at end of file
diff --git a/src/rajawali/preferences/SeekbarPreference.java b/src/rajawali/preferences/SeekbarPreference.java
new file mode 100644
index 000000000..8adfada62
--- /dev/null
+++ b/src/rajawali/preferences/SeekbarPreference.java
@@ -0,0 +1,84 @@
+package rajawali.preferences;
+
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.SeekBar;
+
+public class SeekbarPreference extends DialogPreference {
+	private SeekBar mSeekBar;
+	
+	//private TextView mTextView;
+	
+	private int mValue;
+	private int mTempValue;
+	
+	public SeekbarPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		this.setPersistent(true);
+		//this.setDialogLayoutResource(R.layout.preference_cover_spacing);
+	}
+	/*
+	private final OnSeekBarChangeListener mSeekBarChangeListener = new OnSeekBarChangeListener() {
+		@Override
+		public void onStopTrackingTouch(SeekBar seekBar) {}
+		
+		@Override
+		public void onStartTrackingTouch(SeekBar seekBar) {}
+		
+		@Override
+		public void onProgressChanged(SeekBar seekBar, int progress,
+				boolean fromUser) {
+			final int value = SeekbarPreference.this.mSeekBar.getProgress();
+			
+			SeekbarPreference.this.mTextView.setText(Integer.toString(value));
+			
+			SeekbarPreference.this.setValue(value);
+			SeekbarPreference.this.mValue = value;
+		}
+	};
+	*/
+	@Override
+	protected void onBindDialogView(final View view) {
+		super.onBindDialogView(view);
+		//mSeekBar = (SeekBar)view.findViewById(R.id.cover_spacing_seekbar);
+		//mTextView = (TextView)view.findViewById(R.id.cover_spacing_value);
+		//mSeekBar.setOnSeekBarChangeListener(this.mSeekBarChangeListener);
+		mSeekBar.setProgress(this.mValue);
+	}
+	
+	@Override
+	protected Object onGetDefaultValue(final TypedArray a, final int index) {
+		return a.getInt(index, 0);
+	}
+	
+	@Override
+	protected void onSetInitialValue(final boolean restore, final Object defaultValue) {
+		final int value = this.getPersistedInt(defaultValue == null ? 0 : (Integer)defaultValue);
+		this.mValue = value;
+	}
+	
+	@Override
+	protected void onDialogClosed(final boolean positiveResult) {
+		super.onDialogClosed(positiveResult);
+		
+		if(positiveResult) {
+			this.mTempValue = this.mValue;
+			if(this.callChangeListener(this.mTempValue)) {
+				saveValue(mTempValue);
+			}
+		}
+	}
+	
+	public void setValue(final int value) {
+		this.mValue = value;
+	}
+	
+	public void saveValue(final int value) {
+		this.setValue(value);
+		this.persistInt(value);
+	}
+}
diff --git a/src/rajawali/primitives/Particle.java b/src/rajawali/primitives/Particle.java
new file mode 100644
index 000000000..ed77bdde6
--- /dev/null
+++ b/src/rajawali/primitives/Particle.java
@@ -0,0 +1,51 @@
+package rajawali.primitives;
+
+import rajawali.BaseObject3D;
+import rajawali.materials.ParticleMaterial;
+import android.opengl.GLES20;
+
+
+public class Particle extends BaseObject3D {
+	private float mPointSize = 10.0f;
+	private ParticleMaterial mParticleShader;
+	
+	public Particle() {
+		super();
+		init();
+	}
+	
+	public void setPointSize(float pointSize) {
+		mPointSize = pointSize;
+	}
+	
+	public float getPointSize() {
+		return mPointSize;
+	}
+	
+	private void init() {
+		mMaterial = new ParticleMaterial();
+		mParticleShader = (ParticleMaterial)mMaterial;
+		setDrawingMode(GLES20.GL_POINTS);
+		setTransparent(true);
+		
+		float[] vertices = new float[] {
+			0, 0, 0	        
+		};
+		float[] textureCoords = new float[] {
+			0, 0, 0
+		};
+		float[] normals = new float[] {
+			0.0f, 0.0f, 1.0f
+		};
+		short[] indices = new short[] {
+			0
+		};
+		
+		setData(vertices, normals, textureCoords, indices);
+	}
+	
+	@Override
+	protected void setShaderParams() {
+		mParticleShader.setPointSize(mPointSize);
+	}
+}
diff --git a/src/rajawali/primitives/Plane.java b/src/rajawali/primitives/Plane.java
new file mode 100644
index 000000000..75e12381c
--- /dev/null
+++ b/src/rajawali/primitives/Plane.java
@@ -0,0 +1,112 @@
+package rajawali.primitives;
+
+
+import rajawali.BaseObject3D;
+import rajawali.materials.SimpleMaterial;
+import rajawali.wallpaper.Wallpaper;
+import android.util.Log;
+
+
+public class Plane extends BaseObject3D {
+	protected float mWidth;
+	protected float mHeight;
+	protected int mSegmentsW;
+	protected int mSegmentsH;
+	
+	public Plane() {
+		this(1f, 1f, 3, 3);
+	}
+	
+	public Plane(float width, float height, int segmentsW, int segmentsH) {
+		super();
+		mWidth = width;
+		mHeight = height;
+		mSegmentsW = segmentsW;
+		mSegmentsH = segmentsH;
+		init();
+	}
+	
+	private void init() {
+		mMaterial = new SimpleMaterial();
+		/*
+		float[] vertices = new float[] {
+			-.5f, -.5f, 0,
+			.5f, -.5f, 0,
+			-.5f, .5f, 0,
+			.5f, .5f, 0	        
+		};
+		float[] textureCoords = new float[] {
+			1f, 1f,
+			0, 1f,
+			1f, 0,
+			0, 0
+		};
+		float[] normals = new float[] {
+			0.0f, 0.0f, 1.0f,
+			0.0f, 0.0f, 1.0f,
+			0.0f, 0.0f, 1.0f,
+			0.0f, 0.0f, 1.0f,
+		};
+		short[] indices = new short[] {
+			0, 3, 1, 0, 2, 3
+		};
+		
+		setData(vertices, normals, textureCoords, indices);*/
+		
+		
+        int i, j;
+        int numVertices = (mSegmentsW+1) * (mSegmentsH+1);
+        float[] vertices = new float[numVertices * 3];
+        float[] textureCoords = new float[numVertices * 2];
+        float[] normals = new float[numVertices * 3];
+        short[] indices = new short[mSegmentsW * mSegmentsH * 6];
+        int vertexCount = 0;
+        int texCoordCount = 0;
+        
+        for (i = 0; i <= mSegmentsW; ++i) {
+            for (j = 0; j <= mSegmentsH; ++j) {
+            	vertices[vertexCount] = ((float)i / (float)mSegmentsW - 0.5f) * mWidth;
+            	vertices[vertexCount+1] = 0;
+            	vertices[vertexCount+2] = ((float)j / (float)mSegmentsH - 0.5f) * mHeight;
+            	
+            	textureCoords[texCoordCount++] = (float)j / (float)mSegmentsW;
+            	textureCoords[texCoordCount++] = 1f - (float)i / (float)mSegmentsH;
+            	
+            	normals[vertexCount] = 0;
+            	normals[vertexCount+1] = 1;
+            	normals[vertexCount+2] = 0;
+            	
+            	vertexCount += 3;
+            }
+        }
+        
+
+        int colspan = mSegmentsW + 1;
+        int indexCount = 0;
+        
+        for(int row = 1; row <= mSegmentsH; row++)
+        {
+        	for (int col = 1; col <= mSegmentsW; col++)
+        	{
+        		int lr = row * colspan + col;
+                int ll = lr - 1;
+                int ur = lr - colspan;
+                int ul = ur - 1;
+                
+                indices[indexCount++] = (short)ul;
+                indices[indexCount++] = (short)ur;
+                indices[indexCount++] = (short)lr;
+                
+                indices[indexCount++] = (short)ul;
+                indices[indexCount++] = (short)lr;
+                indices[indexCount++] = (short)ll;
+        	}
+        }
+        
+        Log.d(Wallpaper.TAG, "num verts: " + numVertices);
+        Log.d(Wallpaper.TAG, "n4m v3rtz: " + vertexCount);
+        Log.d(Wallpaper.TAG, "n@m 1nd1x: " + (mSegmentsW * mSegmentsH * 6));
+        
+        setData(vertices, normals, textureCoords, indices);
+	}
+}
diff --git a/src/rajawali/primitives/Sphere.java b/src/rajawali/primitives/Sphere.java
new file mode 100644
index 000000000..5b16d4560
--- /dev/null
+++ b/src/rajawali/primitives/Sphere.java
@@ -0,0 +1,91 @@
+package rajawali.primitives;
+
+import rajawali.BaseObject3D;
+import rajawali.materials.DiffuseMaterial;
+
+
+public class Sphere extends BaseObject3D {
+	private final float PI = 3.14159265f;
+	private float mRadius;
+	private int mSegmentsW;
+	private int mSegmentsH;
+	
+	public Sphere(float radius, int segmentsW, int segmentsH) {
+		super();
+		mRadius = radius;
+		mSegmentsW = segmentsW;
+		mSegmentsH = segmentsH;
+		init();
+	}
+	
+	protected void init() {
+		mMaterial = new DiffuseMaterial();
+		//mShader = new SimpleShader();
+		int numVertices = (mSegmentsW + 1) * (mSegmentsH + 1);
+		int numIndices = 2 * mSegmentsW * (mSegmentsH - 1) * 3;
+		
+		float[] vertices = new float[numVertices * 3];
+		float[] normals = new float[numVertices * 3];
+		short[] indices = new short[numIndices]; 
+		
+		int i, j;
+		int vertIndex = 0, index = 0;
+		
+		for(j=0; j<=mSegmentsH; ++j) {
+			float horAngle = PI * j / mSegmentsH;
+			float z = -mRadius * (float)Math.cos(horAngle);
+			float ringRadius = mRadius * (float)Math.sin(horAngle);
+			
+			for(i=0; i<=mSegmentsW; ++i) {
+				float verAngle = 2.0f * PI * i / mSegmentsW;
+				float x = ringRadius * (float)Math.cos(verAngle);
+				float y = ringRadius * (float)Math.sin(verAngle);
+				float normLen = 1.0f / (float)Math.sqrt(x*x+y*y+z*z);
+				
+				normals[vertIndex] = x * normLen;
+				vertices[vertIndex++] = x;
+				normals[vertIndex] = -z * normLen;
+				vertices[vertIndex++] = -z;
+				normals[vertIndex] = y * normLen;
+				vertices[vertIndex++] = y;
+				
+				if(i > 0 && j > 0) {
+					int a = (mSegmentsW + 1) * j + i;
+					int b = (mSegmentsW + 1) * j + i - 1;
+					int c = (mSegmentsW + 1) * (j - 1) + i - 1;
+					int d = (mSegmentsW + 1) * (j - 1) + i;
+					
+					if(j == mSegmentsH) {
+						indices[index++] = (short)a;
+						indices[index++] = (short)c;
+						indices[index++] = (short)d;
+					} else if(j==1) {
+						indices[index++] = (short)a;
+						indices[index++] = (short)b;
+						indices[index++] = (short)c;
+					} else {
+						indices[index++] = (short)a;
+						indices[index++] = (short)b;
+						indices[index++] = (short)c;
+						indices[index++] = (short)a;
+						indices[index++] = (short)c;
+						indices[index++] = (short)d;
+					}
+				}
+			}
+		}
+		
+		int numUvs = (mSegmentsH + 1) * (mSegmentsW + 1) * 2;
+		float[] textureCoords = new float[numUvs];
+
+		numUvs = 0;
+		for (j = 0; j <= mSegmentsH; ++j) {
+			for (i = 0; i <= mSegmentsW; ++i) {
+				textureCoords[numUvs++] = (float)i / mSegmentsW;
+				textureCoords[numUvs++] = (float)j / mSegmentsH;
+			}
+		}
+
+		setData(vertices, normals, textureCoords, indices);
+	}
+}
diff --git a/src/rajawali/renderer/RajawaliRenderer.java b/src/rajawali/renderer/RajawaliRenderer.java
new file mode 100644
index 000000000..ea6b3b835
--- /dev/null
+++ b/src/rajawali/renderer/RajawaliRenderer.java
@@ -0,0 +1,203 @@
+package rajawali.renderer;
+
+import java.util.Stack;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+
+import rajawali.BaseObject3D;
+import rajawali.Camera3D;
+import rajawali.materials.TextureManager;
+
+import net.rbgrn.opengl.GLWallpaperService.GLEngine;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.opengl.GLES20;
+import android.opengl.GLSurfaceView;
+import android.opengl.Matrix;
+import android.util.Log;
+
+
+public class RajawaliRenderer implements GLSurfaceView.Renderer {
+	public static String TAG = "AlbumCoverWallpaper";
+	
+	protected Context mContext;
+	
+	protected float mEyeZ = -4.0f;
+	protected int mFrameRate = 30;
+	
+	protected SharedPreferences preferences;
+	
+	protected int viewportWidth, viewportHeight;
+	protected GLEngine mEngine;
+	protected GLSurfaceView mSurfaceView;
+	protected Timer mTimer;
+	
+	protected float[] mProjMatrix = new float[16];
+	protected float[] mVMatrix = new float[16];
+	
+	protected Stack<BaseObject3D> mChildren;
+	protected int mNumChildren;
+	protected boolean mEnableDepthBuffer = true;
+	
+	protected float mNearPlane  = 1.0f;
+	protected float mFarPlane = 80.0f;
+	protected TextureManager mTextureManager;
+	protected boolean mClearChildren = true;
+	
+	protected Camera3D mCamera;
+	
+	public RajawaliRenderer(Context context) {
+		mContext = context;
+		mChildren = new Stack<BaseObject3D>();
+		mCamera = new Camera3D();
+		mCamera.setZ(mEyeZ);
+	}
+
+	@Override
+    public void onDrawFrame(GL10 glUnused) {
+		int clearMask = GLES20.GL_COLOR_BUFFER_BIT;
+		if(mEnableDepthBuffer) {
+			clearMask |= GLES20.GL_DEPTH_BUFFER_BIT;
+			GLES20.glEnable(GLES20.GL_DEPTH_TEST);
+			GLES20.glDepthFunc(GLES20.GL_LESS);
+			GLES20.glDepthMask(true);
+			GLES20.glClearDepthf(1.0f);
+		}
+        GLES20.glClearColor(0.0f, 0.19f, 0.43f, 1.0f);
+        GLES20.glClear(clearMask);
+        
+        mVMatrix = mCamera.getViewMatrix();
+        for(int i=0; i<mNumChildren; i++) {
+        	mChildren.get(i).render(mCamera, mProjMatrix, mVMatrix);
+        }
+    }
+	
+	@Override
+	public void onSurfaceChanged(GL10 gl, int width, int height) {
+		viewportWidth = width;
+		viewportHeight = height;
+		
+		float ratio = (float)width/height;
+		float fov = 60;
+		float frustumH = (float)Math.tan(fov / 360.0 * Math.PI) * mNearPlane;
+		float frustumW = frustumH * ratio;
+		
+		Matrix.frustumM(mProjMatrix, 0, -frustumW, frustumW, -frustumH, frustumH, mNearPlane, mFarPlane);
+
+		GLES20.glViewport(0, 0, width, height);
+		
+		/*
+		float[] r1 = new float[16]; 
+		int[] viewport = new int[] {0, 0, viewportWidth, viewportHeight};
+		float[] modelMatrix = new float[16];
+		Matrix.setIdentityM(modelMatrix, 0);
+
+		GLU.gluUnProject(viewportWidth*1.5f, viewportHeight*1.5f, 0.0f, modelMatrix, 0, mProjMatrix, 0, viewport, 0, r1, 0);
+		*/
+	}
+
+	@Override
+	public void onSurfaceCreated(GL10 gl, EGLConfig config) {
+        //Matrix.setLookAtM(mVMatrix, 0, 0, 0, mEyeZ, 0f, 0f, 0f, 0f, 1.0f, 0.0f);
+        GLES20.glFrontFace(GLES20.GL_CCW);
+        GLES20.glCullFace(GLES20.GL_BACK);
+        
+        if(mTextureManager == null) mTextureManager = new TextureManager();
+        else mTextureManager.reset();
+
+        if(mClearChildren) {        
+			if(mNumChildren > 0) {
+				mChildren.clear();
+				mNumChildren = 0;
+			}
+        }
+	}
+	
+	protected void startRendering() {
+		if(mTimer != null) {
+			mTimer.cancel();
+			mTimer.purge();
+		}
+	
+		mTimer = new Timer();
+		mTimer.schedule(new RequestRenderTask(), 0, 1000/mFrameRate);
+	}
+	
+	protected void stopRendering() {
+		if(mTimer != null) {
+			mTimer.cancel();
+			mTimer.purge();
+		}
+	}
+	
+	public void onVisibilityChanged(boolean visible) {
+		Log.d(TAG, "visibility");
+		if(!visible) stopRendering();
+		else startRendering();
+	}
+	
+	public void onSurfaceDestroyed() {
+		Log.d(TAG, "destroyed");
+		stopRendering();
+	}
+	
+	public void setSharedPreferences(SharedPreferences preferences)
+	{
+		this.preferences = preferences;
+	}
+	
+	private class RequestRenderTask extends TimerTask {
+		public void run() {
+			if(mEngine != null && mEngine.isVisible())
+				mEngine.requestRender();
+			else if(mSurfaceView != null)
+				mSurfaceView.requestRender();			
+		}
+	}
+
+	public int getFrameRate() {
+		return mFrameRate;
+	}
+
+	public void setFrameRate(int frameRate) {
+		this.mFrameRate = frameRate;
+	}
+
+	public GLEngine getEngine() {
+		return mEngine;
+	}
+
+	public void setEngine(GLEngine engine) {
+		this.mEngine = engine;
+	}
+	
+	public GLSurfaceView getSurfaceView() {
+		return mSurfaceView;
+	}
+
+	public void setSurfaceView(GLSurfaceView surfaceView) {
+		this.mSurfaceView = surfaceView;
+	}
+
+	protected void addChild(BaseObject3D child) {
+		mChildren.add(child);
+		mNumChildren = mChildren.size();
+	}
+	
+	protected boolean removeChild(BaseObject3D child) {
+		boolean result = mChildren.remove(child);
+		mNumChildren = mChildren.size();
+		//mTextureManager.removeTextures(child.getTextureInfoList());
+		return result;
+	}
+	
+	protected boolean hasChild(BaseObject3D child) {
+		for(int i=0; i<mNumChildren; ++i) {
+			if(mChildren.get(i).equals(child)) return true;
+		}
+		return false;
+	}
+}
diff --git a/src/rajawali/wallpaper/Wallpaper.java b/src/rajawali/wallpaper/Wallpaper.java
new file mode 100644
index 000000000..2ae395aaa
--- /dev/null
+++ b/src/rajawali/wallpaper/Wallpaper.java
@@ -0,0 +1,262 @@
+package rajawali.wallpaper;
+
+import javax.microedition.khronos.egl.EGL10;
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.egl.EGLContext;
+import javax.microedition.khronos.egl.EGLDisplay;
+
+import rajawali.renderer.RajawaliRenderer;
+
+
+import net.rbgrn.opengl.GLWallpaperService;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.opengl.GLSurfaceView;
+import android.util.Log;
+
+public class Wallpaper extends GLWallpaperService {
+    public static String TAG = "AlbumCoverWallpaper";
+    private static final boolean DEBUG = false;		
+	public static final String SHARED_PREFS_NAME = "albumcoverssettings";
+
+    private static class ContextFactory implements GLSurfaceView.EGLContextFactory {
+    	private static int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
+    	
+    	public EGLContext createContext(EGL10 egl, EGLDisplay display, EGLConfig eglConfig) {
+    		Log.d(TAG, "Creating OpenGL ES 2.0 context");
+    		checkEglError("Before eglCreateContext", egl);
+    		int[] attrib_list = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL10.EGL_NONE };
+    		EGLContext context = egl.eglCreateContext(display, eglConfig, EGL10.EGL_NO_CONTEXT, attrib_list);
+    		checkEglError("After eglCreateContext", egl);
+    		
+    		return context;
+    	}
+    	
+    	public void destroyContext(EGL10 egl, EGLDisplay display, EGLContext context) {
+    		egl.eglDestroyContext(display, context);
+    	}
+    }
+    
+    private static void checkEglError(String prompt, EGL10 egl) {
+    	int error;
+    	while((error = egl.eglGetError()) != EGL10.EGL_SUCCESS) {
+    		Log.e(TAG, String.format("%s: EGL error: 0x%x", prompt, error));
+    	}
+    }
+    
+    private static class ConfigChooser implements GLSurfaceView.EGLConfigChooser {
+
+        public ConfigChooser(int r, int g, int b, int a, int depth, int stencil) {
+            mRedSize = r;
+            mGreenSize = g;
+            mBlueSize = b;
+            mAlphaSize = a;
+            mDepthSize = depth;
+            mStencilSize = stencil;
+        }
+
+        /* This EGL config specification is used to specify 2.0 rendering.
+         * We use a minimum size of 4 bits for red/green/blue, but will
+         * perform actual matching in chooseConfig() below.
+         */
+        private static int EGL_OPENGL_ES2_BIT = 4;
+        private static int[] s_configAttribs2 =
+        {
+            EGL10.EGL_RED_SIZE, 4,
+            EGL10.EGL_GREEN_SIZE, 4,
+            EGL10.EGL_BLUE_SIZE, 4,
+            EGL10.EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+            EGL10.EGL_NONE
+        };
+
+        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
+
+            /* Get the number of minimally matching EGL configurations
+             */
+            int[] num_config = new int[1];
+            egl.eglChooseConfig(display, s_configAttribs2, null, 0, num_config);
+
+            int numConfigs = num_config[0];
+
+            if (numConfigs <= 0) {
+                throw new IllegalArgumentException("No configs match configSpec");
+            }
+
+            /* Allocate then read the array of minimally matching EGL configs
+             */
+            EGLConfig[] configs = new EGLConfig[numConfigs];
+            egl.eglChooseConfig(display, s_configAttribs2, configs, numConfigs, num_config);
+
+            if (DEBUG) {
+                 printConfigs(egl, display, configs);
+            }
+            /* Now return the "best" one
+             */
+            return chooseConfig(egl, display, configs);
+        }
+
+        public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display,
+                EGLConfig[] configs) {
+            for(EGLConfig config : configs) {
+                int d = findConfigAttrib(egl, display, config,
+                        EGL10.EGL_DEPTH_SIZE, 0);
+                int s = findConfigAttrib(egl, display, config,
+                        EGL10.EGL_STENCIL_SIZE, 0);
+
+                // We need at least mDepthSize and mStencilSize bits
+                if (d < mDepthSize || s < mStencilSize)
+                    continue;
+
+                // We want an *exact* match for red/green/blue/alpha
+                int r = findConfigAttrib(egl, display, config,
+                        EGL10.EGL_RED_SIZE, 0);
+                int g = findConfigAttrib(egl, display, config,
+                            EGL10.EGL_GREEN_SIZE, 0);
+                int b = findConfigAttrib(egl, display, config,
+                            EGL10.EGL_BLUE_SIZE, 0);
+                int a = findConfigAttrib(egl, display, config,
+                        EGL10.EGL_ALPHA_SIZE, 0);
+
+                if (r == mRedSize && g == mGreenSize && b == mBlueSize && a == mAlphaSize)
+                    return config;
+            }
+            return null;
+        }
+
+        private int findConfigAttrib(EGL10 egl, EGLDisplay display,
+                EGLConfig config, int attribute, int defaultValue) {
+
+            if (egl.eglGetConfigAttrib(display, config, attribute, mValue)) {
+                return mValue[0];
+            }
+            return defaultValue;
+        }
+
+        private void printConfigs(EGL10 egl, EGLDisplay display,
+            EGLConfig[] configs) {
+            int numConfigs = configs.length;
+            Log.w(TAG, String.format("%d configurations", numConfigs));
+            for (int i = 0; i < numConfigs; i++) {
+                Log.w(TAG, String.format("Configuration %d:\n", i));
+                printConfig(egl, display, configs[i]);
+            }
+        }
+
+        private void printConfig(EGL10 egl, EGLDisplay display,
+                EGLConfig config) {
+            int[] attributes = {
+                    EGL10.EGL_BUFFER_SIZE,
+                    EGL10.EGL_ALPHA_SIZE,
+                    EGL10.EGL_BLUE_SIZE,
+                    EGL10.EGL_GREEN_SIZE,
+                    EGL10.EGL_RED_SIZE,
+                    EGL10.EGL_DEPTH_SIZE,
+                    EGL10.EGL_STENCIL_SIZE,
+                    EGL10.EGL_CONFIG_CAVEAT,
+                    EGL10.EGL_CONFIG_ID,
+                    EGL10.EGL_LEVEL,
+                    EGL10.EGL_MAX_PBUFFER_HEIGHT,
+                    EGL10.EGL_MAX_PBUFFER_PIXELS,
+                    EGL10.EGL_MAX_PBUFFER_WIDTH,
+                    EGL10.EGL_NATIVE_RENDERABLE,
+                    EGL10.EGL_NATIVE_VISUAL_ID,
+                    EGL10.EGL_NATIVE_VISUAL_TYPE,
+                    0x3030, // EGL10.EGL_PRESERVED_RESOURCES,
+                    EGL10.EGL_SAMPLES,
+                    EGL10.EGL_SAMPLE_BUFFERS,
+                    EGL10.EGL_SURFACE_TYPE,
+                    EGL10.EGL_TRANSPARENT_TYPE,
+                    EGL10.EGL_TRANSPARENT_RED_VALUE,
+                    EGL10.EGL_TRANSPARENT_GREEN_VALUE,
+                    EGL10.EGL_TRANSPARENT_BLUE_VALUE,
+                    0x3039, // EGL10.EGL_BIND_TO_TEXTURE_RGB,
+                    0x303A, // EGL10.EGL_BIND_TO_TEXTURE_RGBA,
+                    0x303B, // EGL10.EGL_MIN_SWAP_INTERVAL,
+                    0x303C, // EGL10.EGL_MAX_SWAP_INTERVAL,
+                    EGL10.EGL_LUMINANCE_SIZE,
+                    EGL10.EGL_ALPHA_MASK_SIZE,
+                    EGL10.EGL_COLOR_BUFFER_TYPE,
+                    EGL10.EGL_RENDERABLE_TYPE,
+                    0x3042 // EGL10.EGL_CONFORMANT
+            };
+            String[] names = {
+                    "EGL_BUFFER_SIZE",
+                    "EGL_ALPHA_SIZE",
+                    "EGL_BLUE_SIZE",
+                    "EGL_GREEN_SIZE",
+                    "EGL_RED_SIZE",
+                    "EGL_DEPTH_SIZE",
+                    "EGL_STENCIL_SIZE",
+                    "EGL_CONFIG_CAVEAT",
+                    "EGL_CONFIG_ID",
+                    "EGL_LEVEL",
+                    "EGL_MAX_PBUFFER_HEIGHT",
+                    "EGL_MAX_PBUFFER_PIXELS",
+                    "EGL_MAX_PBUFFER_WIDTH",
+                    "EGL_NATIVE_RENDERABLE",
+                    "EGL_NATIVE_VISUAL_ID",
+                    "EGL_NATIVE_VISUAL_TYPE",
+                    "EGL_PRESERVED_RESOURCES",
+                    "EGL_SAMPLES",
+                    "EGL_SAMPLE_BUFFERS",
+                    "EGL_SURFACE_TYPE",
+                    "EGL_TRANSPARENT_TYPE",
+                    "EGL_TRANSPARENT_RED_VALUE",
+                    "EGL_TRANSPARENT_GREEN_VALUE",
+                    "EGL_TRANSPARENT_BLUE_VALUE",
+                    "EGL_BIND_TO_TEXTURE_RGB",
+                    "EGL_BIND_TO_TEXTURE_RGBA",
+                    "EGL_MIN_SWAP_INTERVAL",
+                    "EGL_MAX_SWAP_INTERVAL",
+                    "EGL_LUMINANCE_SIZE",
+                    "EGL_ALPHA_MASK_SIZE",
+                    "EGL_COLOR_BUFFER_TYPE",
+                    "EGL_RENDERABLE_TYPE",
+                    "EGL_CONFORMANT"
+            };
+            int[] value = new int[1];
+            for (int i = 0; i < attributes.length; i++) {
+                int attribute = attributes[i];
+                String name = names[i];
+                if ( egl.eglGetConfigAttrib(display, config, attribute, value)) {
+                    Log.w(TAG, String.format("  %s: %d\n", name, value[0]));
+                } else {
+                    // Log.w(TAG, String.format("  %s: failed\n", name));
+                    while (egl.eglGetError() != EGL10.EGL_SUCCESS);
+                }
+            }
+        }
+
+        // Subclasses can adjust these values:
+        protected int mRedSize;
+        protected int mGreenSize;
+        protected int mBlueSize;
+        protected int mAlphaSize;
+        protected int mDepthSize;
+        protected int mStencilSize;
+        private int[] mValue = new int[1];
+    }
+	
+
+	protected class WallpaperEngine extends GLEngine {
+		//private WallpaperRenderer renderer;
+
+		public WallpaperEngine(SharedPreferences preferences, Context context, RajawaliRenderer renderer) {
+			super();
+
+			setEGLContextFactory(new ContextFactory());
+			setEGLConfigChooser(new ConfigChooser(5, 6, 5, 0, 16, 0));
+			
+			renderer.setEngine(this);
+			renderer.setSharedPreferences(preferences);
+			setRenderer(renderer);
+			setRenderMode(RENDERMODE_WHEN_DIRTY);
+		}
+	}
+
+	@Override
+	public Engine onCreateEngine() {
+		
+		return null;//new WallpaperEngine(this.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE), getBaseContext(), albumCovers);
+	}
+}
\ No newline at end of file
diff --git a/src/rajawali/wallpaper/WallpaperSettings.java b/src/rajawali/wallpaper/WallpaperSettings.java
new file mode 100644
index 000000000..d2c771b5f
--- /dev/null
+++ b/src/rajawali/wallpaper/WallpaperSettings.java
@@ -0,0 +1,36 @@
+package rajawali.wallpaper;
+
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+
+public class WallpaperSettings extends PreferenceActivity
+implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+@Override
+protected void onCreate(Bundle icicle) {
+    super.onCreate(icicle);
+    getPreferenceManager().setSharedPreferencesName(
+    		Wallpaper.SHARED_PREFS_NAME);
+    //addPreferencesFromResource(R.xml.settings);
+    getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(
+            this);
+}
+
+@Override
+protected void onResume() {
+    super.onResume();
+}
+
+@Override
+protected void onDestroy() {
+    getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(
+            this);
+    super.onDestroy();
+}
+
+public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
+        String key) {
+}
+
+}
\ No newline at end of file