diff --git a/Oving 7/O7_utdelt.zip b/Oving 7/O7_utdelt.zip new file mode 100644 index 0000000..019bcc2 Binary files /dev/null and b/Oving 7/O7_utdelt.zip differ diff --git a/Oving 7/Oving 7.sln b/Oving 7/Oving 7.sln new file mode 100644 index 0000000..30622f8 --- /dev/null +++ b/Oving 7/Oving 7.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.271 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oving 7", "Oving 7\Oving 7.vcxproj", "{5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Debug|x64.ActiveCfg = Debug|x64 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Debug|x64.Build.0 = Debug|x64 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Debug|x86.ActiveCfg = Debug|Win32 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Debug|x86.Build.0 = Debug|Win32 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Release|x64.ActiveCfg = Release|x64 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Release|x64.Build.0 = Release|x64 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Release|x86.ActiveCfg = Release|Win32 + {5DD82174-56A0-44B0-A0D8-4C2F7CF008B9}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {034CFCEE-6BB4-4224-BF80-4BF52A420855} + EndGlobalSection +EndGlobal diff --git a/Oving 7/Oving 7/Emoji.cpp b/Oving 7/Oving 7/Emoji.cpp new file mode 100644 index 0000000..7054782 --- /dev/null +++ b/Oving 7/Oving 7/Emoji.cpp @@ -0,0 +1,12 @@ +#include "Emoji.h" + + + +Emoji::Emoji() +{ +} + + +Emoji::~Emoji() +{ +} diff --git a/Oving 7/Oving 7/Emoji.h b/Oving 7/Oving 7/Emoji.h new file mode 100644 index 0000000..893ce5d --- /dev/null +++ b/Oving 7/Oving 7/Emoji.h @@ -0,0 +1,11 @@ +#pragma once +class Emoji +{ +public: + virtual void Emoji::attach_to(Graph_lib::Window&) = 0; + Emoji(const Emoji&) = delete; + Emoji& operator=(const Emoji&) = delete; + Emoji() {} + virtual ~Emoji(); +}; + diff --git a/Oving 7/Oving 7/Face.cpp b/Oving 7/Oving 7/Face.cpp new file mode 100644 index 0000000..56071e4 --- /dev/null +++ b/Oving 7/Oving 7/Face.cpp @@ -0,0 +1,12 @@ +#include "Face.h" + + + +Face::Face() +{ +} + + +Face::~Face() +{ +} diff --git a/Oving 7/Oving 7/Face.h b/Oving 7/Oving 7/Face.h new file mode 100644 index 0000000..ccb2839 --- /dev/null +++ b/Oving 7/Oving 7/Face.h @@ -0,0 +1,10 @@ +#pragma once +#include "Emoji.h" +class Face : + public Emoji +{ +public: + Face(); + virtual ~Face(); +}; + diff --git a/Oving 7/Oving 7/Oving 7.vcxproj b/Oving 7/Oving 7/Oving 7.vcxproj new file mode 100644 index 0000000..ae3349e --- /dev/null +++ b/Oving 7/Oving 7/Oving 7.vcxproj @@ -0,0 +1,164 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + 15.0 + {5dd82174-56a0-44b0-a0d8-4c2f7cf008b9} + Oving_7 + 10.0.17763.0 + + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + Application + true + v141 + MultiByte + + + Application + false + v141 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + C:\Program Files\TDT4102\includes;$(ProjectDir);C:\Program Files\TDT4102\Graph_lib\Graph;$(VCInstallDir);C:\Program Files\TDT4102\FLTK_1.3.4-2;$(IncludePath) + C:\Program Files\TDT4102\Graph_lib\lib32;C:\Program Files\TDT4102\FLTK_1.3.4-2\lib32;$(LibraryPath) + + + C:\Program Files\TDT4102\includes;$(ProjectDir);C:\Program Files\TDT4102\Graph_lib\Graph;$(VCInstallDir);C:\Program Files\TDT4102\FLTK_1.3.4-2;$(IncludePath) + C:\Program Files\TDT4102\Graph_lib\lib32;C:\Program Files\TDT4102\FLTK_1.3.4-2\lib32;$(LibraryPath) + + + C:\Program Files\TDT4102\includes;$(ProjectDir);C:\Program Files\TDT4102\Graph_lib\Graph;$(VCInstallDir);C:\Program Files\TDT4102\FLTK_1.3.4-2;$(IncludePath) + C:\Program Files\TDT4102\Graph_lib\lib64;C:\Program Files\TDT4102\FLTK_1.3.4-2\lib64;$(LibraryPath) + + + C:\Program Files\TDT4102\includes;$(ProjectDir);C:\Program Files\TDT4102\Graph_lib\Graph;$(VCInstallDir);C:\Program Files\TDT4102\FLTK_1.3.4-2;$(IncludePath) + C:\Program Files\TDT4102\Graph_lib\lib64;C:\Program Files\TDT4102\FLTK_1.3.4-2\lib64;$(LibraryPath) + + + + Level3 + Disabled + true + true + NOGDI;WIN32;_MBCS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + Graph_libd.lib;fltkd.lib;wsock32.lib;comctl32.lib;fltkjpegd.lib;fltkimagesd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + Level3 + Disabled + true + true + NOGDI;WIN32;_MBCS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + Graph_libd.lib;fltkd.lib;wsock32.lib;comctl32.lib;fltkjpegd.lib;fltkimagesd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + Level3 + MaxSpeed + true + true + true + true + NOGDI;WIN32;_MBCS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + true + true + Graph_lib.lib;fltk.lib;wsock32.lib;comctl32.lib;fltkjpeg.lib;fltkimages.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + Level3 + MaxSpeed + true + true + true + true + NOGDI;WIN32;_MBCS;%(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + + + true + true + Graph_lib.lib;fltk.lib;wsock32.lib;comctl32.lib;fltkjpeg.lib;fltkimages.lib;;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + /ignore:4099 %(AdditionalOptions) + + + + + + \ No newline at end of file diff --git a/Oving 7/Oving 7/Oving 7.vcxproj.filters b/Oving 7/Oving 7/Oving 7.vcxproj.filters new file mode 100644 index 0000000..066e783 --- /dev/null +++ b/Oving 7/Oving 7/Oving 7.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/Oving 7/Oving 7/main.cpp b/Oving 7/Oving 7/main.cpp new file mode 100644 index 0000000..c39cede --- /dev/null +++ b/Oving 7/Oving 7/main.cpp @@ -0,0 +1,19 @@ +// Example program in TDT4102_Graphics template, from PPP page 415 +#include "Graph.h" +#include "Simple_window.h" +int main() { + using namespace Graph_lib; + cout << "The New \"Hello, Graphical World!\" message\n"; + Point tl{ 100, 100 }; + Simple_window win{ tl, 600, 400, "Canvas" }; + + Polygon poly; + poly.add(Point{ 300, 200 }); + poly.add(Point{ 350, 100 }); + poly.add(Point{ 400, 200 }); + poly.set_color(Color::red); + + win.attach(poly); + win.wait_for_button(); +} + diff --git a/Oving 7/Øving_7(19.feb).pdf b/Oving 7/Øving_7(19.feb).pdf new file mode 100644 index 0000000..4dcd6de Binary files /dev/null and b/Oving 7/Øving_7(19.feb).pdf differ