浏览代码

scene: fix light object usage in various demos and example programs.

undefined
Sam Hocevar 12 年前
父节点
当前提交
ca87acd033
共有 4 个文件被更改,包括 14 次插入6 次删除
  1. +4
    -2
      demos/tutorial/05_easymesh.cpp
  2. +2
    -0
      src/light.h
  3. +4
    -2
      test/btphystest.cpp
  4. +4
    -2
      test/nacl_phystest.cpp

+ 4
- 2
demos/tutorial/05_easymesh.cpp 查看文件

@@ -55,14 +55,16 @@ public:


/* Add a white directional light */ /* Add a white directional light */
m_light1 = new Light(); m_light1 = new Light();
m_light1->SetPosition(vec4(0.2f, 0.2f, 0.f, 0.f));
m_light1->SetPosition(vec3(0.2f, 0.2f, 0.f));
m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f)); m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f));
m_light1->SetType(LightType::Directional);
Ticker::Ref(m_light1); Ticker::Ref(m_light1);


/* Add an orangeish point light */ /* Add an orangeish point light */
m_light2 = new Light(); m_light2 = new Light();
m_light2->SetPosition(vec4(-15.f, 15.f, 15.f, 1.f));
m_light2->SetPosition(vec3(-15.f, 15.f, 15.f));
m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f)); m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f));
m_light2->SetType(LightType::Point);
Ticker::Ref(m_light2); Ticker::Ref(m_light2);


m_ready = false; m_ready = false;


+ 2
- 0
src/light.h 查看文件

@@ -16,6 +16,8 @@
#if !defined __LIGHT_H__ #if !defined __LIGHT_H__
#define __LIGHT_H__ #define __LIGHT_H__


#include <cfloat> /* for FLT_MAX */

#include "worldentity.h" #include "worldentity.h"


namespace lol namespace lol


+ 4
- 2
test/btphystest.cpp 查看文件

@@ -113,14 +113,16 @@ void BtPhysTest::InitApp()


/* Add a white directional light */ /* Add a white directional light */
m_light1 = new Light(); m_light1 = new Light();
m_light1->SetPosition(vec4(0.2f, 0.2f, 0.f, 0.f));
m_light1->SetPosition(vec3(0.2f, 0.2f, 0.f));
m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f)); m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f));
m_light1->SetType(LightType::Directional);
Ticker::Ref(m_light1); Ticker::Ref(m_light1);


/* Add an orangeish point light */ /* Add an orangeish point light */
m_light2 = new Light(); m_light2 = new Light();
m_light2->SetPosition(vec4(-15.f, 15.f, 15.f, 1.f));
m_light2->SetPosition(vec3(-15.f, 15.f, 15.f));
m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f)); m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f));
m_light2->SetType(LightType::Point);
Ticker::Ref(m_light2); Ticker::Ref(m_light2);


float offset = 29.5f; float offset = 29.5f;


+ 4
- 2
test/nacl_phystest.cpp 查看文件

@@ -59,14 +59,16 @@ Nacl_PhysTest::Nacl_PhysTest(bool editor)


/* Add a white directional light */ /* Add a white directional light */
m_light1 = new Light(); m_light1 = new Light();
m_light1->SetPosition(vec4(0.2f, 0.2f, 0.f, 0.f));
m_light1->SetPosition(vec3(0.2f, 0.2f, 0.f));
m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f)); m_light1->SetColor(vec4(0.5f, 0.5f, 0.5f, 1.f));
m_light1->SetType(LightType::Directional);
Ticker::Ref(m_light1); Ticker::Ref(m_light1);


/* Add an orangeish point light */ /* Add an orangeish point light */
m_light2 = new Light(); m_light2 = new Light();
m_light2->SetPosition(vec4(-15.f, 15.f, 15.f, 1.f));
m_light2->SetPosition(vec3(-15.f, 15.f, 15.f));
m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f)); m_light2->SetColor(vec4(0.4f, 0.3f, 0.2f, 1.f));
m_light2->SetType(LightType::Point);
Ticker::Ref(m_light2); Ticker::Ref(m_light2);
} }




正在加载...
取消
保存