Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade vr-imgui #64

Merged
merged 6 commits into from
Sep 12, 2022
Merged

Upgrade vr-imgui #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
809d4bc
changes to compile against vr-imgui 2.0
kmilo9999 Aug 1, 2022
bca5256
changes to compile against vr-imgui 2.0
kmilo9999 Aug 1, 2022
1c6a299
changed enum to enum class.
kmilo9999 Aug 10, 2022
7bcba28
merge with remote
kmilo9999 Aug 10, 2022
1172b62
updated code to support new version of vr-imgui
kmilo9999 Aug 10, 2022
a3204f8
Go up on vr-imgui 2.0.1. Fix release build of FTGL
kmilo9999 Sep 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions include/UI/UIView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ class UIView

void set_volume_time_info(time_t time);

void draw_transfer_function_legend();

void set_transfer_function_min_max(float min, float max);

bool get_show_movie_saved_pop_up() const { return m_show_movie_saved_pop_up; }
Expand Down Expand Up @@ -202,7 +200,7 @@ class UIView
bool m_show_menu;
bool m_renderVolume;
std::vector<TransferFunctionMultiChannelWidget> tfn_widget_multi;
std::vector<TransferFunctionWidget> tfn_widget;
std::vector<tfnw::TransferFunctionWidget> tfn_widget;
std::vector<MyTransFerFunctions> m_tfns;
std::vector<std::vector<bool>> m_selected_volume_TrFn;

