浏览代码

*** empty log message ***

Joe Shochet 25 年之前
父节点
当前提交
6ffb061806
共有 1 个文件被更改,包括 9 次插入1 次删除
  1. 9 1
      direct/src/showbase/showBase.cxx

+ 9 - 1
direct/src/showbase/showBase.cxx

@@ -42,6 +42,10 @@ ConfigureFn(config_showbase) {
 
 
 static CollisionTraverser *collision_traverser = NULL;
 static CollisionTraverser *collision_traverser = NULL;
 
 
+// Default channel config
+std::string chan_config = "single";
+std::string window_title = "Panda3D";
+
 void render_frame(GraphicsPipe *pipe,
 void render_frame(GraphicsPipe *pipe,
 		  NodeAttributes &initial_state) {
 		  NodeAttributes &initial_state) {
   int num_windows = pipe->get_num_windows();
   int num_windows = pipe->get_num_windows();
@@ -140,7 +144,11 @@ PT(GraphicsWindow) make_graphics_window(GraphicsPipe *pipe,
   override.setField(ChanCfgOverrides::Mask,
   override.setField(ChanCfgOverrides::Mask,
 		    ((unsigned int)(W_DOUBLE|W_DEPTH|W_MULTISAMPLE)));
 		    ((unsigned int)(W_DOUBLE|W_DEPTH|W_MULTISAMPLE)));
 
 
-  main_win = ChanConfig(pipe, "single", camera, render, override);
+  std::string title = config_showbase.GetString("window-title", window_title);
+  override.setField(ChanCfgOverrides::Title, title);
+
+  std::string conf = config_showbase.GetString("chan-config", chan_config);
+  main_win = ChanConfig(pipe, conf, camera, render, override);
   assert(main_win != (GraphicsWindow*)0L);
   assert(main_win != (GraphicsWindow*)0L);
 
 
   DisplayCallback *dcb = new DisplayCallback(pipe, render, &initial_state);
   DisplayCallback *dcb = new DisplayCallback(pipe, render, &initial_state);