lot of refactor, things are sort of working but not everything yet

2019-06-30 15:12:19 +01:00
parent 011d66e676
commit 7e514bdf56
46 changed files with 664 additions and 918 deletions
@@ -1483,9 +1483,9 @@ void EditorComponent::Render() const
 	__super::Render();

 }
-void EditorComponent::Compose() const
+void EditorComponent::Compose(GRAPHICSTHREAD threadID) const
 {
-	renderPath->Compose();
+	renderPath->Compose(threadID);

 	if (cinemaModeCheckBox->GetCheck())
 	{
@@ -1529,16 +1529,16 @@ void EditorComponent::Compose() const
 			switch (light.GetType())
 			{
 			case LightComponent::POINT:
-				wiImage::Draw(&pointLightTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+				wiImage::Draw(&pointLightTex, fx, threadID);
 				break;
 			case LightComponent::SPOT:
-				wiImage::Draw(&spotLightTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+				wiImage::Draw(&spotLightTex, fx, threadID);
 				break;
 			case LightComponent::DIRECTIONAL:
-				wiImage::Draw(&dirLightTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+				wiImage::Draw(&dirLightTex, fx, threadID);
 				break;
 			default:
-				wiImage::Draw(&areaLightTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+				wiImage::Draw(&areaLightTex, fx, threadID);
 				break;
 			}
 		}
@@ -1575,7 +1575,7 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&decalTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&decalTex, fx, threadID);

 		}
 	}
@@ -1610,7 +1610,7 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&forceFieldTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&forceFieldTex, fx, threadID);
 		}
 	}

@@ -1645,7 +1645,7 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&cameraTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&cameraTex, fx, threadID);
 		}
 	}

@@ -1679,7 +1679,7 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&armatureTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&armatureTex, fx, threadID);
 		}
 	}

@@ -1713,7 +1713,7 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&emitterTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&emitterTex, fx, threadID);
 		}
 	}

@@ -1747,17 +1747,17 @@ void EditorComponent::Compose() const
 			}


-			wiImage::Draw(&hairTex, fx, GRAPHICSTHREAD_IMMEDIATE);
+			wiImage::Draw(&hairTex, fx, threadID);
 		}
 	}


 	if (!selected.empty() && translator.enabled)
 	{
-		translator.Draw(camera, GRAPHICSTHREAD_IMMEDIATE);
+		translator.Draw(camera, threadID);
 	}

-	__super::Compose();
+	__super::Compose(threadID);
 }
 void EditorComponent::Unload()
 {