Removing 7_1.glsl and adding Superquadrics history

into this commit for backup (removing superquadrics branch):

commit f1c7df889ee7e12bc7013912da9f41e40e0dc082
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Fri Jul 18 20:40:22 2014 -0400

Large update; updated QT connect function to use references

to objects and addresses of member functions (QT 5-style connect
functions), clipping range to 0.01-1000, shininess to 128, bgcolor to
light gray, GLSL shader variables (wiggle, selected, etc.) from 0/1 to
false/true, tiny_obj_loader to load material files (containing diffuse
colours per mesh), use vtkColor3f instead of custom MyColor class, added
QTConcurrent module (might be using QThreads for hinging animation),
some test code for QFutures and QFutureWatcher classes (threading),
generate texture coords for superquadrics, keypress '3' for hinging,
gitignore to ignore *.mtl files (materials for objs), updated shaders to
receive bool uniforms, (iselem to chec k if widget element rather than
mesh), added info::matFileExists static variable inside tinyobj
(declared in tiny_obj_loader.h and defined/assigned in cpp).

commit 388bc790798fd6351b9c0e3df8c8635666932fd3
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Fri Jul 11 00:54:04 2014 -0400

Updated shaders - added new shaders from three.js repos

focus shader, kaleidoscope shader, luminosity, mirror, scanline, sepia,
sobel, bloom; updated about dialog and splash screen

commit 8cc1aebbb97271d9ab35ad769fa91616e173518f
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Jul 9 14:50:25 2014 -0400

Updated interactor to do prelim hinging, prelim explosion, roundness
parameters can be modified, marking spheres rem

opacity and returns a reference to customMesh; added superquadric normal
and up vector for "generated" meshes, and addToList method added. Slot
also checks if index selected is none, then return.

commit d88888385b1c6c98cbd744fa6a589aab9ad41354
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Mon Jul 7 21:31:23 2014 -0400

More refactoring.

commit e9c6e5ed706a415aad5e9c3f0c75a026f3201070
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Mon Jul 7 19:34:45 2014 -0400

Updated README.md to use QT 5.3.1

commit 888076066a108a81ea8f112a787ff5f528f6e7f4
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Thu Jun 26 16:04:09 2014 -0400

Updated Project Name

commit 8fc809f03587fc122bf295f13216136f13a5f50f
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Mon Jun 23 05:24:49 2014 -0400

