0000000000000000000000000000000000000000 f0a89b55b22dde808b7bb25161d12d0da8aa8309 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416826813 +0000	clone: from sc-piro.linux.smu:/home/sc-gj/git/OpenGLQt-Class.git
f0a89b55b22dde808b7bb25161d12d0da8aa8309 ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830448 +0000	commit: Added more window functionality, made init() virtual so I can overload it when extending base class
ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830477 +0000	checkout: moving from master to SplineDrawing
ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f 535ae7e9e4410961c1b3ec1a2946cab499dd6322 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830559 +0000	commit: Spine drawing program based on MyQtGLWindow. Looks good but still has some ugly C stuff from the original Win32 version. This can be removed at a later stage will serve its purpose as an example
535ae7e9e4410961c1b3ec1a2946cab499dd6322 461f6a0108b499c4b0178777048de841dc742563 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830630 +0000	commit: Removed old opengl source files
461f6a0108b499c4b0178777048de841dc742563 ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830678 +0000	checkout: moving from SplineDrawing to master
ba04ecc4e7c5ee9d269c98b7d31a9a4a1f390f6f 6e334aedb9a2933027d78caebfd1d54e208ae708 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416830745 +0000	commit: Removed old Win32 source files from project
6e334aedb9a2933027d78caebfd1d54e208ae708 6e334aedb9a2933027d78caebfd1d54e208ae708 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416904988 +0000	checkout: moving from master to RenderEngine
6e334aedb9a2933027d78caebfd1d54e208ae708 0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416924232 +0000	commit: Created a render engine (was called managed OGL component in the old C# version. This has some classes to hold basic geometry for loading in models from collada and for drawing them. This is again a subclass of the MyQtGLWindow class which overloads the draw and init methods. The main has been slightly extended to add a test plane and has the partial test box add
0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416924324 +0000	checkout: moving from RenderEngine to FrontEnd
0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 b3267f3561bd1468a1ed3ca3bffdd1b8a463f3c2 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935284 +0000	commit: Created a front end, ended up making changes to the MyQtGLWindow class due to a bug elsewhere. I'm going to commit this version then checkout the old version from the master and see if that works, if it does I'll replace the one in this branch with the updates. This version of the MainWindow has a simple .ui file. There is a grid layout with a frame (which has its own layout) and the gl component on that frame. There are also buttons for zoom (which allowed me to identify the issues with projection, caused by a missing call to initalise the opengl component)
b3267f3561bd1468a1ed3ca3bffdd1b8a463f3c2 5454d285156ed5a50438946d60da90b28ace39ea sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935517 +0000	commit: Changed back to the original MyQtGLWindow there were no important changes to backport, still works fine
5454d285156ed5a50438946d60da90b28ace39ea 0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935677 +0000	checkout: moving from FrontEnd to RenderEngine
0d0ee37eaec5d6fe9a8e756ac3a900b9c9c5d913 570b892497ae022f33ac3a978e7bd105128d08c2 sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935845 +0000	commit: Checked out and tested modified version from later project (FrontEnd) the older version did not pass the parent wiget though leading to odd behavour when added to a form. Now all sorted.
570b892497ae022f33ac3a978e7bd105128d08c2 5454d285156ed5a50438946d60da90b28ace39ea sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935889 +0000	checkout: moving from RenderEngine to FrontEnd
5454d285156ed5a50438946d60da90b28ace39ea 5454d285156ed5a50438946d60da90b28ace39ea sc-gj <glenn.l.jenkins@smu.ac.uk> 1416935916 +0000	checkout: moving from FrontEnd to ColladaTool
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 e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a sc-gj <glenn.l.jenkins@smu.ac.uk> 1417705091 +0000	checkout: moving from ColladaTool to Lighting
e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a 570b892497ae022f33ac3a978e7bd105128d08c2 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417705186 +0000	checkout: moving from Lighting to RenderEngine
570b892497ae022f33ac3a978e7bd105128d08c2 b7cae25297f5ac2e2e47ad6e2a777366cf7eafa5 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711040 +0000	commit: Finally solved bug in the Rendering stuff, turns out you need to enable backface culling each time your render. I don't really understand why this is, perhaps something to do with Qt and OGL? also found a bug in polygone. Will have to add this to their respective projects and make sure that I create a new version of this project without my debug main
b7cae25297f5ac2e2e47ad6e2a777366cf7eafa5 5d6561c7642c4c6c31bd8ea36dfddbbef7277163 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711168 +0000	commit: Re-created the student main.cpp, i.e with missing bits to do
5d6561c7642c4c6c31bd8ea36dfddbbef7277163 461f6a0108b499c4b0178777048de841dc742563 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711189 +0000	checkout: moving from RenderEngine to SplineDrawing
461f6a0108b499c4b0178777048de841dc742563 09dd32a0e5dc623d852ec16c10feb30adcbb0a79 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711318 +0000	commit: Pulled changes to MyQtWindow from later versions, fixes bugs related to lighting
09dd32a0e5dc623d852ec16c10feb30adcbb0a79 5454d285156ed5a50438946d60da90b28ace39ea sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711333 +0000	checkout: moving from SplineDrawing to FrontEnd
5454d285156ed5a50438946d60da90b28ace39ea 5609d042c4ae659f1747c2bdb7033a4370d9c9ef sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711563 +0000	commit: Pulled changes to MyQtWindow, MyGeom, MyPoly and RenderEngine from later version, fixes bugs related to lighting and scaling
5609d042c4ae659f1747c2bdb7033a4370d9c9ef e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711589 +0000	checkout: moving from FrontEnd to ColladaTool
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 e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a sc-gj <glenn.l.jenkins@smu.ac.uk> 1417711865 +0000	checkout: moving from ColladaTool to Lighting
e22ea7cb4ee4641aeed27b68ca58ce8d0d9d445a 60805c0766b830a49c10949f54a097380c69f676 sc-gj <glenn.l.jenkins@smu.ac.uk> 1417712374 +0000	commit: Pulled changed files from debug project (had to go back to a simple hand coded geometry to debug lighting) now this is all fixed I've rolled out the changes from the RenderEngine to other projects. This version includes a fix for Geometries which do not set their scale and has working index and vertex counts in the MyGeometry object. Other fixes include lighting and back face culling which it seems must be switched on before each render. I've fixed the main.cpp to load duck rather than cube to check the lighting. Looking good now and should impress th students
60805c0766b830a49c10949f54a097380c69f676 6e334aedb9a2933027d78caebfd1d54e208ae708 sc-gj <glenn.l.jenkins@smu.ac.uk> 1418734852 +0000	checkout: moving from Lighting to master
6e334aedb9a2933027d78caebfd1d54e208ae708 e3bfb97efe9d403c610d386a543c804e5a21f2e3 sc-gj <glenn.l.jenkins@smu.ac.uk> 1418998878 +0000	commit: Changed author and the size of the font in the editor
e3bfb97efe9d403c610d386a543c804e5a21f2e3 09dd32a0e5dc623d852ec16c10feb30adcbb0a79 sc-gj <glenn.l.jenkins@smu.ac.uk> 1418998935 +0000	checkout: moving from master to SplineDrawing
09dd32a0e5dc623d852ec16c10feb30adcbb0a79 3bcaf22fd0afbf6197f8b034a0ee4c4c680f6e07 sc-gj <glenn.l.jenkins@smu.ac.uk> 1419243543 +0000	commit: Qt Creator has updated its file for some unknown reason
3bcaf22fd0afbf6197f8b034a0ee4c4c680f6e07 97e575553c7333617ed593fdfcf6546c3eaf27a7 sc-gj <glenn.l.jenkins@smu.ac.uk> 1419247503 +0000	commit: Qt Creator has updated its file for some unknown reason
97e575553c7333617ed593fdfcf6546c3eaf27a7 5d6561c7642c4c6c31bd8ea36dfddbbef7277163 sc-gj <glenn.l.jenkins@smu.ac.uk> 1419247526 +0000	checkout: moving from SplineDrawing to RenderEngine
5d6561c7642c4c6c31bd8ea36dfddbbef7277163 4340676572975cf07b696ffea5a0b3df69a0147b sc-gj <glenn.l.jenkins@smu.ac.uk> 1419261090 +0000	commit: Some minor spaceing changes and took out the lighting for the student version
4340676572975cf07b696ffea5a0b3df69a0147b 5609d042c4ae659f1747c2bdb7033a4370d9c9ef sc-gj <glenn.l.jenkins@smu.ac.uk> 1419343668 +0000	checkout: moving from RenderEngine to FrontEnd
5609d042c4ae659f1747c2bdb7033a4370d9c9ef 0dcb3025ac7f5206130479578ef317970b390747 sc-gj <glenn.l.jenkins@smu.ac.uk> 1419351059 +0000	commit: Changes made by tool just by opening and closing - possibly rebuilding ui class?
0dcb3025ac7f5206130479578ef317970b390747 e3bfb97efe9d403c610d386a543c804e5a21f2e3 sc-gj <glenn.l.jenkins@smu.ac.uk> 1421916730 +0000	checkout: moving from FrontEnd to master
e3bfb97efe9d403c610d386a543c804e5a21f2e3 91218b1908968a4fdfb7a5460b55d7915be30050 sc-gj <glenn.l.jenkins@smu.ac.uk> 1422025364 +0000	commit: Editor change to .pro.user file
91218b1908968a4fdfb7a5460b55d7915be30050 91218b1908968a4fdfb7a5460b55d7915be30050 sc-gj <glenn.l.jenkins@smu.ac.uk> 1422025430 +0000	checkout: moving from master to master
91218b1908968a4fdfb7a5460b55d7915be30050 91218b1908968a4fdfb7a5460b55d7915be30050 sc-gj <glenn.l.jenkins@smu.ac.uk> 1422025641 +0000	checkout: moving from master to test
91218b1908968a4fdfb7a5460b55d7915be30050 bc1f27d781af2f6a7b4eb6cf37585a32d0f24f1f sc-gj <glenn.l.jenkins@smu.ac.uk> 1422025680 +0000	commit: Testing I can check branches onto the server and off as a student
bc1f27d781af2f6a7b4eb6cf37585a32d0f24f1f 91218b1908968a4fdfb7a5460b55d7915be30050 sc-gj <glenn.l.jenkins@smu.ac.uk> 1422277375 +0000	checkout: moving from test to master
91218b1908968a4fdfb7a5460b55d7915be30050 97e575553c7333617ed593fdfcf6546c3eaf27a7 sc-gj <glenn.l.jenkins@smu.ac.uk> 1422281557 +0000	checkout: moving from master to SplineDrawing
97e575553c7333617ed593fdfcf6546c3eaf27a7 4340676572975cf07b696ffea5a0b3df69a0147b sc-gj <glenn.l.jenkins@smu.ac.uk> 1422881190 +0000	checkout: moving from SplineDrawing to RenderEngine
4340676572975cf07b696ffea5a0b3df69a0147b b7ddb220657b13167d5794d91c47c8f963de9c08 sc-gj <glenn.l.jenkins@smu.ac.uk> 1425900596 +0000	checkout: moving from RenderEngine to ColladaTool
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
9ab14313858930fc42372b515a2e13acaa4c17d8 4340676572975cf07b696ffea5a0b3df69a0147b sc-gj <glenn.l.jenkins@smu.ac.uk> 1445426145 +0100	checkout: moving from ColladaTool to RenderEngine
