optimize imgs a little bit

ADVect/ADVect.cpp

@@ -127,7 +127,7 @@ namespace {
 		void check() { anim.check(); }
 		void change(const NVL::Environment::MarkupString& n, u16 speed) {
 			current = n;
-			anim.kickoff(speed * n.length(), [n](NVL::Number x) { return static_cast<size_t>(x * n.length()); });
+			anim.kickoff(speed * n.length(), [this](NVL::Number x) { return static_cast<size_t>(x * this->current.length()); });
 		}
 		void draw() {
 			if (anim.done)

ADVect/Graphics.cpp

@@ -253,14 +253,14 @@ namespace ADVect::Graphics {
 
 	ImageTexture* GetImageTextureFromFile(const std::string& file) {
 		if (imgs.find(file) == imgs.end()) {
-			ImageTexture img;
 			if (auto i = get_image_texture(file)) {
-				img = *i;
+				imgs[file] = std::move(*i);
-				imgs[file] = std::move(img);
 				return &imgs[file];
 			}
+			else return nullptr;
 		}
-		return nullptr;
+		else
+			return &imgs[file];
 	}
 
 	void DrawTextureStencilAlpha(const bgfx::TextureHandle& tex, i32 pos_x, i32 pos_y, u32 w, u32 h) {

CMakeSettings.json

@@ -4,7 +4,7 @@
       "name": "x64-Debug",
       "generator": "Ninja",
       "configurationType": "Debug",
-      "inheritEnvironments": [ "msvc_x64" ],
+      "inheritEnvironments": [ "clang_cl_x64" ],
       "buildRoot": "${projectDir}\\out\\build\\${name}",
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",

NVL/Environment.cpp

@@ -113,11 +113,15 @@ namespace NVL::Environment {
 		return ms;
 	}
 
-	size_t MarkupString::length() const {
+	size_t MarkupString::length() const { // you do realize this memoization fails if we change the var
-		size_t r = 0;
+		if (mem_length == -1) {
-		for (const auto& s : segments) 
+			size_t r = 0;
-			r += s.str.length();
+			for (const auto& s : segments)
-		return r;
+				r += s.str.length();
+			return r;
+		}
+		else
+			return mem_length;
 	}
 
 	MarkupString MarkupString::substr(size_t i) const {

NVL/Environment.h

@@ -44,6 +44,9 @@ namespace NVL::Environment {
 		std::vector<std::pair<String, std::vector<String>>> efs;
 	};
 	struct MarkupString {
+	private:
+		mutable i32 mem_length = -1;
+	public:
 		std::vector<MarkupSegment> segments{};
 		size_t length() const;
 		MarkupString substr(size_t idx) const;

NVL/dialogue.nvl

@@ -1,57 +1,19 @@
 BEGIN Scene1
 
+Show BG "image3.png"
 Show BGDialogue "grad.png"
 
 <<-
 *!Show Avatar "mmaker.png"
 [MMaker]
-*!Show BG "googleplex/1.png"
+
-Park your car in a place that allows you to walk on the sidewalk.
-*!Show BG "googleplex/2.jpg"
-Wait until everyone is asleep.
-*!Show BG "googleplex/3.jpg"
-Sneak into the building and head towards the front door.
-*!Show BG "googleplex/4.png"
-Go through the security gate and walk around the perimeter of the grounds.
-*!Show BG "googleplex/5.jpg"
-Enter the building using the main entrance.
-*!Show BG "googleplex/6.jpg"
-Walk to the elevator and take it up to the sixth floor.
-*!Show BG "googleplex/7.png"
-Enter the stairwell leading to the roof and climb all the way to the top.
-*!Show BG "googleplex/8.jpg"
-Break open the skylight and enter the room containing the Google logo.
-*!Show BG "googleplex/9.jpg"
-Find the main server room.
-*!Show BG "googleplex/10.jpg"
-Kill the power to the server room.
-*!Show BG "googleplex/11.jpg"
-Search the room for a computer with a USB port.
-*!Show BG "googleplex/12.jpg"
-Plug the USB cable into the computer.
-*!Show BG "googleplex/13.jpg"
-Start typing in the password for the administrator account.
-*!Show BG "googleplex/14.png"
-After the login screen comes up, type in the password "G00gle."
-*!Show BG "googleplex/15.png"
-When the system reboots, you will see a prompt asking you to install a new program.
-Type "Y" and press ENTER.
-*!Show BG "googleplex/16.jpg"
-The Google search engine will come up. Type in "www.yahoo.com" and hit ENTER.
-*!Show BG "googleplex/17.png"
-A window will appear saying "You have successfully installed Google Chrome." Click OK.
-*!Show BG "googleplex/18.jpg"
-A new browser will open. Log in to your Yahoo mail account.
-*!Show BG "image3.png"
-Go to your inbox and click on the link to download the latest version of Google Chrome.
-*!Show BG "googleplex/20.jpg"
 Install the update.
 
 *! Show BG "image2.jpg"
 
 Commencing JS hypnosis...
 
-*! Show BG "image.png"
+*! Show BG "image3.png"
 
 *!Show Avatar "terrio.png"
 [Terrio]