Permalink
Browse files

tonemapping + exposure

  • Loading branch information...
1 parent 7c4f361 commit 4df06a6951429b01dbd90ee786e3622aa19413fb @genp genp committed Dec 16, 2011
Showing with 3,433 additions and 103 deletions.
  1. BIN final
  2. +84 −28 final.pro.user
  3. +112 −66 lab/glwidget.cpp
  4. +3 −1 lab/glwidget.h
  5. +3,208 −0 models/sphere.obj
  6. +6 −1 shaders/brightpass.frag
  7. +6 −1 shaders/tonemap.frag
  8. +12 −4 support/resourceloader.cpp
  9. +2 −2 support/resourceloader.h
View
Binary file not shown.
View
@@ -69,14 +69,14 @@
<valuelist key="abstractProcess.Environment" type="QVariantList">
<value type="QString">CLASSPATH=:/course/cs032/lib:/course/cs032/lib/jogl.jar:../src/</value>
<value type="QString">COLORTERM=gnome-terminal</value>
- <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-3lMO0HpBG4,guid=3ca939a35e9cc021f050c19e000e78f2</value>
+ <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-vlRIOPGNAX,guid=af2e3b735a5dc4ff29dbc5ce00000036</value>
<value type="QString">DESKTOP_SESSION=default</value>
- <value type="QString">DISPLAY=:20.0</value>
+ <value type="QString">DISPLAY=:0.0</value>
<value type="QString">EDITOR=nano</value>
<value type="QString">GDMSESSION=default</value>
- <value type="QString">GDM_XSERVER_LOCATION=flexi</value>
- <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-iv6ZBP</value>
- <value type="QString">GNOME_KEYRING_PID=5228</value>
+ <value type="QString">GDM_XSERVER_LOCATION=local</value>
+ <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-fwYCje</value>
+ <value type="QString">GNOME_KEYRING_PID=2543</value>
<value type="QString">GTK_IM_MODULE=xim</value>
<value type="QString">HOME=/home/gen</value>
<value type="QString">ILOG_LICENSE_FILE=/com/ilog/ilm/linux/access.ilm</value>
@@ -87,29 +87,29 @@
<value type="QString">LESS=-X</value>
<value type="QString">LOGNAME=gen</value>
<value type="QString">MANPATH=/local/share/man:/usr/local/man:/usr/share/man:/usr/X11R6/man:/usr/local/share/man</value>
- <value type="QString">OLDPWD=/gpfs/main/home/gen/courses/Courses_Fall2011/cs123</value>
+ <value type="QString">OLDPWD=/home/gen/courses/Courses_Fall2011/cs123</value>
<value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-gen</value>
<value type="QString">PAGER=less</value>
<value type="QString">PATH=/usr/bin:/local/bin/:/local/bin:/cfarm/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/contrib/bin:/course/cs123/bin:/course/cs123/lib/qt/qt/bin:/course/cs143/bin:/course/cs129/bin:/contrib/projects/netbeans/netbeans6.5/bin</value>
<value type="QString">PRINTER=bw4</value>
- <value type="QString">PWD=/gpfs/main/home/gen/courses/Courses_Fall2011/cs123/final</value>
+ <value type="QString">PWD=/home/gen/courses/Courses_Fall2011/cs123/final</value>
<value type="QString">PYTHONPATH=/course/cs129/include/python</value>
<value type="QString">QTDIR=/usr/share/qt4</value>
<value type="QString">QT_IM_MODULE=xim</value>
- <value type="QString">SESSION_MANAGER=local/kui:@/tmp/.ICE-unix/5491,unix/kui:/tmp/.ICE-unix/5491</value>
+ <value type="QString">SESSION_MANAGER=local/sencho:@/tmp/.ICE-unix/2870,unix/sencho:/tmp/.ICE-unix/2870</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SHLVL=1</value>
- <value type="QString">SSH_AGENT_PID=5492</value>
- <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-WbvgAu5491/agent.5491</value>
+ <value type="QString">SSH_AGENT_PID=2872</value>
+ <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-YfbyCm2870/agent.2870</value>
<value type="QString">TERM=xterm</value>
<value type="QString">USER=gen</value>
<value type="QString">USERNAME=gen</value>
<value type="QString">VISUAL=gedit</value>
- <value type="QString">WINDOWID=41943044</value>
- <value type="QString">WINDOWPATH=9</value>
- <value type="QString">XAUTHORITY=/tmp/.gdm538J6V</value>
+ <value type="QString">WINDOWID=27263181</value>
+ <value type="QString">WINDOWPATH=7</value>
+ <value type="QString">XAUTHORITY=/tmp/.gdmXK1K6V</value>
<value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value>
- <value type="QString">XDG_SESSION_COOKIE=484b4deaa962bd25e18c5587000009ab-1323544468.614389-1108780120</value>
+ <value type="QString">XDG_SESSION_COOKIE=28d139c16d88547e78a472bf0000095d-1323976380.317328-534768672</value>
<value type="QString">XMODIFIERS=@im=SCIM</value>
<value type="QString">XPSERVERLIST=:64 </value>
<value type="QString">_=/usr/bin/qtcreator</value>
@@ -133,14 +133,14 @@
<valuelist key="abstractProcess.Environment" type="QVariantList">
<value type="QString">CLASSPATH=:/course/cs032/lib:/course/cs032/lib/jogl.jar:../src/</value>
<value type="QString">COLORTERM=gnome-terminal</value>
- <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-3lMO0HpBG4,guid=3ca939a35e9cc021f050c19e000e78f2</value>
+ <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-vlRIOPGNAX,guid=af2e3b735a5dc4ff29dbc5ce00000036</value>
<value type="QString">DESKTOP_SESSION=default</value>
- <value type="QString">DISPLAY=:20.0</value>
+ <value type="QString">DISPLAY=:0.0</value>
<value type="QString">EDITOR=nano</value>
<value type="QString">GDMSESSION=default</value>
- <value type="QString">GDM_XSERVER_LOCATION=flexi</value>
- <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-iv6ZBP</value>
- <value type="QString">GNOME_KEYRING_PID=5228</value>
+ <value type="QString">GDM_XSERVER_LOCATION=local</value>
+ <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-fwYCje</value>
+ <value type="QString">GNOME_KEYRING_PID=2543</value>
<value type="QString">GTK_IM_MODULE=xim</value>
<value type="QString">HOME=/home/gen</value>
<value type="QString">ILOG_LICENSE_FILE=/com/ilog/ilm/linux/access.ilm</value>
@@ -151,29 +151,29 @@
<value type="QString">LESS=-X</value>
<value type="QString">LOGNAME=gen</value>
<value type="QString">MANPATH=/local/share/man:/usr/local/man:/usr/share/man:/usr/X11R6/man:/usr/local/share/man</value>
- <value type="QString">OLDPWD=/gpfs/main/home/gen/courses/Courses_Fall2011/cs123</value>
+ <value type="QString">OLDPWD=/home/gen/courses/Courses_Fall2011/cs123</value>
<value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-gen</value>
<value type="QString">PAGER=less</value>
<value type="QString">PATH=/usr/bin:/local/bin/:/local/bin:/cfarm/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/contrib/bin:/course/cs123/bin:/course/cs123/lib/qt/qt/bin:/course/cs143/bin:/course/cs129/bin:/contrib/projects/netbeans/netbeans6.5/bin</value>
<value type="QString">PRINTER=bw4</value>
- <value type="QString">PWD=/gpfs/main/home/gen/courses/Courses_Fall2011/cs123/final</value>
+ <value type="QString">PWD=/home/gen/courses/Courses_Fall2011/cs123/final</value>
<value type="QString">PYTHONPATH=/course/cs129/include/python</value>
<value type="QString">QTDIR=/usr/share/qt4</value>
<value type="QString">QT_IM_MODULE=xim</value>
- <value type="QString">SESSION_MANAGER=local/kui:@/tmp/.ICE-unix/5491,unix/kui:/tmp/.ICE-unix/5491</value>
+ <value type="QString">SESSION_MANAGER=local/sencho:@/tmp/.ICE-unix/2870,unix/sencho:/tmp/.ICE-unix/2870</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SHLVL=1</value>
- <value type="QString">SSH_AGENT_PID=5492</value>
- <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-WbvgAu5491/agent.5491</value>
+ <value type="QString">SSH_AGENT_PID=2872</value>
+ <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-YfbyCm2870/agent.2870</value>
<value type="QString">TERM=xterm</value>
<value type="QString">USER=gen</value>
<value type="QString">USERNAME=gen</value>
<value type="QString">VISUAL=gedit</value>
- <value type="QString">WINDOWID=41943044</value>
- <value type="QString">WINDOWPATH=9</value>
- <value type="QString">XAUTHORITY=/tmp/.gdm538J6V</value>
+ <value type="QString">WINDOWID=27263181</value>
+ <value type="QString">WINDOWPATH=7</value>
+ <value type="QString">XAUTHORITY=/tmp/.gdmXK1K6V</value>
<value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value>
- <value type="QString">XDG_SESSION_COOKIE=484b4deaa962bd25e18c5587000009ab-1323544468.614389-1108780120</value>
+ <value type="QString">XDG_SESSION_COOKIE=28d139c16d88547e78a472bf0000095d-1323976380.317328-534768672</value>
<value type="QString">XMODIFIERS=@im=SCIM</value>
<value type="QString">XPSERVERLIST=:64 </value>
<value type="QString">_=/usr/bin/qtcreator</value>
@@ -191,6 +191,62 @@
<variable>buildconfiguration-Debug-cleanstep0</variable>
<valuemap type="QVariantMap">
<value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString">Debug</value>
+ <valuelist key="abstractProcess.Environment" type="QVariantList">
+ <value type="QString">CLASSPATH=:/course/cs032/lib:/course/cs032/lib/jogl.jar:../src/</value>
+ <value type="QString">COLORTERM=gnome-terminal</value>
+ <value type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-vlRIOPGNAX,guid=af2e3b735a5dc4ff29dbc5ce00000036</value>
+ <value type="QString">DESKTOP_SESSION=default</value>
+ <value type="QString">DISPLAY=:0.0</value>
+ <value type="QString">EDITOR=nano</value>
+ <value type="QString">GDMSESSION=default</value>
+ <value type="QString">GDM_XSERVER_LOCATION=local</value>
+ <value type="QString">GNOME_KEYRING_CONTROL=/tmp/keyring-fwYCje</value>
+ <value type="QString">GNOME_KEYRING_PID=2543</value>
+ <value type="QString">GTK_IM_MODULE=xim</value>
+ <value type="QString">HOME=/home/gen</value>
+ <value type="QString">ILOG_LICENSE_FILE=/com/ilog/ilm/linux/access.ilm</value>
+ <value type="QString">JAVA_HOME=/usr</value>
+ <value type="QString">KRB5CCNAME=/tmp/krb5cc_35790</value>
+ <value type="QString">LANG=C</value>
+ <value type="QString">LD_LIBRARY_PATH=/usr/lib/qtcreator::/course/cs032/lib/OpenCV/release/lib</value>
+ <value type="QString">LESS=-X</value>
+ <value type="QString">LOGNAME=gen</value>
+ <value type="QString">MANPATH=/local/share/man:/usr/local/man:/usr/share/man:/usr/X11R6/man:/usr/local/share/man</value>
+ <value type="QString">OLDPWD=/home/gen/courses/Courses_Fall2011/cs123</value>
+ <value type="QString">ORBIT_SOCKETDIR=/tmp/orbit-gen</value>
+ <value type="QString">PAGER=less</value>
+ <value type="QString">PATH=/usr/bin:/local/bin/:/local/bin:/cfarm/bin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games:/contrib/bin:/course/cs123/bin:/course/cs123/lib/qt/qt/bin:/course/cs143/bin:/course/cs129/bin:/contrib/projects/netbeans/netbeans6.5/bin</value>
+ <value type="QString">PRINTER=bw4</value>
+ <value type="QString">PWD=/home/gen/courses/Courses_Fall2011/cs123/final</value>
+ <value type="QString">PYTHONPATH=/course/cs129/include/python</value>
+ <value type="QString">QTDIR=/usr/share/qt4</value>
+ <value type="QString">QT_IM_MODULE=xim</value>
+ <value type="QString">SESSION_MANAGER=local/sencho:@/tmp/.ICE-unix/2870,unix/sencho:/tmp/.ICE-unix/2870</value>
+ <value type="QString">SHELL=/bin/bash</value>
+ <value type="QString">SHLVL=1</value>
+ <value type="QString">SSH_AGENT_PID=2872</value>
+ <value type="QString">SSH_AUTH_SOCK=/tmp/ssh-YfbyCm2870/agent.2870</value>
+ <value type="QString">TERM=xterm</value>
+ <value type="QString">USER=gen</value>
+ <value type="QString">USERNAME=gen</value>
+ <value type="QString">VISUAL=gedit</value>
+ <value type="QString">WINDOWID=27263181</value>
+ <value type="QString">WINDOWPATH=7</value>
+ <value type="QString">XAUTHORITY=/tmp/.gdmXK1K6V</value>
+ <value type="QString">XDG_DATA_DIRS=/usr/local/share/:/usr/share/:/usr/share/gdm/</value>
+ <value type="QString">XDG_SESSION_COOKIE=28d139c16d88547e78a472bf0000095d-1323976380.317328-534768672</value>
+ <value type="QString">XMODIFIERS=@im=SCIM</value>
+ <value type="QString">XPSERVERLIST=:64 </value>
+ <value type="QString">_=/usr/bin/qtcreator</value>
+ </valuelist>
+ <value key="abstractProcess.IgnoreReturnValue" type="bool">true</value>
+ <valuelist key="abstractProcess.arguments" type="QVariantList">
+ <value type="QString">clean</value>
+ <value type="QString">-w</value>
+ </valuelist>
+ <value key="abstractProcess.command" type="QString">/usr/bin/make</value>
+ <value key="abstractProcess.enabled" type="bool">true</value>
+ <value key="abstractProcess.workingDirectory" type="QString">/gpfs/main/home/gen/courses/Courses_Fall2011/cs123/final</value>
<value key="cleanConfig" type="bool">true</value>
<valuelist key="makeargs" type="QVariantList">
<value type="QString">clean</value>
Oops, something went wrong.

0 comments on commit 4df06a6

Please sign in to comment.