force loop issue fix

Wassimulator · May 20, 2024 · e83798d · e83798d
1 parent 12da0d0
commit e83798d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/include/ui/ui_core.cpp b/include/ui/ui_core.cpp
@@ -148,7 +148,7 @@ inline f32 UI_round_away_from_zero(f32 value) {
 
 static f32 UI_lerp_f32(f32 a, f32 b, f32 t)
 {
-	if (UI_abs(a - b) > 1) G->force_loop = true;
+	if (UI_abs(a - b) > 3) G->force_loop = true;
 	return (a + (b - a) * t);
 }
 

diff --git a/include/wassentials.h b/include/wassentials.h
@@ -184,11 +184,11 @@ Dynarray<String8> w_tokenize(const String8 str)
 
 
 void*walloc(size_t size) {
-	return malloc(size);
-	//return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+	//return malloc(size);
+	return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
 }
 //NOTE (Wassim):  for some reaosn VirtualFree was crashing, need to investigate this later
 void wfree(void* address) {
-	free(address);
-	//VirtualFree(address, 0, MEM_RELEASE);
+	//free(address);
+	VirtualFree(address, 0, MEM_RELEASE);
 }
diff --git a/src/source.cpp b/src/source.cpp
@@ -3018,7 +3018,8 @@ static void update_gui() {
 				{
 					static f32 begin = 0;
 					f32 begin_should = WW / 2.f - thumb_dim / 2.f - G->current_file_index * thumb_dim + 25.f;
-					begin = UI_lerp_f32(begin, begin_should, 0.2);
+					if (WW)
+						begin = UI_lerp_f32(begin, begin_should, 0.2);
 					UI_Block *thumbs_scroll = UI_push_block(ctx);
 					thumbs_scroll->style.position[axis_x] = { UI_Position_t::absolute, f32(begin) };
 					thumbs_scroll->style.layout.axis = axis_x;