Changeset: 16 Initial work on rendering sprites to screen

1 files changed, 14 insertions, 6 deletions

diff --git a/source/Ires.cpp b/source/Ires.cpp
index f60fcb7..346e6e6 100644
--- a/source/Ires.cpp
+++ b/source/Ires.cpp
@@ -74,7 +74,15 @@ void IresObject::SetName(std::string name) {
 	}
 }
 
-void IresObject::ShowNullName(EditorInstance& editor, Kind kind) {
+void IresObject::ShowNameSafe(IresObject* ires) {
+	if (ires) {
+		ires->ShowName();
+	} else {
+		ShowNameNull();
+	}
+}
+
+void IresObject::ShowNameNull() {
 	ImGui::Text("<null>");
 }
 
@@ -86,15 +94,15 @@ void IresObject::ShowName() const {
 	}
 }
 
-void IresObject::ShowFullName() const {
-	if (IsAnnoymous()) {
-		ImGui::Text("<annoymous %p> (%lx-%lx)", (void*)this, mUid.upper, mUid.lower);
+void IresObject::ShowReferenceSafe(EditorInstance& editor, IresObject* ires) {
+	if (ires) {
+		ires->ShowReference(editor);
 	} else {
-		ImGui::Text("%s (%lx-%lx)", mName.c_str(), mUid.upper, mUid.lower);
+		ShowReferenceNull(editor);
 	}
 }
 
-void IresObject::ShowNullReference(EditorInstance& editor, Kind kind) {
+void IresObject::ShowReferenceNull(EditorInstance& editor) {
 	ImGui::PushStyleColor(ImGuiCol_Text, ImGui::GetStyle().Colors[ImGuiCol_ButtonHovered]);
 	ImGui::Text("<null>");
 	ImGui::PopStyleColor();