Finalizing

.gitignore

@@ -0,0 +1,3 @@
+build-Simulator-Desktop_Qt_5_9_0_GCC_64bit-Debug/Makefile
+cube/Makefile
+pyramid/Makefile

Simulator/Simulator.pro → PhySim.pro

@@ -1,16 +1,16 @@
 #-------------------------------------------------
 #
-# Project created by QtCreator 2017-06-12T14:04:30
+# Project created by QtCreator 2017-07-14T05:07:20
 #
 #-------------------------------------------------
 
 QT       += core gui
-QT         += widgets
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = Simulator
+TARGET = PhySim
 TEMPLATE = app
+INCLUDEPATH += .
 
 # The following define makes your compiler emit warnings if you use
 # any feature of Qt which as been marked as deprecated (the exact warnings
@@ -26,13 +26,10 @@ DEFINES += QT_DEPRECATED_WARNINGS
 
 SOURCES += \
         main.cpp \
-        simulator.cpp
+        mainwindow.cpp
 
 HEADERS += \
-        simulator.h
+        mainwindow.h
 
 FORMS += \
-        simulator.ui
-
-RESOURCES += \
-    resources.qrc
+        mainwindow.ui

Simulator/Simulator.pro.user → PhySim.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.3.1, 2017-06-18T23:05:44. -->
+<!-- Written by QtCreator 4.3.1, 2017-07-16T23:49:35. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -66,7 +66,7 @@
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/MUSoC/PhySim/build-Simulator-Desktop_Qt_5_9_0_GCC_64bit-Debug</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/Physics-Sim/build-PhySim-Desktop_Qt_5_9_0_GCC_64bit-Debug</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -126,7 +126,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/MUSoC/PhySim/build-Simulator-Desktop_Qt_5_9_0_GCC_64bit-Release</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/Physics-Sim/build-PhySim-Desktop_Qt_5_9_0_GCC_64bit-Release</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -186,7 +186,7 @@
     <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
    </valuemap>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/MUSoC/PhySim/build-Simulator-Desktop_Qt_5_9_0_GCC_64bit-Profile</value>
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/ayushmalviya27/Desktop/Physics-Sim/build-PhySim-Desktop_Qt_5_9_0_GCC_64bit-Profile</value>
     <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
      <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
       <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
@@ -302,15 +302,15 @@
     </valuelist>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Simulator</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/ayushmalviya27/Desktop/MUSoC/PhySim/Simulator/Simulator.pro</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">PhySim</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">PhySim2</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/ayushmalviya27/Desktop/MUSoC/PhySim/PhySim.pro</value>
     <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Simulator.pro</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">PhySim.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
-    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/ayushmalviya27/Desktop/MUSoC/PhySim/build-Simulator-Desktop_Qt_5_9_0_GCC_64bit-Debug</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/ayushmalviya27/Desktop/Physics-Sim/build-PhySim-Desktop_Qt_5_9_0_GCC_64bit-Debug</value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>

README.md

@@ -1,17 +1,15 @@
 # PhySim
 ## Project Details: 
 
-Creating a Physics Simulator using OpenGL.
-
-### MUSoC Proposal link: https://drive.google.com/file/d/0B58WlDabcUEZWkg1OUE3YzhnNW8/view
-
+It is a Qt created GUI project that consists of different simulations of simple shapes (5, for now), made via OpenGL.
+The user can select the desired option from the interface. 
 
 # Running The Project:
 There are two basic ways to build and run the project:
 
 ## 1. Using Qt:
 
-	--> Open the Simulator.pro file directly (if the extension is associated via Qt) 
+	--> Open the PhySim.pro file directly (if the extension is associated via Qt) 
 		or load the project via Qt first.
 	--> Click on the Hammer icon (or use Ctrl+B) to build the project.
 	--> Now use the Run icon (or Ctrl+R) to run the project.
@@ -37,7 +35,26 @@ There are two basic ways to build and run the project:
 
 	Execution of the program
 
-		After running the previous command, an executable file by the name of "Simulator" in the directory.
+		After running the previous command, an executable file by the name of "PhySim" in the directory.
 		To run it, use the following command.
 
-		$ ./Simulator 
+		$ ./PhySim 
+
+
+## Building and compilation (Ubuntu):
+		the animation_builds folder contains the code for the different animations in addition to the Build executables. If you wish to do it yourself, you can do so by using running the following in the terminal:
+				$ g++ filename.cpp -o outputname -lGL -lGLU -lglut
+
+		You can refer to the following for additional help:
+				http://goanna.cs.rmit.edu.au/~gl/teaching/Interactive3D/2012/compiling.html
+
+## Before running the project:
+		Make sure to update the location of the build executable for all the animations under mainwindow.cpp by editing the following code, or it could cause the program to not run properly:
+
+			void MainWindow::on_pushButton_clicked()
+				{
+				    QString file = "Insert location of executable here";
+				    QProcess::startDetached(file);
+				}
+
+