0000000000000000000000000000000000000000 5454d285156ed5a50438946d60da90b28ace39ea sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935916 +0000	branch: Created from HEAD
5454d285156ed5a50438946d60da90b28ace39ea 0e4398d547a60b4e74911317f7b59f80c0067e54 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417005246 +0000	commit: Added collada importer from old Win32 project
0e4398d547a60b4e74911317f7b59f80c0067e54 1ab916ada948268890174e8d8076edfd171b0682 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417005329 +0000	commit: Updates made to accomodate ColladaImporter class, essentially just addition of debugging methods to polygon and geomtry objects. Made some minor changes to move everything to use C++ rather than C calls. Had some interesting namespace issues with the collada code, managed to get a compromoise but its not ideal
1ab916ada948268890174e8d8076edfd171b0682 4da048e81ca08fba5a74e835ace1408c9d73c2c3 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022158 +0000	commit: Added some more modules and mdofied the ColladaImport class based on my experiments with the Collada on linux stuff which appears to use a more modern version of COLLADA which allows the verion of collada to be set as a parameter to the dae inialiser. Also modified the reading of the path to use boost filesystem to check validity of input. Improved getMyGeom method to check file was loaded
4da048e81ca08fba5a74e835ace1408c9d73c2c3 a6ef492bc3632e0efb6ae6550cd373228d8d09a4 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022208 +0000	commit: Modifed to use iostream rather than stdio. Also fiddling with lighting but this is taken out
a6ef492bc3632e0efb6ae6550cd373228d8d09a4 026371e23531955a3aa9196ddb944ebcee70af40 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022271 +0000	commit: Modifed to allow scaling of objects loaded from file, this is vital as some of the models from other tools are huge
026371e23531955a3aa9196ddb944ebcee70af40 20f9ff08d681195408967c46b068316d62710b1c sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022296 +0000	commit: Modifed to allow scaling of objects loaded from file, this is vital as some of the models from other tools are huge
20f9ff08d681195408967c46b068316d62710b1c 0f3d718157542de8c27074ee965ca0a3495433d0 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022313 +0000	commit: Modifed to allow scaling of objects loaded from file, this is vital as some of the models from other tools are huge
0f3d718157542de8c27074ee965ca0a3495433d0 745e1d781aa83dc20373a3226f293c1f86571dd6 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022328 +0000	commit: No major changes just playing with lighting
745e1d781aa83dc20373a3226f293c1f86571dd6 7d6b1c6ec1c0e796d0299b77ab5f8ac29faf5ff9 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417022349 +0000	commit: Name was a lie was actually polylist not triangles, found the right file now
7d6b1c6ec1c0e796d0299b77ab5f8ac29faf5ff9 183d492fe68bfe9d43936dd61b668eb031d0b61a sc-gj <glenn.l.jenkins@smu.ac.uk> 1417698782 +0000	commit: update of user prefs
183d492fe68bfe9d43936dd61b668eb031d0b61a 666e68408db2fd06f2cf62b01bdbf95469d68fd6 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417698878 +0000	commit (merge): update of user prefs
666e68408db2fd06f2cf62b01bdbf95469d68fd6 e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a sc-gj <glenn.l.jenkins@smu.ac.uk> 1417699483 +0000	commit: Fiddling, still no bug fix
e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a b7ddb220657b13167d5794d91c47c8f963de9c08 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711826 +0000	commit: Pulled changes for lighting from the lighting branch. Files include MyGeometry, MyQtGLWindow and RenderEngine. Also fixed bug with normals being scaled in this version
b7ddb220657b13167d5794d91c47c8f963de9c08 1439543a66a5f6d26d42df59c69b0e2d730083d6 sc-gj <glenn.l.jenkins@smu.ac.uk> 1445425957 +0100	commit: Just opened and closed
1439543a66a5f6d26d42df59c69b0e2d730083d6 9ab14313858930fc42372b515a2e13acaa4c17d8 sc-gj <glenn.l.jenkins@smu.ac.uk> 1445426099 +0100	commit (merge): Just opened and closed
