diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a1c3541 --- /dev/null +++ b/.gitignore @@ -0,0 +1,236 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Microsoft Azure ApplicationInsights config file +ApplicationInsights.config + +# Windows Store app package directory +AppPackages/ +BundleArtifacts/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe + +# FAKE - F# Make +.fake/ \ No newline at end of file diff --git a/GrafikaProjekt/.vs/GrafikaProjekt/v16/.suo b/GrafikaProjekt/.vs/GrafikaProjekt/v16/.suo index e84d30b..a32994b 100644 Binary files a/GrafikaProjekt/.vs/GrafikaProjekt/v16/.suo and b/GrafikaProjekt/.vs/GrafikaProjekt/v16/.suo differ diff --git a/GrafikaProjekt/.vs/GrafikaProjekt/v16/Browse.VC.db b/GrafikaProjekt/.vs/GrafikaProjekt/v16/Browse.VC.db index f2f00b8..e90741f 100644 Binary files a/GrafikaProjekt/.vs/GrafikaProjekt/v16/Browse.VC.db and b/GrafikaProjekt/.vs/GrafikaProjekt/v16/Browse.VC.db differ diff --git a/GrafikaProjekt/.vs/GrafikaProjekt/v16/ipch/AutoPCH/f786dd1bf6dfcd9/MAIN.ipch b/GrafikaProjekt/.vs/GrafikaProjekt/v16/ipch/AutoPCH/f786dd1bf6dfcd9/MAIN.ipch index f3b8e54..28c10b8 100644 Binary files a/GrafikaProjekt/.vs/GrafikaProjekt/v16/ipch/AutoPCH/f786dd1bf6dfcd9/MAIN.ipch and b/GrafikaProjekt/.vs/GrafikaProjekt/v16/ipch/AutoPCH/f786dd1bf6dfcd9/MAIN.ipch differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.exe b/GrafikaProjekt/Debug/GrafikaProjekt.exe index daf9bad..43c365e 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.exe and b/GrafikaProjekt/Debug/GrafikaProjekt.exe differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.ilk b/GrafikaProjekt/Debug/GrafikaProjekt.ilk index d508e39..9d9e4c8 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.ilk and b/GrafikaProjekt/Debug/GrafikaProjekt.ilk differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.pdb b/GrafikaProjekt/Debug/GrafikaProjekt.pdb index d6010b3..3daff62 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.pdb and b/GrafikaProjekt/Debug/GrafikaProjekt.pdb differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.command.1.tlog b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.command.1.tlog index 6ca49a5..3669e9d 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.command.1.tlog and b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.command.1.tlog differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.read.1.tlog b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.read.1.tlog index 6506314..bb07da2 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.read.1.tlog and b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/CL.read.1.tlog differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.command.1.tlog b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.command.1.tlog index 7953972..b8df840 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.command.1.tlog and b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.command.1.tlog differ diff --git a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.read.1.tlog b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.read.1.tlog index ce3994f..0b80cab 100644 Binary files a/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.read.1.tlog and b/GrafikaProjekt/Debug/GrafikaProjekt.tlog/link.read.1.tlog differ diff --git a/GrafikaProjekt/Debug/main.obj b/GrafikaProjekt/Debug/main.obj index 22f3e44..ef0874c 100644 Binary files a/GrafikaProjekt/Debug/main.obj and b/GrafikaProjekt/Debug/main.obj differ diff --git a/GrafikaProjekt/Debug/vc142.idb b/GrafikaProjekt/Debug/vc142.idb index 14a35d3..f7161f3 100644 Binary files a/GrafikaProjekt/Debug/vc142.idb and b/GrafikaProjekt/Debug/vc142.idb differ diff --git a/GrafikaProjekt/Debug/vc142.pdb b/GrafikaProjekt/Debug/vc142.pdb index fb3047b..fe6b036 100644 Binary files a/GrafikaProjekt/Debug/vc142.pdb and b/GrafikaProjekt/Debug/vc142.pdb differ diff --git a/GrafikaProjekt/GrafikaProjekt.vcxproj b/GrafikaProjekt/GrafikaProjekt.vcxproj index 4f14194..b383b92 100644 --- a/GrafikaProjekt/GrafikaProjekt.vcxproj +++ b/GrafikaProjekt/GrafikaProjekt.vcxproj @@ -88,13 +88,13 @@ true WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - C:\Users\luksli\Desktop\GrafikaProjekt\freeglut\include;C:\Users\luksli\Desktop\GrafikaProjekt\glew-1.11.0\include;%(AdditionalIncludeDirectories) + $(SolutionDir)\freeglut\include;$(SolutionDir)\glew-1.11.0\include;%(AdditionalIncludeDirectories) Console true freeglut.lib;glew32.lib;%(AdditionalDependencies) - C:\Users\luksli\Desktop\GrafikaProjekt\freeglut\lib;C:\Users\luksli\Desktop\GrafikaProjekt\glew-1.11.0\lib;%(AdditionalLibraryDirectories) + $(SolutionDir)\freeglut\lib;$(SolutionDir)\glew-1.11.0\lib;%(AdditionalLibraryDirectories) diff --git a/freeglut/Copying.txt b/GrafikaProjekt/freeglut/Copying.txt similarity index 100% rename from freeglut/Copying.txt rename to GrafikaProjekt/freeglut/Copying.txt diff --git a/freeglut/Readme.txt b/GrafikaProjekt/freeglut/Readme.txt similarity index 100% rename from freeglut/Readme.txt rename to GrafikaProjekt/freeglut/Readme.txt diff --git a/freeglut/include/GL/freeglut.h b/GrafikaProjekt/freeglut/include/GL/freeglut.h similarity index 100% rename from freeglut/include/GL/freeglut.h rename to GrafikaProjekt/freeglut/include/GL/freeglut.h diff --git a/freeglut/include/GL/freeglut_ext.h b/GrafikaProjekt/freeglut/include/GL/freeglut_ext.h similarity index 100% rename from freeglut/include/GL/freeglut_ext.h rename to GrafikaProjekt/freeglut/include/GL/freeglut_ext.h diff --git a/freeglut/include/GL/freeglut_std.h b/GrafikaProjekt/freeglut/include/GL/freeglut_std.h similarity index 100% rename from freeglut/include/GL/freeglut_std.h rename to GrafikaProjekt/freeglut/include/GL/freeglut_std.h diff --git a/freeglut/include/GL/glut.h b/GrafikaProjekt/freeglut/include/GL/glut.h similarity index 100% rename from freeglut/include/GL/glut.h rename to GrafikaProjekt/freeglut/include/GL/glut.h diff --git a/freeglut/lib/freeglut.lib b/GrafikaProjekt/freeglut/lib/freeglut.lib similarity index 100% rename from freeglut/lib/freeglut.lib rename to GrafikaProjekt/freeglut/lib/freeglut.lib diff --git a/glew-1.11.0/LICENSE.txt b/GrafikaProjekt/glew-1.11.0/LICENSE.txt similarity index 100% rename from glew-1.11.0/LICENSE.txt rename to GrafikaProjekt/glew-1.11.0/LICENSE.txt diff --git a/glew-1.11.0/README.txt b/GrafikaProjekt/glew-1.11.0/README.txt similarity index 100% rename from glew-1.11.0/README.txt rename to GrafikaProjekt/glew-1.11.0/README.txt diff --git a/glew-1.11.0/TODO.txt b/GrafikaProjekt/glew-1.11.0/TODO.txt similarity index 100% rename from glew-1.11.0/TODO.txt rename to GrafikaProjekt/glew-1.11.0/TODO.txt diff --git a/glew-1.11.0/doc/advanced.html b/GrafikaProjekt/glew-1.11.0/doc/advanced.html similarity index 100% rename from glew-1.11.0/doc/advanced.html rename to GrafikaProjekt/glew-1.11.0/doc/advanced.html diff --git a/glew-1.11.0/doc/basic.html b/GrafikaProjekt/glew-1.11.0/doc/basic.html similarity index 100% rename from glew-1.11.0/doc/basic.html rename to GrafikaProjekt/glew-1.11.0/doc/basic.html diff --git a/glew-1.11.0/doc/build.html b/GrafikaProjekt/glew-1.11.0/doc/build.html similarity index 100% rename from glew-1.11.0/doc/build.html rename to GrafikaProjekt/glew-1.11.0/doc/build.html diff --git a/glew-1.11.0/doc/credits.html b/GrafikaProjekt/glew-1.11.0/doc/credits.html similarity index 100% rename from glew-1.11.0/doc/credits.html rename to GrafikaProjekt/glew-1.11.0/doc/credits.html diff --git a/glew-1.11.0/doc/glew.css b/GrafikaProjekt/glew-1.11.0/doc/glew.css similarity index 100% rename from glew-1.11.0/doc/glew.css rename to GrafikaProjekt/glew-1.11.0/doc/glew.css diff --git a/glew-1.11.0/doc/glew.html b/GrafikaProjekt/glew-1.11.0/doc/glew.html similarity index 100% rename from glew-1.11.0/doc/glew.html rename to GrafikaProjekt/glew-1.11.0/doc/glew.html diff --git a/glew-1.11.0/doc/glew.png b/GrafikaProjekt/glew-1.11.0/doc/glew.png similarity index 100% rename from glew-1.11.0/doc/glew.png rename to GrafikaProjekt/glew-1.11.0/doc/glew.png diff --git a/glew-1.11.0/doc/glew.txt b/GrafikaProjekt/glew-1.11.0/doc/glew.txt similarity index 100% rename from glew-1.11.0/doc/glew.txt rename to GrafikaProjekt/glew-1.11.0/doc/glew.txt diff --git a/glew-1.11.0/doc/glxew.html b/GrafikaProjekt/glew-1.11.0/doc/glxew.html similarity index 100% rename from glew-1.11.0/doc/glxew.html rename to GrafikaProjekt/glew-1.11.0/doc/glxew.html diff --git a/glew-1.11.0/doc/gpl.txt b/GrafikaProjekt/glew-1.11.0/doc/gpl.txt similarity index 100% rename from glew-1.11.0/doc/gpl.txt rename to GrafikaProjekt/glew-1.11.0/doc/gpl.txt diff --git a/glew-1.11.0/doc/index.html b/GrafikaProjekt/glew-1.11.0/doc/index.html similarity index 100% rename from glew-1.11.0/doc/index.html rename to GrafikaProjekt/glew-1.11.0/doc/index.html diff --git a/glew-1.11.0/doc/install.html b/GrafikaProjekt/glew-1.11.0/doc/install.html similarity index 100% rename from glew-1.11.0/doc/install.html rename to GrafikaProjekt/glew-1.11.0/doc/install.html diff --git a/glew-1.11.0/doc/khronos.txt b/GrafikaProjekt/glew-1.11.0/doc/khronos.txt similarity index 100% rename from glew-1.11.0/doc/khronos.txt rename to GrafikaProjekt/glew-1.11.0/doc/khronos.txt diff --git a/glew-1.11.0/doc/log.html b/GrafikaProjekt/glew-1.11.0/doc/log.html similarity index 100% rename from glew-1.11.0/doc/log.html rename to GrafikaProjekt/glew-1.11.0/doc/log.html diff --git a/glew-1.11.0/doc/mesa.txt b/GrafikaProjekt/glew-1.11.0/doc/mesa.txt similarity index 100% rename from glew-1.11.0/doc/mesa.txt rename to GrafikaProjekt/glew-1.11.0/doc/mesa.txt diff --git a/glew-1.11.0/doc/new.png b/GrafikaProjekt/glew-1.11.0/doc/new.png similarity index 100% rename from glew-1.11.0/doc/new.png rename to GrafikaProjekt/glew-1.11.0/doc/new.png diff --git a/glew-1.11.0/doc/ogl_sm.jpg b/GrafikaProjekt/glew-1.11.0/doc/ogl_sm.jpg similarity index 100% rename from glew-1.11.0/doc/ogl_sm.jpg rename to GrafikaProjekt/glew-1.11.0/doc/ogl_sm.jpg diff --git a/glew-1.11.0/doc/wglew.html b/GrafikaProjekt/glew-1.11.0/doc/wglew.html similarity index 100% rename from glew-1.11.0/doc/wglew.html rename to GrafikaProjekt/glew-1.11.0/doc/wglew.html diff --git a/glew-1.11.0/include/GL/glew.h b/GrafikaProjekt/glew-1.11.0/include/GL/glew.h similarity index 100% rename from glew-1.11.0/include/GL/glew.h rename to GrafikaProjekt/glew-1.11.0/include/GL/glew.h diff --git a/glew-1.11.0/include/GL/glxew.h b/GrafikaProjekt/glew-1.11.0/include/GL/glxew.h similarity index 100% rename from glew-1.11.0/include/GL/glxew.h rename to GrafikaProjekt/glew-1.11.0/include/GL/glxew.h diff --git a/glew-1.11.0/include/GL/wglew.h b/GrafikaProjekt/glew-1.11.0/include/GL/wglew.h similarity index 100% rename from glew-1.11.0/include/GL/wglew.h rename to GrafikaProjekt/glew-1.11.0/include/GL/wglew.h diff --git a/glew-1.11.0/lib/Release MX/Win32/glew32mx.lib b/GrafikaProjekt/glew-1.11.0/lib/Release MX/Win32/glew32mx.lib similarity index 100% rename from glew-1.11.0/lib/Release MX/Win32/glew32mx.lib rename to GrafikaProjekt/glew-1.11.0/lib/Release MX/Win32/glew32mx.lib diff --git a/glew-1.11.0/lib/Release MX/Win32/glew32mxs.lib b/GrafikaProjekt/glew-1.11.0/lib/Release MX/Win32/glew32mxs.lib similarity index 100% rename from glew-1.11.0/lib/Release MX/Win32/glew32mxs.lib rename to GrafikaProjekt/glew-1.11.0/lib/Release MX/Win32/glew32mxs.lib diff --git a/glew-1.11.0/lib/glew32.lib b/GrafikaProjekt/glew-1.11.0/lib/glew32.lib similarity index 100% rename from glew-1.11.0/lib/glew32.lib rename to GrafikaProjekt/glew-1.11.0/lib/glew32.lib diff --git a/glew-1.11.0/lib/glew32s.lib b/GrafikaProjekt/glew-1.11.0/lib/glew32s.lib similarity index 100% rename from glew-1.11.0/lib/glew32s.lib rename to GrafikaProjekt/glew-1.11.0/lib/glew32s.lib diff --git a/freeglut/bin/freeglut.dll b/freeglut/bin/freeglut.dll deleted file mode 100644 index e30fb4e..0000000 Binary files a/freeglut/bin/freeglut.dll and /dev/null differ diff --git a/freeglut/bin/x64/freeglut.dll b/freeglut/bin/x64/freeglut.dll deleted file mode 100644 index 8624d4e..0000000 Binary files a/freeglut/bin/x64/freeglut.dll and /dev/null differ diff --git a/freeglut/lib/x64/freeglut.lib b/freeglut/lib/x64/freeglut.lib deleted file mode 100644 index 37fee97..0000000 Binary files a/freeglut/lib/x64/freeglut.lib and /dev/null differ diff --git a/glew-1.11.0/bin/Release MX/Win32/glew32mx.dll b/glew-1.11.0/bin/Release MX/Win32/glew32mx.dll deleted file mode 100644 index a1616e9..0000000 Binary files a/glew-1.11.0/bin/Release MX/Win32/glew32mx.dll and /dev/null differ diff --git a/glew-1.11.0/bin/Release MX/x64/glew32mx.dll b/glew-1.11.0/bin/Release MX/x64/glew32mx.dll deleted file mode 100644 index d079683..0000000 Binary files a/glew-1.11.0/bin/Release MX/x64/glew32mx.dll and /dev/null differ diff --git a/glew-1.11.0/bin/Release/Win32/glew32.dll b/glew-1.11.0/bin/Release/Win32/glew32.dll deleted file mode 100644 index 6607651..0000000 Binary files a/glew-1.11.0/bin/Release/Win32/glew32.dll and /dev/null differ diff --git a/glew-1.11.0/bin/Release/Win32/glewinfo.exe b/glew-1.11.0/bin/Release/Win32/glewinfo.exe deleted file mode 100644 index 7ea6d16..0000000 Binary files a/glew-1.11.0/bin/Release/Win32/glewinfo.exe and /dev/null differ diff --git a/glew-1.11.0/bin/Release/Win32/visualinfo.exe b/glew-1.11.0/bin/Release/Win32/visualinfo.exe deleted file mode 100644 index 143ccb7..0000000 Binary files a/glew-1.11.0/bin/Release/Win32/visualinfo.exe and /dev/null differ diff --git a/glew-1.11.0/bin/Release/x64/glew32.dll b/glew-1.11.0/bin/Release/x64/glew32.dll deleted file mode 100644 index 99873c5..0000000 Binary files a/glew-1.11.0/bin/Release/x64/glew32.dll and /dev/null differ diff --git a/glew-1.11.0/bin/Release/x64/glewinfo.exe b/glew-1.11.0/bin/Release/x64/glewinfo.exe deleted file mode 100644 index b075bc5..0000000 Binary files a/glew-1.11.0/bin/Release/x64/glewinfo.exe and /dev/null differ diff --git a/glew-1.11.0/bin/Release/x64/visualinfo.exe b/glew-1.11.0/bin/Release/x64/visualinfo.exe deleted file mode 100644 index 3077ee6..0000000 Binary files a/glew-1.11.0/bin/Release/x64/visualinfo.exe and /dev/null differ diff --git a/glew-1.11.0/lib/Release MX/x64/glew32mx.lib b/glew-1.11.0/lib/Release MX/x64/glew32mx.lib deleted file mode 100644 index 3cf4fae..0000000 Binary files a/glew-1.11.0/lib/Release MX/x64/glew32mx.lib and /dev/null differ diff --git a/glew-1.11.0/lib/Release MX/x64/glew32mxs.lib b/glew-1.11.0/lib/Release MX/x64/glew32mxs.lib deleted file mode 100644 index 837c2b4..0000000 Binary files a/glew-1.11.0/lib/Release MX/x64/glew32mxs.lib and /dev/null differ