diff --git a/.gitignore b/.gitignore index 80f352e..cc5d914 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,10 @@ *.obj # Don't ignore 3d model in OBJ -!enginecustom/3dAssetsObj/* +!enginecustom/monke.obj +!enginecustom/isosphere.obj +!enginecustom/cone.obj +!enginecustom/vaisseau.obj # Precompiled Headers *.gch diff --git a/enginecustom/3dAssetsObj/cone.obj b/enginecustom/cone.obj similarity index 100% rename from enginecustom/3dAssetsObj/cone.obj rename to enginecustom/cone.obj diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj index bebed03..589488d 100644 --- a/enginecustom/enginecustom.vcxproj +++ b/enginecustom/enginecustom.vcxproj @@ -249,19 +249,15 @@ + + Document + Document Document - - - - Document - - - Document diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters index d2a2c45..453370f 100644 --- a/enginecustom/enginecustom.vcxproj.filters +++ b/enginecustom/enginecustom.vcxproj.filters @@ -493,15 +493,15 @@ Assets - - Assets - Assets Assets + + Assets + Assets diff --git a/enginecustom/3dAssetsObj/isosphere.obj b/enginecustom/isosphere.obj similarity index 100% rename from enginecustom/3dAssetsObj/isosphere.obj rename to enginecustom/isosphere.obj diff --git a/enginecustom/3dAssetsObj/monke.obj b/enginecustom/monke.obj similarity index 100% rename from enginecustom/3dAssetsObj/monke.obj rename to enginecustom/monke.obj diff --git a/enginecustom/3dAssetsObj/vaisseau.obj b/enginecustom/vaisseau.obj similarity index 100% rename from enginecustom/3dAssetsObj/vaisseau.obj rename to enginecustom/vaisseau.obj