diff --git a/Resources/Input/Older Work/MindMap.md b/Resources/Input/Older Work/MindMap.md index 1ac2b4c..029d9b2 100644 --- a/Resources/Input/Older Work/MindMap.md +++ b/Resources/Input/Older Work/MindMap.md @@ -1,16 +1,31 @@ # Mind Map Maker -## What it is -This project was completed as a large percentage of my final A-level computer science grade. Every student had to choose a language or development framework and create a program for a client, whilst most students chose to -create video games for their siblings, I chose to create mind map software as my sister was soon to start her GCSEs and was struggling to revise. The software had to run on a £70 laptop and allow for files to be transfered between -copies of the software. I also aimed to create an intuitive and relatively unrestrictive system as my sister was an art student and had little experience with digital design software. +This project was completed for my computer science A-level. Students had to find a client and create a program for them, I chose my sister and created software to help her revise for her GCSE's. +The software had to: +- run on her £70 laptop +- allow for files to be transfered between devices +- allow actions to be undone and redone +- be generic enough to work for any subject + +At the time I was finding myself really interested in intuitive UI design so I also aimed to create a simple and unrestrictive system that I felt was easy to learn and use. Though I found I had to cut a lot of it for time constraints. + +We were given 24 hours spread over 2 months to create the program and were allowed to choose our own langauges and frameworks. +I chose to write the sofware in Unity as I wanted to learn a new engine and knew that unitys use of scenegraphs +would let me avoud calculating the scaling and positioning of mind map components. + +As one of the software requirements was to run on very low end computers I also had to ensure I was creating scripts that would run as efficiently as possible when compiled, so I ended up +finding myself weighing up the strengths and weaknesses of different libraries, often choosing ones with drawbacks in favour of their lower usage of memory. + +## The outcome - -## What I did -I independently created this program over the course of 24 hours spread over 2 months. I chose to write the sofware in Unity as I wanted to learn a new engine and knew that unitys use of scenegraphs -would make the process of development alot faster as I wouldn't have to calculate scales and positions of mind map components as unity would do this all in the background, allowing me to focus on the larger aspects of the project.