Expand Down
1 change: 1 addition & 0 deletions include/common/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#ifdef _MSC_VER
#define _CRT_SECURE_NO_WARNINGS
#define NOMINMAX
#include <windows.h>
#define OS_SLASH "\\"
#include "../../external/msvc/dirent.h"
Expand Down
2 changes: 2 additions & 0 deletions libs/UIHelpers/embedded_colormaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma once
namespace tfnw {
uint8_t paraview_cool_warm[] = {
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xb4,0x0,0x0,0x0,0x1,0x8,0x6,0x0,0x0,0x0,0x77,0xca,0x84,0xf4,0x0,0x0,0x1,0x7a,0x49,0x44,0x41,0x54,0x78,0x5e,0x63,0xb4,0xf6,0x39,0xf0,0x9f,0x91,0x89,0x89,0x81,0x91,0x89,0x91,0x81,0x99,0x99,0x99,0x1,0xc4,0x66,0x2,0xd3,0x8,0x3e,0x48,0xe,0x24,0xc6,0x4,0x54,0x83,0x90,0x63,0x62,0x40,0xe8,0x43,0xd6,0xf,0xd2,0x7,0xe4,0x33,0x32,0x42,0xcd,0x64,0x42,0xd0,0x8c,0xc,0x40,0x3b,0x20,0x7c,0x46,0x46,0x90,0x3a,0x98,0x1a,0x20,0xd,0xe5,0x83,0xec,0x60,0x4,0xab,0x43,0x88,0x21,0xf8,0xc,0xc,0x40,0x27,0x30,0x30,0x31,0x33,0x82,0x69,0xa0,0x33,0x19,0xc0,0xe6,0x30,0x31,0x30,0x80,0xd4,0x40,0xe4,0xa0,0x6a,0x98,0x60,0xf4,0x7f,0xb0,0x5a,0xb0,0x19,0x60,0x75,0xff,0x19,0x80,0xda,0x81,0xea,0x81,0x34,0x94,0xf,0x96,0x63,0xfc,0xcf,0xc0,0xc0,0xf0,0xf,0x28,0xf7,0x9f,0x1,0xc2,0xff,0x7,0xa6,0x19,0x19,0xff,0x43,0xc4,0x18,0x80,0xe2,0xc,0x7f,0x11,0x72,0x20,0x3e,0x23,0xc8,0xec,0x7f,0xc,0x4c,0xc,0x10,0x9a,0x11,0x44,0x33,0xfc,0x3,0x9b,0xd,0x67,0x83,0xe5,0x80,0xfa,0xfe,0x3,0xd5,0xfc,0x7,0xd2,0xc,0x50,0xfa,0x3f,0x50,0x1d,0x88,0xfd,0xf,0x2a,0x6,0xa6,0x81,0x62,0xff,0x20,0x6a,0x19,0x19,0x60,0x6c,0xa0,0xdf,0xfe,0xfd,0x61,0x0,0x99,0xc7,0x8,0x94,0x63,0x0,0xe9,0x3,0x9a,0x5,0x67,0x83,0xc4,0xfe,0x41,0xd4,0x32,0x0,0xcd,0x3,0xcb,0x43,0xc5,0x18,0xc0,0xea,0x81,0xfe,0xfa,0xfb,0x7,0x28,0x5,0xa4,0x81,0xea,0xc0,0x62,0xff,0x40,0x6c,0xa0,0x18,0x88,0xfe,0xfb,0x97,0xe1,0x3f,0xd0,0x4c,0x86,0x7f,0x10,0x75,0xff,0xff,0x83,0x68,0xa0,0x18,0x48,0x2d,0x48,0xe,0x24,0xe,0x94,0xff,0xff,0x7,0xa4,0xee,0x3f,0x3,0x88,0x6,0xd9,0xf1,0xf,0xc8,0x7,0x6a,0x4,0x32,0xff,0x81,0xc5,0xfe,0x3,0xd5,0xfd,0xff,0xb,0xd1,0x7,0x92,0x3,0xf3,0x51,0xc4,0xfe,0x41,0xd4,0xfe,0xfd,0xf,0xa1,0x81,0x72,0x20,0x75,0xff,0x80,0x7c,0x98,0xfa,0x7f,0x7f,0x80,0x6a,0xfe,0x82,0xd4,0xfd,0x67,0x0,0xb1,0xff,0x1,0xd9,0xff,0x7e,0xff,0x63,0xf8,0x7,0x52,0xfb,0xfb,0x2f,0x3,0x48,0xed,0x7f,0xa0,0xfa,0xbf,0xbf,0x40,0xea,0xfe,0x33,0xfc,0xfd,0x9,0x14,0xfb,0x3,0xa4,0xbf,0x3,0xf9,0xbf,0x80,0x7a,0x7e,0xfe,0x67,0x0,0x0,0x27,0xf7,0xf2,0xdf,0xa6,0x6f,0xf8,0x80,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
Expand Down Expand Up @@ -35,3 +36,4 @@ uint8_t ice_fire[] = {
uint8_t nic_edge[] = {
0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0xb4,0x0,0x0,0x0,0x1,0x8,0x6,0x0,0x0,0x0,0x77,0xca,0x84,0xf4,0x0,0x0,0x1,0xf7,0x49,0x44,0x41,0x54,0x78,0x5e,0x63,0x34,0x34,0x34,0xfc,0xcf,0xf4,0x9f,0x8d,0x81,0xf9,0x1f,0x3b,0x3,0xcb,0x5f,0x5e,0x6,0x46,0x10,0xfb,0xf,0x90,0x6,0xf2,0x19,0x7f,0xf3,0x31,0x30,0xfc,0x65,0x67,0x60,0xf8,0xc3,0xce,0xf0,0xff,0x7,0x1f,0xc3,0xff,0x9f,0x40,0xfa,0x27,0x37,0x3,0x3,0x23,0x33,0x10,0x73,0x0,0x31,0xb,0x18,0xff,0x67,0xe2,0xc0,0xa0,0xff,0x33,0xb2,0x30,0x80,0x30,0x3,0x17,0x90,0x66,0x65,0x62,0xf8,0xcf,0xe,0xd4,0xc3,0x2,0xa4,0xd9,0x80,0x7c,0x10,0xcd,0xcc,0xc8,0xf0,0x8f,0x15,0xc8,0x66,0x66,0x82,0xd2,0x8c,0xc,0xcc,0xdc,0x8c,0xc,0x8c,0xac,0xc,0xc,0xc,0xac,0x40,0x9a,0x93,0x11,0x48,0x3,0xd9,0x40,0xfa,0x3f,0x50,0xec,0x1f,0x27,0x3,0xc3,0x3f,0x16,0x90,0x1e,0x6,0x86,0x5f,0x40,0x31,0x66,0xd6,0xff,0xc,0x6c,0x9c,0xff,0x19,0x98,0x80,0x72,0x4c,0x40,0x9a,0x11,0xc8,0x7,0x5a,0xc9,0xc0,0xc0,0xf5,0x9f,0xe1,0x3f,0x90,0xfd,0xf,0x28,0xf6,0xf,0x28,0xf7,0x9b,0xf3,0x1f,0x3,0x2b,0x13,0x23,0x10,0x33,0x30,0x70,0x0,0x9d,0xcb,0x2,0x64,0xb3,0x3,0x69,0xa0,0xb5,0xc,0x6c,0x40,0xf3,0x40,0x34,0x8,0xb3,0x2,0xdd,0xc3,0xc4,0x4,0xd4,0xe,0x94,0x67,0x3,0x5a,0xcb,0xd,0x72,0x6,0x3,0x23,0x3,0x88,0xcd,0x9,0xa4,0x41,0xce,0x2,0x3a,0x81,0x81,0x5,0xc8,0x6,0xfa,0x16,0x4c,0x3,0x8d,0x1,0x5a,0x7,0x34,0xff,0xff,0x7f,0x6,0xce,0xff,0x10,0x9a,0x3,0xc8,0x66,0x65,0xf8,0xcf,0xc0,0x2,0xa4,0x39,0x80,0x62,0x10,0xfa,0x3f,0x3,0x33,0x90,0xcf,0xc4,0xf8,0x9d,0x81,0x91,0xf1,0x37,0x3,0x13,0xe3,0xf,0x30,0xcd,0xc8,0xf0,0x87,0x81,0x91,0x9,0x28,0xc6,0xf0,0x1b,0x4a,0x43,0xf8,0xc,0x40,0x3e,0x30,0xd0,0x81,0xa6,0x7c,0x67,0x80,0xb0,0xbf,0x3,0xd9,0xbf,0x81,0x6c,0x18,0xfd,0x1b,0xc8,0xff,0x6,0xe4,0xff,0x2,0xd2,0x5f,0x81,0x1,0xf3,0xf,0xa8,0xc,0xc8,0xfe,0xf7,0x17,0xc8,0x6,0xe2,0x3f,0xbf,0x80,0xf1,0x6,0xa1,0xff,0x83,0xc4,0xfe,0xfc,0x4,0xf3,0xff,0xff,0x3,0x9a,0xff,0x13,0x88,0xff,0x0,0xa3,0xeb,0xfb,0x7f,0x6,0xa0,0x53,0x18,0x18,0xa1,0x34,0xc8,0x4a,0x10,0x1b,0x4c,0x7f,0xfb,0xf,0xb5,0x96,0x91,0xe1,0x3f,0x50,0x2d,0xc3,0x1f,0x20,0xfd,0x3,0x18,0x1f,0xbf,0x91,0xe8,0x6f,0x40,0xf6,0x6f,0x88,0xf3,0xfe,0x7f,0x5,0xb2,0x81,0x56,0xfe,0xf9,0xd,0x8c,0xdf,0xbf,0x40,0x5f,0x1,0x69,0xb0,0x53,0xfe,0x1,0xd9,0xbf,0x80,0xf1,0xb,0x34,0xe3,0xf,0x8c,0x6,0xea,0xfb,0xf7,0xb,0xe4,0x73,0x6,0x86,0x1f,0x20,0x79,0xa0,0x55,0xdf,0xa1,0xf4,0x8f,0xff,0x40,0xf1,0xff,0x20,0x9f,0x3,0xe5,0x40,0x34,0x90,0xf,0x74,0x1e,0xc3,0x2f,0xde,0xff,0xc,0x9f,0xf9,0xfe,0x31,0xfc,0x64,0xf9,0xcf,0xf0,0x13,0x98,0x8c,0x3e,0xb3,0x2,0xd9,0x4c,0x40,0x31,0x66,0x20,0x9f,0xf1,0x3f,0xc3,0x27,0xc6,0x7f,0xc,0x20,0xe7,0xfd,0x64,0xf8,0xcf,0x0,0x0,0xd4,0xca,0xd9,0x94,0x17,0xc3,0x0,0xd6,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
}
2 changes: 1 addition & 1 deletion libs/UIHelpers/transfer_function_multichannel_widget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class TransferFunctionMultiChannelWidget {
TransferFunctionMultiChannelWidget();

// Add a colormap preset. The image should be a 1D RGBA8 image
void add_colormap(const Colormap &map);
void add_colormap(const tfnw::Colormap &map);

// Add the transfer function UI into the currently active window
void draw_ui();
Expand Down
Loading