Almost entirely deprecated selectedindex (one instance left in widgets
eselectedindex which will be removed soon too

commit 89ad58645d14776d3667c0fcaa478a007cf7f680
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Mon Jun 23 03:42:54 2014 -0400

Prep for removing selectedindex variable (updated GL_intercept to 1.3)

commit b685c518c0ef35a8ca2ed0f8e6e547f1f530a462
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Fri Jun 20 09:30:33 2014 -0400

Updated name of project

commit 759c3a6fb7d321c3cc8dcefff5f80ab72691a210
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Fri Jun 20 09:28:20 2014 -0400

added forward declarations, created MyInteractorStyle.cpp to split the
header and source,

addmesh method to utility class, timer to use precisetimer for qt 5.3.0,
getmeshfromname (beginning of deprecating indices),
updated copyright info, wiggle uniform variable for wave shader control,
solved memory leak bug that constantly allocates memory using
"setShaderProgram" -changed to calling method ->Use() instead

commit aad7cbd41a1c644a86af8f9a843b421f6613aa0f
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 21:34:50 2014 -0400

Added about pictures

commit 28b55e2d47e2b3e9ab6aa20fdb878ab06301c01f
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 21:29:22 2014 -0400

Revert "Added a space."

This reverts commit c6e4fd010f846abda2b245a74bae1e8c15eb655b.

commit c6e4fd010f846abda2b245a74bae1e8c15eb655b
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 21:26:08 2014 -0400

Added a space.

commit 500a5cbf95ef08569b6e5314ae8c9df2436b3455
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 20:01:48 2014 -0400

Readded DoxyFile

commit 5ca86661c9bbd7e5ec6c5c0bfd986b5aa0a86198
Merge: 92dac92 3609ccf
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 19:57:50 2014 -0400

Merge branch 'master' into superquadrics

commit 92dac925ecab8d46ca0c7e830215969d3f4de627
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 19:54:35 2014 -0400

Readded README.md and changed path

commit 55b0e3fadd9ebd0d7a2985e8f3cfd7c4d2114c12
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 19:39:51 2014 -0400

Added new version files (VTK 6.1 and QT 5.3.0)

commit 5c474546bb3c39471eeaf1125aa0eea5cdf145d6
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 19:28:16 2014 -0400

Removed unnecessary files

commit 068dcc2dd285405d8fedbc734e0d88f1f9180b29
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Apr 29 19:20:11 2014 -0400

Removed generated files

commit a766c40939cf712b5b476528b7e12cb1f91acddb
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Mar 23 18:23:01 2014 -0400

Large update

Carve connector now performs cuts on meshes, (classifying normals works
but edges and triangulation on meshes with inner shells seems to be a
bit strange), Carve Connector has a clean mesh method to triangulate and
remove duplicates, interactor style fixed keys (alt to spin), ctrl and
dragging adds a superquadric to perform cut (orients with normal, up and
right vectors correct), pressing 1 switches between normal (phong
reflection+ minnaert diffuse lighting + fresnel and index of refraction
+ forward & diffuse translucency + some physically based shader), and
toon shading/fake subsurface scattering. Tried auto generating tcoords,
nice but not useful. Used setShaderProgram on renderer instead of Use
Restore shaderprograms (might switch back), added customdepthpeelingpass
might not use due to speed, added FXAA anti-aliasing and bloom effect
post-processing. (vtkMyProcessingPass.cpp and .h files), renamed shader
files to extensions .frag, .vert and .geom for each shader respectively.
Updated .gitignore to ignore RelWithDebInfo (release with debug info
builds). Will perform cleanup after this. (milestone)

commit 941247ac40b3a1a46c13e4b600c0bf9548c2fca9
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Thu Feb 20 16:06:03 2014 -0500

Updated shaders with cel shading

commit e7776a8e575b85383202404528c92ed1f7d3cd9d
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 19 07:49:51 2014 -0500

Added CarveConnector class to connect VTK and Carve

commit 3609ccfe605467e53ea0b5ad6b9cd9dc6b5edd42
Merge: 7d7d4ae dc34712
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 19 05:25:37 2014 -0500

Fixed conflicts

commit 7d7d4aed814d3ab5a8614f7d54fb631bab083eb7
Merge: 74bfddc c16009b
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 19 05:00:25 2014 -0500

Merge branch 'master' into superquadrics

commit 74bfddca6ca6cd691f945f973f7a2a3af8d9a9a2
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 19 04:59:18 2014 -0500

Updated README.md again

commit ad4c595c4c60e77e3ac3b2fa351c6c6f4f64b3d7
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 19 04:30:50 2014 -0500

Updated VTK to version 6.1, QT stays at 4.8.5,

and Carve CSG gets updated to January 14, 2014 repository,
(not using boost 1.55 since it breaks it, instead i'm
using the built-in ordered collection)

commit 5d6a344a46747c88ca37c01a54dfd61ce98a0807
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Feb 18 23:43:24 2014 -0500

Made changes.

commit 2bed1d89132a5a4b274e23523530e937f27d8e98
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Feb 12 16:29:04 2014 -0500

Refactored, cleaned up code, added debug info in release builds to allow
debugging, removed redundant obj readers,

updated vtksuperquadricsource, added dragging to draw superquadric,
removed unused files, using smart pointers to state explicit ownership

commit 1190458db1b4e1ad7f87b5d68482ba2e476f0e86
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Jan 22 17:13:55 2014 -0500

Update README.md

commit dc34712d4a7c428bcade5af50b9d9c2c13ba2fbd
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Jan 22 17:12:12 2014 -0500

Update README.md

commit c16009bcc8d69fa1d54eb2141a7dc350d4424e4d
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 20:51:14 2014 -0500

Updated README.md

commit afb6c561798f7c54391cd9b1224d4432ab57a0b6
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 20:50:37 2014 -0500

Updated README.md and checkbox icons

commit 0cc8dfc122de96847d18ebea9037f418b6992362
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 14:17:48 2014 -0500

Committing suo file changes.

commit 17b93ce652b6bacb420131e500c6dc1d0d437b4f
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 14:08:22 2014 -0500

Regenerated doxygen files.

commit 6e8c5fc3d8d3a241b11692bf36e349455f47faf8
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 14:06:16 2014 -0500

Removing doxygen documentation and recreating.

commit c44be7bf43826f5cb8f5b7ec2834170e7e3debcd
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 14:02:31 2014 -0500

Updated doxygen documentation

commit b0c71908e1098d1186a97b992429ff554c45dffa
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 12:30:42 2014 -0500

Updated solution files

commit d8cacb709857496404dd5865b95f92e684046434
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 12:26:11 2014 -0500

Updated README.md

commit d15445fe2da7d81e71d336e67699943988ea19b7
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Sun Jan 19 12:19:44 2014 -0500

Update README.md

commit d2c71afe2a5c83bad52413b797028df5878c3e73
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 12:12:27 2014 -0500

Changed icons

commit 1e4a60bcd1652ef4e7993fd4cce178c6de26a2f0
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 11:12:04 2014 -0500

Changed window title

commit 03524bbadab1a4a1d490e7145bf3a963c4f229ee
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Sun Jan 19 11:04:11 2014 -0500

Added details

commit a57d9304b741fa7c554f204025944facdd4882be
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 10:06:00 2014 -0500

Modified README.md

commit ab7a59bdce0d95dd7ba28c886cb911e97c7ab590
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sun Jan 19 09:58:14 2014 -0500

Cleaned up temporary files

commit 783d9af94d6c706f3003166ab3c88e5ee231529d
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sat Jan 18 20:28:35 2014 -0500

Readded old files

commit c51ea1df7f6c08afe7dcd2e73b59f4a75a95cedb
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sat Jan 18 20:20:30 2014 -0500

Switching back to VTK base

commit 386aa2ab6311b124feed56df3565597c1cf5dd0d
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sat Dec 21 07:56:41 2013 -0500

Added old VTK Superquad code

commit 985ce301d8ad6356feea0a78bc6916aa9bc3d683
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sat Dec 21 07:36:48 2013 -0500

Added polygonal mesh code from osgxi (testing)

commit da5180f93fd26fe8a229d6596a4d5f5752cf6dae
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Sat Dec 21 07:35:37 2013 -0500

Added picking, depth peeling, osgFX for outlines

(depth peeling disabled)

commit 996f4fafbb2f83e8b7adf38b85a1703e50ece8c0
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Dec 18 08:51:41 2013 -0500

Added bloom effect to FBO

commit af31f882b0c6ec3388090e0b4febd65b62fea0c2
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Wed Dec 18 08:03:17 2013 -0500

Added FBOs

commit 6322a9f6b481ed2a538ec00cb8341ba78288c08b
Merge: 6a74303 e3b9953
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 22:26:29 2013 -0500

Merge branch 'master' into superquadrics

commit 6a743032686b3468b7fe8d13215dea0dc9ffc7ba
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 21:32:41 2013 -0500

Updated README.md

commit 37c97ea0d84238d19911350d7e7745ecd64b1b1e
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 21:24:46 2013 -0500

Removed temporary shader file

commit 2d26ee81bd95540ef3c58e896a6e6425442dacb7
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 21:17:40 2013 -0500

Added new OpenSceneGraph files

commit 52d44d378a6edb057fc2449da041222e43908c10
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 21:15:40 2013 -0500

added main git files

commit 65cc254d2d526951298d0b98876d741440b5d1c2
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Dec 17 21:13:47 2013 -0500

Restarted project in OpenSceneGraph

commit 367140ec6dc3088da04a6932493f0c8f2dfb7445
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Thu Dec 5 00:56:36 2013 -0500

Redesigned entire UI, fixed fragment lighting

commit ba1b3eb7b7f7cb29d1f272f38b58c072a8ed1f8b
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Tue Nov 12 14:16:41 2013 -0500

Added keys s to add a superquad, z,x,c,v to

control theta, phi roundness (xy and z)

commit b653af6434643b904e066b4de36674185cf4306d
Author: EternalLite <cdavid.tran@gmail.com>
Date:   Thu Nov 7 07:11:34 2013 -0500

Cleaned up code using CodeMaid

commit 27dd6a850ace9b705d9e22cd3bd6bc9544e1717c
Author: eternallite <cdavid.tran@gmail.com>
Date:   Tue Nov 5 13:17:11 2013 -0500

Using lower res heart temporarily

commit dfb3ed86d481872dfd06214cae51dec688a23da7
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Nov 3 03:05:49 2013 -0500

Reverted .gitignore to original

commit fb7f527316fcc483d1ca6e06b964d4732e8c821d
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Nov 3 02:57:52 2013 -0500

Updated project to use custom objreader

commit d5ded9d4fc4846fe134ce4c19c867cf40c95f848
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Nov 3 02:48:01 2013 -0500

Fixed typo in gitignore

commit 42ffb454db943875baa53889dff288f44f7b4e2a
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Nov 3 02:46:31 2013 -0500

Update gitignore to not track documentation files for now (help)

commit 546a242d218eb155e49792af90858c384d13488c
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Sun Nov 3 01:27:22 2013 -0500

Update README.md

commit e3b99534f656e9cbe42ebdf605dfb759bbcb00af
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Sun Nov 3 01:26:41 2013 -0500

Update README.md

commit 02494ae47b3d31875eb2d50383b9fa736f03df38
Author: eternallite <cdavid.tran@gmail.com>
Date:   Fri Nov 1 16:17:13 2013 -0400

Modified shaderpass and fragment shader

commit 1a40cb3a3781dcdb2b79a32584b0001965495e03
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Oct 27 14:50:00 2013 -0400

Modified gitignore to ignore OpenGL32.dll files from GLIntercept

commit ad543544f6bbdd5b2b719cb4d3aa42ddc863321b
Author: eternallite <cdavid.tran@gmail.com>
Date:   Sun Oct 27 14:46:58 2013 -0400

Removed GLIntercept files, enabled textures (testing)

commit b13e08786efc5237d31e42a87335da524d70cacb
Author: eternallite <cdavid.tran@gmail.com>
Date:   Thu Oct 24 11:29:39 2013 -0400

Cleaned up shaders, added MySuperquadric class

MySuperquadric class is modified from vtkSuperQuadric

commit f5cf5c44c8bb7012219aaaac584a7babe70f4762
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Oct 16 03:30:06 2013 -0400

Added a title.

commit 65a97b9c3598c5328e10c60ef7df3baf0d6990cd
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Oct 16 02:26:20 2013 -0400

Create README.md

commit 249edf679a9297ba18c0d52f70369af5ed750bf2
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Oct 16 02:15:52 2013 -0400

Added a title.

commit 33deaf0c3ee0f57f17d4d7779af67e265e1781c7
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Oct 16 02:13:58 2013 -0400

Updated README.md

commit 145cc19b4589011abac6802563e6351a9553f494
Author: EternalLite <eternallite@users.noreply.github.com>
Date:   Wed Oct 16 02:11:07 2013 -0400

Created README.md

commit 3a244525be5e35ccb05d3c03a709d0eed78427ef
Merge: 08987bf 26589f1
Author: David <cdavid.tran@gmail.com>
Date:   Tue Oct 8 08:55:22 2013 -0400

Merge branch 'superquadrics' of https://github.com/eternallite/Slider
into superquadrics

commit 08987bf45fec3717bac2f71c5cab3cd5976ac379
Author: David <cdavid.tran@gmail.com>
Date:   Tue Oct 8 08:48:56 2013 -0400

Removed unused/temporary files

commit 26589f1954e0c874970e5e9898f9b70682171aaa
Author: David <cdavid.tran@gmail.com>
Date:   Tue Oct 8 08:45:56 2013 -0400

Removed unused/temporary files

commit 56dad6e048e7f070a45e2530e40845951aade853
Author: David <cdavid.tran@gmail.com>
Date:   Tue Sep 24 17:54:04 2013 -0400

Added Vectors.h, Superquadrics.h and StdDefines.h

Vectors.h generic class for vector math
Superquadrics.h contains class definition of a superquadric
StdDefines.h contains UINT32 and UINT64 declarations

commit f67b841798af23e38e16d7ca9529457bd041b752
Author: David <cdavid.tran@gmail.com>
Date:   Tue Sep 24 10:28:28 2013 -0400

Added basic superquadric in shader

additive class introduced myexp variable, which is the exponent in
implicit equation of superquadric

interactor has 'z' and 'x' as key changes for changing myexp

shader changed to use myexp in calculation of superquadric

shaderpass sets the uniform variable myexp

commit 08d6e261ebb37e5007a51e73e8b758da02459cf1
Author: David <cdavid.tran@gmail.com>
Date:   Mon Sep 23 07:30:17 2013 -0400

Moved from previous folder to GitHub folder

commit 18e48616f38288f23295717a8e3f1ec8b9f940e9
Author: David <cdavid.tran@gmail.com>
Date:   Tue Sep 17 22:34:42 2013 -0400

Added all source files (excluding .obj data files)

commit 892fd36509fe1f6c68d79421d463289241e0433e
Author: David <cdavid.tran@gmail.com>
Date:   Mon Sep 16 08:01:28 2013 -0400

Added gitattributes and gitignore