-As one of the software requirements was to run on very low end computers I also had to ensure I was creating scripts that would run as efficiently as possible when compiled, this regularly meant having to -weigh up the strengths and weaknesses of different libraries, often choosing ones with drawbacks in favour of their lower usage of memory. +The final system had a number of features: +- Fully working undo/redo system +- The ability to create and link text bubbles +- The ability to import images +- A drawing tool, along with options to optimise lines for slower pcs +- A save and load system +- A settings panel +- The ability to navigate and magnify the mindmap diff --git a/Resources/Input/University/RoboticsSociety.md b/Resources/Input/University/RoboticsSociety.md index a609f7d..ff1160d 100644 --- a/Resources/Input/University/RoboticsSociety.md +++ b/Resources/Input/University/RoboticsSociety.md @@ -5,3 +5,8 @@ The Aber Robotics Society is a small society of friends at my university who mee While there I have learnt most of my knowledge of robotics and electronics and worked on a number of projects including a basic two wheeled remote control robot (my first project where I learnt the basics of electronics), a program that takes photos of people, converts the images to lines and g-code and sends them to a CNC machine that draws the images and a watering system for plants I keep at my house. During my second year I have gained the role of quatermaster which leaves me in charge of the robotics cupboard where all of the societies older projects are left. I took the role hoping to archive the projects and build wikis for each project, encouraging members to document their work better for later members to come back to though this somewhat took a back seat as the president developed an amazing system that logs the owners of projects and peoples permissions for the projects using qr-codes and additionally we began to share more of our cupboard and its stored resources with additional societies. + +## Projects +This site documents a few different projects I've worked on whilst at the society, including: +- [CNSelfie](/CNCMachine.html) +- thats it diff --git a/Resources/Input/index.md b/Resources/Input/index.md index 1d1cc57..7343178 100644 --- a/Resources/Input/index.md +++ b/Resources/Input/index.md @@ -16,9 +16,9 @@ On the side of this I also enjoy using code to create music through programming I've previously had interests in VR and XR and UI design, spending a lot of my secondary school years experimenting with both concepts so both websites also have a few probjects relating to those concepts. ________ If you want a basic outline of my work, here are a few interesting projects: -- [something]() -- [something]() -- [something]() +- [My Work at Skipton Building Society](/SBSWork.html) +- [My Work running AberCompSoc](/aberComSoc.html) +- [AardvarkXR](/Aardvark.html) To see all of my work, check the navbox to the side. diff --git a/Resources/Output/Aardvark.html b/Resources/Output/Aardvark.html index 8feb0ed..b3d5839 100644 --- a/Resources/Output/Aardvark.html +++ b/Resources/Output/Aardvark.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • diff --git a/Resources/Output/CatTowerDefence.html b/Resources/Output/CatTowerDefence.html index c4a9dcc..7a530de 100644 --- a/Resources/Output/CatTowerDefence.html +++ b/Resources/Output/CatTowerDefence.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • diff --git a/Resources/Output/EPQProject.html b/Resources/Output/EPQProject.html index f82f91c..ce6c6aa 100644 --- a/Resources/Output/EPQProject.html +++ b/Resources/Output/EPQProject.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • diff --git a/Resources/Output/MindMap.html b/Resources/Output/MindMap.html index fa62f0d..51aafb5 100644 --- a/Resources/Output/MindMap.html +++ b/Resources/Output/MindMap.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • @@ -42,16 +43,32 @@

    Mind Map Maker

    -

    What it is

    -

    This project was completed as a large percentage of my final A-level computer science grade. Every student had to choose a language or development framework and create a program for a client, whilst most students chose to -create video games for their siblings, I chose to create mind map software as my sister was soon to start her GCSEs and was struggling to revise. The software had to run on a £70 laptop and allow for files to be transfered between -copies of the software. I also aimed to create an intuitive and relatively unrestrictive system as my sister was an art student and had little experience with digital design software.

    +

    This project was completed for my computer science A-level. Students had to find a client and create a program for them, I chose my sister and created software to help her revise for her GCSE's. +The software had to:

    + +

    At the time I was finding myself really interested in intuitive UI design so I also aimed to create a simple and unrestrictive system that I felt was easy to learn and use. Though I found I had to cut a lot of it for time constraints.

    +

    We were given 24 hours spread over 2 months to create the program and were allowed to choose our own langauges and frameworks. +I chose to write the sofware in Unity as I wanted to learn a new engine and knew that unitys use of scenegraphs +would let me avoud calculating the scaling and positioning of mind map components.

    +

    As one of the software requirements was to run on very low end computers I also had to ensure I was creating scripts that would run as efficiently as possible when compiled, so I ended up +finding myself weighing up the strengths and weaknesses of different libraries, often choosing ones with drawbacks in favour of their lower usage of memory.

    +

    The outcome

    -

    What I did

    -

    I independently created this program over the course of 24 hours spread over 2 months. I chose to write the sofware in Unity as I wanted to learn a new engine and knew that unitys use of scenegraphs -would make the process of development alot faster as I wouldn't have to calculate scales and positions of mind map components as unity would do this all in the background, allowing me to focus on the larger aspects of the project.

    -As one of the software requirements was to run on very low end computers I also had to ensure I was creating scripts that would run as efficiently as possible when compiled, this regularly meant having to -weigh up the strengths and weaknesses of different libraries, often choosing ones with drawbacks in favour of their lower usage of memory.

    +

    The final system had a number of features:

    +
    diff --git a/Resources/Output/SBSWork.html b/Resources/Output/SBSWork.html index 3856204..c3c501a 100644 --- a/Resources/Output/SBSWork.html +++ b/Resources/Output/SBSWork.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • diff --git a/Resources/Output/TestFullArticle.html b/Resources/Output/TestFullArticle.html index 76aa107..cb6c3b7 100644 --- a/Resources/Output/TestFullArticle.html +++ b/Resources/Output/TestFullArticle.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • diff --git a/Resources/Output/index.html b/Resources/Output/index.html index 73a2b63..f0a89f1 100644 --- a/Resources/Output/index.html +++ b/Resources/Output/index.html @@ -17,6 +17,7 @@
  • Welcome!
  • Newer Work

    +
  • CNSelfie
  • This Site
  • @@ -53,9 +54,9 @@

    If you want a basic outline of my work, here are a few interesting projects:

    To see all of my work, check the navbox to the side.

    <-

    diff --git a/Resources/Static/CNSelfie.mp4 b/Resources/Static/CNSelfie.mp4 new file mode 100644 index 0000000..1a554a6 Binary files /dev/null and b/Resources/Static/CNSelfie.mp4 differ diff --git a/Resources/Static/CNSelfie1.jpg b/Resources/Static/CNSelfie1.jpg new file mode 100644 index 0000000..2c6c5f2 Binary files /dev/null and b/Resources/Static/CNSelfie1.jpg differ diff --git a/Resources/Static/CNSelfie2.jpg b/Resources/Static/CNSelfie2.jpg new file mode 100644 index 0000000..6c44c12 Binary files /dev/null and b/Resources/Static/CNSelfie2.jpg differ diff --git a/Resources/Static/VID_20230322_1425202.mp4 b/Resources/Static/VID_20230322_1425202.mp4 new file mode 100644 index 0000000..61a7837 Binary files /dev/null and b/Resources/Static/VID_20230322_1425202.mp4 differ diff --git a/Resources/Static/VID_20230322_154627.mp4 b/Resources/Static/VID_20230322_154627.mp4 new file mode 100644 index 0000000..784d4f9 Binary files /dev/null and b/Resources/Static/VID_20230322_154627.mp4 differ diff --git a/Resources/Static/VID_20230322_164744.mp4 b/Resources/Static/VID_20230322_164744.mp4 new file mode 100644 index 0000000..4b7f25a Binary files /dev/null and b/Resources/Static/VID_20230322_164744.mp4 differ diff --git a/Src/BlogPageBuilder.cpp b/Src/BlogPageBuilder.cpp index 80d4af0..f272746 100644 --- a/Src/BlogPageBuilder.cpp +++ b/Src/BlogPageBuilder.cpp @@ -105,6 +105,8 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s { for (Page* page : pages) { + if (page->getPageFlags().alwaysHidden) + continue; if (page->getPageFlags().hidden && isOptionEnabled(OptionFlags::HIDE_PRIVATE)) continue; diff --git a/Src/Page.cpp b/Src/Page.cpp index df7c1ff..f12606e 100644 --- a/Src/Page.cpp +++ b/Src/Page.cpp @@ -129,6 +129,9 @@ FileFlags FlagReader::readFlags(std::string flagString) case 'p': flags.hidden = true; break; + case 'P': + flags.alwaysHidden = true; + break; } } diff --git a/Src/Page.h b/Src/Page.h index 7d4bee2..41024e9 100644 --- a/Src/Page.h +++ b/Src/Page.h @@ -11,7 +11,8 @@ struct FileFlags { - bool hidden; + bool hidden; // removes page from navbar when hidePages option is set + bool alwaysHidden; // page will never be added to navbar, good for files you want to keep but only link to }; class FlagReader diff --git a/Src/blog.cpp b/Src/blog.cpp index 8b23845..45e1bc8 100644 --- a/Src/blog.cpp +++ b/Src/blog.cpp @@ -55,6 +55,7 @@ void copyFolderAndContents(std::string inUrl, std::string outUrl) /* * -in="" // give source folder * -out="" // give output folder + * -static="" // give static resources folder (images and things to copy across to output folder go in here) * -hide // hides private posts */ int main(int argc, char* argv[]) @@ -63,8 +64,12 @@ int main(int argc, char* argv[]) if (source == "") source = SOURCE_FILE_FOLDER; std::string output = getArgValue(argc, argv, "-out="); - if (output == "") - output = OUTPUT_FILE_FOLDER; + if (output == "") + output = OUTPUT_FILE_FOLDER; + std::string stat = getArgValue(argc, argv, "-static="); + if (stat == "") + stat = STATIC_RESOURCES_FOLDER; + int flags = OptionFlags::NONE; if (doesArgExist(argc, argv, "-hide")) flags |= OptionFlags::HIDE_PRIVATE; @@ -74,7 +79,7 @@ int main(int argc, char* argv[]) builder->buildAllPages(); // pre-written pages and resources i.e. images - copyFolderAndContents(STATIC_RESOURCES_FOLDER, output); + copyFolderAndContents(stat, output); }