Browse Source

Merge branch 'master' of github.com:bkaradzic/bgfx

Branimir Karadžić 8 years ago
parent
commit
9675639187
2 changed files with 7 additions and 3 deletions
  1. 6 2
      examples/36-sky/sky.cpp
  2. 1 1
      examples/common/example-glue.cpp

+ 6 - 2
examples/36-sky/sky.cpp

@@ -33,13 +33,17 @@
  * is used for the sky. Additionally, the second part is modulated by a
  * is used for the sky. Additionally, the second part is modulated by a
  * lightmap to achieve ambient occlusion effect.
  * lightmap to achieve ambient occlusion effect.
  *
  *
- *
  * References
  * References
  * ==========
  * ==========
+ *
  * [1] R. Perez, R. Seals, and J. Michalsky."An All-Weather Model for Sky Luminance Distribution".
  * [1] R. Perez, R. Seals, and J. Michalsky."An All-Weather Model for Sky Luminance Distribution".
  *     Solar Energy, Volume 50, Number 3 (March 1993), pp. 235–245.
  *     Solar Energy, Volume 50, Number 3 (March 1993), pp. 235–245.
+ *
  * [2] A. J. Preetham, Peter Shirley, and Brian Smits. "A Practical Analytic Model for Daylight",
  * [2] A. J. Preetham, Peter Shirley, and Brian Smits. "A Practical Analytic Model for Daylight",
- *     Proceedings of the 26th Annual Conference on Computer Graphics and Interactive Techniques, 1999, pp. 91–100.
+ *     Proceedings of the 26th Annual Conference on Computer Graphics and Interactive Techniques,
+ *     1999, pp. 91–100.
+ *     https://www.cs.utah.edu/~shirley/papers/sunsky/sunsky.pdf
+ *
  * [3] E. Lengyel, Game Engine Gems, Volume One. Jones & Bartlett Learning, 2010. pp. 219 - 234
  * [3] E. Lengyel, Game Engine Gems, Volume One. Jones & Bartlett Learning, 2010. pp. 219 - 234
  *
  *
  */
  */

+ 1 - 1
examples/common/example-glue.cpp

@@ -19,9 +19,9 @@ void showExampleDialog(entry::AppI* _app, const char* _errorText)
 		  ImVec2(10.0f, 50.0f)
 		  ImVec2(10.0f, 50.0f)
 		, ImGuiSetCond_FirstUseEver
 		, ImGuiSetCond_FirstUseEver
 		);
 		);
+	ImGui::SetNextWindowSize(ImVec2(256.0f, 200.0f));
 	ImGui::Begin(temp
 	ImGui::Begin(temp
 		, NULL
 		, NULL
-		, ImVec2(256.0f, 200.0f)
 		, ImGuiWindowFlags_AlwaysAutoResize
 		, ImGuiWindowFlags_AlwaysAutoResize
 		);
 		);