Kaynağa Gözat

Merge pull request #1177 from seanpaultaylor/next

Fixes broken LightingSample in sample-browser.
Sean Taylor 12 yıl önce
ebeveyn
işleme
c16da00d0a
2 değiştirilmiş dosya ile 3 ekleme ve 2 silme
  1. 2 1
      install.bat
  2. 1 1
      samples/browser/src/LightSample.cpp

+ 2 - 1
install.bat

@@ -34,11 +34,12 @@ cd %~dp0
 >> temp.cs ECHO         try
 >> temp.cs ECHO         try
 >> temp.cs ECHO         {
 >> temp.cs ECHO         {
 >> temp.cs ECHO             WebClient client = new WebClient();
 >> temp.cs ECHO             WebClient client = new WebClient();
+>> temp.cs ECHO             client.Proxy = null;
 >> temp.cs ECHO             client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressChanged);
 >> temp.cs ECHO             client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(DownloadProgressChanged);
 >> temp.cs ECHO             client.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleted);
 >> temp.cs ECHO             client.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleted);
 >> temp.cs ECHO             Console.Write("Downloading " + url + ": 0%%    ");
 >> temp.cs ECHO             Console.Write("Downloading " + url + ": 0%%    ");
 >> temp.cs ECHO             client.DownloadFileAsync(new Uri(url), file);
 >> temp.cs ECHO             client.DownloadFileAsync(new Uri(url), file);
->> temp.cs ECHO             while (!done) System.Threading.Thread.Sleep(1000);
+>> temp.cs ECHO             while (!done) System.Threading.Thread.Sleep(500);
 >> temp.cs ECHO         }
 >> temp.cs ECHO         }
 >> temp.cs ECHO         catch (Exception x)
 >> temp.cs ECHO         catch (Exception x)
 >> temp.cs ECHO         {
 >> temp.cs ECHO         {

+ 1 - 1
samples/browser/src/LightSample.cpp

@@ -306,7 +306,7 @@ void LightSample::controlEvent(Control* control, EventType evt)
 		break;
 		break;
 	}
 	}
 
 
-	if (changeTechnique)
+	if (_lighting && changeTechnique)
 	{
 	{
 		if (_noLight->isSelected())
 		if (_noLight->isSelected())
 		{
 		{