Removed Random lights,
This commit is contained in:
OusmBlueNinja
parent
aae7de1e83
commit
472937d08d
48
imgui.ini
48
imgui.ini
@ -10,24 +10,24 @@ Collapsed=1
|
||||
|
||||
[Window][WindowOverViewport_11111111]
|
||||
Pos=0,19
|
||||
Size=1280,701
|
||||
Size=1920,1158
|
||||
Collapsed=0
|
||||
|
||||
[Window][Inspector]
|
||||
Pos=0,398
|
||||
Size=385,322
|
||||
Pos=0,644
|
||||
Size=385,533
|
||||
Collapsed=0
|
||||
DockId=0x0000000A,0
|
||||
|
||||
[Window][Scene Tree]
|
||||
Pos=0,19
|
||||
Size=385,377
|
||||
Size=385,623
|
||||
Collapsed=0
|
||||
DockId=0x00000009,0
|
||||
|
||||
[Window][Viewport]
|
||||
Pos=387,19
|
||||
Size=893,205
|
||||
Size=1533,453
|
||||
Collapsed=0
|
||||
DockId=0x00000007,0
|
||||
|
||||
@ -36,16 +36,16 @@ Size=1280,19
|
||||
Collapsed=0
|
||||
|
||||
[Window][Performance Info]
|
||||
Pos=1136,226
|
||||
Size=144,313
|
||||
Pos=1672,474
|
||||
Size=248,522
|
||||
Collapsed=0
|
||||
DockId=0x00000003,0
|
||||
|
||||
[Window][Console]
|
||||
Pos=387,688
|
||||
Size=747,32
|
||||
Pos=387,474
|
||||
Size=1283,703
|
||||
Collapsed=0
|
||||
DockId=0x0000000C,0
|
||||
DockId=0x00000005,1
|
||||
|
||||
[Window][Tilemap Editor]
|
||||
Pos=265,19
|
||||
@ -54,47 +54,45 @@ Collapsed=0
|
||||
DockId=0x00000007,1
|
||||
|
||||
[Window][Profiler]
|
||||
Pos=387,226
|
||||
Size=747,460
|
||||
Pos=387,474
|
||||
Size=1283,703
|
||||
Collapsed=0
|
||||
DockId=0x0000000B,0
|
||||
DockId=0x00000005,0
|
||||
|
||||
[Window][Profiler Timeline]
|
||||
Pos=265,69
|
||||
Size=623,651
|
||||
Collapsed=0
|
||||
DockId=0x0000000B,1
|
||||
DockId=0x00000005,1
|
||||
|
||||
[Window][Profiler (Unity Style)]
|
||||
Pos=265,430
|
||||
Size=623,290
|
||||
Collapsed=0
|
||||
DockId=0x0000000B,1
|
||||
DockId=0x00000005,1
|
||||
|
||||
[Window][Profiler Timeline View]
|
||||
Pos=265,526
|
||||
Size=1263,651
|
||||
Collapsed=0
|
||||
DockId=0x0000000B,1
|
||||
DockId=0x00000005,1
|
||||
|
||||
[Window][Color Correction]
|
||||
Pos=1136,541
|
||||
Size=144,179
|
||||
Pos=1672,998
|
||||
Size=248,179
|
||||
Collapsed=0
|
||||
DockId=0x00000004,0
|
||||
|
||||
[Docking][Data]
|
||||
DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1280,701 Split=X
|
||||
DockSpace ID=0x11111111 Window=0x1BBC0F80 Pos=0,19 Size=1920,1158 Split=X
|
||||
DockNode ID=0x00000001 Parent=0x11111111 SizeRef=385,701 Split=Y Selected=0x12EF0F59
|
||||
DockNode ID=0x00000009 Parent=0x00000001 SizeRef=385,623 HiddenTabBar=1 Selected=0x12EF0F59
|
||||
DockNode ID=0x0000000A Parent=0x00000001 SizeRef=385,533 HiddenTabBar=1 Selected=0x36DC96AB
|
||||
DockNode ID=0x00000002 Parent=0x11111111 SizeRef=1533,701 Split=Y Selected=0xC450F867
|
||||
DockNode ID=0x00000007 Parent=0x00000002 SizeRef=606,662 CentralNode=1 HiddenTabBar=1 Selected=0xC450F867
|
||||
DockNode ID=0x00000008 Parent=0x00000002 SizeRef=606,494 Split=X Selected=0x9B5D3198
|
||||
DockNode ID=0x00000005 Parent=0x00000008 SizeRef=1283,481 Split=Y Selected=0x9B5D3198
|
||||
DockNode ID=0x0000000B Parent=0x00000005 SizeRef=1336,460 Selected=0x9B5D3198
|
||||
DockNode ID=0x0000000C Parent=0x00000005 SizeRef=1336,32 Selected=0xEA83D666
|
||||
DockNode ID=0x00000007 Parent=0x00000002 SizeRef=606,453 CentralNode=1 HiddenTabBar=1 Selected=0xC450F867
|
||||
DockNode ID=0x00000008 Parent=0x00000002 SizeRef=606,703 Split=X Selected=0x9B5D3198
|
||||
DockNode ID=0x00000005 Parent=0x00000008 SizeRef=1283,481 Selected=0xEA83D666
|
||||
DockNode ID=0x00000006 Parent=0x00000008 SizeRef=248,481 Split=Y Selected=0x3FC1A724
|
||||
DockNode ID=0x00000003 Parent=0x00000006 SizeRef=226,313 Selected=0x3FC1A724
|
||||
DockNode ID=0x00000003 Parent=0x00000006 SizeRef=226,522 Selected=0x3FC1A724
|
||||
DockNode ID=0x00000004 Parent=0x00000006 SizeRef=226,179 HiddenTabBar=1 Selected=0xA873C17F
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
[LINK] g++ src\build\Engine.o src\build\main.o src\build\Renderer.o src\build\Components\CameraComponent.o src\build\Components\LightComponent.o src\build\Components\PhysicsComponent.o src\build\Components\ScriptComponent.o src\build\Components\SpriteComponent.o src\build\Components\TextComonent.o src\build\Components\TilemapComponent.o src\build\Entitys\Object.o src\build\utils\EngineConfig.o src\build\utils\ExceptionHandler.o src\build\utils\FileDialog.o src\build\utils\GameObjectsList.o src\build\utils\Logging.o src\build\utils\Profiler.o src\build\utils\Shader.o src\build\utils\UID.o src\build\utils\utils.o src\build\lapi.o src\build\lauxlib.o src\build\lbaselib.o src\build\lcode.o src\build\lcorolib.o src\build\lctype.o src\build\ldblib.o src\build\ldebug.o src\build\ldo.o src\build\ldump.o src\build\lfunc.o src\build\lgc.o src\build\linit.o src\build\liolib.o src\build\llex.o src\build\lmathlib.o src\build\lmem.o src\build\loadlib.o src\build\lobject.o src\build\lopcodes.o src\build\loslib.o src\build\lparser.o src\build\lstate.o src\build\lstring.o src\build\lstrlib.o src\build\ltable.o src\build\ltablib.o src\build\ltm.o src\build\lua.o src\build\luac.o src\build\lundump.o src\build\lutf8lib.o src\build\lvm.o src\build\lzio.o src\build\imgui.o src\build\imgui_demo.o src\build\imgui_draw.o src\build\imgui_impl_glfw.o src\build\imgui_impl_opengl3.o src\build\imgui_tables.o src\build\imgui_widgets.o src\build\aabb.o src\build\arena_allocator.o src\build\array.o src\build\bitset.o src\build\body.o src\build\broad_phase.o src\build\constraint_graph.o src\build\contact.o src\build\contact_solver.o src\build\core.o src\build\distance.o src\build\distance_joint.o src\build\dynamic_tree.o src\build\geometry.o src\build\hull.o src\build\id_pool.o src\build\island.o src\build\joint.o src\build\manifold.o src\build\math_functions.o src\build\motor_joint.o src\build\mouse_joint.o src\build\mover.o src\build\prismatic_joint.o src\build\revolute_joint.o src\build\sensor.o src\build\shape.o src\build\solver.o src\build\solver_set.o src\build\table.o src\build\timer.o src\build\types.o src\build\weld_joint.o src\build\wheel_joint.o src\build\world.o -o src\build\app.exe -LC:\msys64\mingw64\lib -lglfw3 -lglew32 -lopengl32 -lgdi32 -lyaml-cpp -lcomdlg32 -lssl -lcrypto
|
||||
File diff suppressed because it is too large
Load Diff
@ -353,55 +353,56 @@ void Engine::Init()
|
||||
|
||||
Renderer::Init();
|
||||
|
||||
// auto obj = std::make_shared<Object>("Hello, Create");
|
||||
auto obj = std::make_shared<Object>("Hello, Create");
|
||||
|
||||
objects.push_back(obj);
|
||||
|
||||
selected = obj;
|
||||
|
||||
//{
|
||||
// std::random_device rd;
|
||||
// std::mt19937 rng(rd());
|
||||
// std::uniform_real_distribution<float> lightRadius(1000.0f, 2000.0f);
|
||||
// std::uniform_real_distribution<float> lightIntensity(1.0f, 3.0f);
|
||||
// std::uniform_real_distribution<float> hueDist(0.0f, 1.0f);
|
||||
//
|
||||
// const float tileSize = 1024.0f; // approximate texture size
|
||||
// const int gridSize = 10;
|
||||
//
|
||||
// // 10x10 grid of pebble sprites
|
||||
// for (int y = 0; y < gridSize; ++y)
|
||||
// {
|
||||
// for (int x = 0; x < gridSize; ++x)
|
||||
// {
|
||||
// int index = y * gridSize + x;
|
||||
// auto obj = std::make_shared<Object>("Pebble_" + std::to_string(index));
|
||||
// obj->SetLocalPosition(glm::vec2(x * tileSize, y * tileSize));
|
||||
//
|
||||
// auto sprite = obj->AddComponent<SpriteComponent>();
|
||||
// sprite->SetTexture("C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png");
|
||||
// sprite->SetNormalMap("C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png");
|
||||
// sprite->SetRenderType(SpriteComponent::RenderType::Lit);
|
||||
//
|
||||
// objects.push_back(obj);
|
||||
// selected = obj;
|
||||
|
||||
{
|
||||
std::random_device rd;
|
||||
std::mt19937 rng(rd());
|
||||
std::uniform_real_distribution<float> lightRadius(1000.0f, 2000.0f);
|
||||
std::uniform_real_distribution<float> lightIntensity(1.0f, 3.0f);
|
||||
std::uniform_real_distribution<float> hueDist(0.0f, 1.0f);
|
||||
|
||||
const float tileSize = 1024.0f; // approximate texture size
|
||||
const int gridSize = 10;
|
||||
|
||||
// 10x10 grid of pebble sprites
|
||||
for (int y = 0; y < gridSize; ++y)
|
||||
{
|
||||
for (int x = 0; x < gridSize; ++x)
|
||||
{
|
||||
int index = y * gridSize + x;
|
||||
auto obj = std::make_shared<Object>("Pebble_" + std::to_string(index));
|
||||
obj->SetLocalPosition(glm::vec2(x * tileSize, y * tileSize));
|
||||
|
||||
auto sprite = obj->AddComponent<SpriteComponent>();
|
||||
sprite->SetTexture("C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_diff_1k.png");
|
||||
sprite->SetNormalMap("C:/Users/spenc/OneDrive/Pictures/textures/ganges_river_pebbles_nor_gl_1k.png");
|
||||
sprite->SetRenderType(SpriteComponent::RenderType::Lit);
|
||||
|
||||
objects.push_back(obj);
|
||||
}
|
||||
}
|
||||
|
||||
// 100 random lights
|
||||
std::uniform_real_distribution<float> posDist(0.0f, tileSize * gridSize);
|
||||
|
||||
for (int i = 0; i < 100; ++i)
|
||||
{
|
||||
auto obj = std::make_shared<Object>("Light_" + std::to_string(i));
|
||||
obj->SetLocalPosition(glm::vec2(posDist(rng), posDist(rng)));
|
||||
|
||||
auto light = obj->AddComponent<LightComponent>();
|
||||
light->SetRadius(lightRadius(rng));
|
||||
light->SetIntensity(lightIntensity(rng));
|
||||
light->SetColor(HSVtoRGB(hueDist(rng), 0.8f, 1.0f));
|
||||
|
||||
objects.push_back(obj);
|
||||
}
|
||||
}
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // 100 random lights
|
||||
// std::uniform_real_distribution<float> posDist(0.0f, tileSize * gridSize);
|
||||
//
|
||||
// for (int i = 0; i < 100; ++i)
|
||||
// {
|
||||
// auto obj = std::make_shared<Object>("Light_" + std::to_string(i));
|
||||
// obj->SetLocalPosition(glm::vec2(posDist(rng), posDist(rng)));
|
||||
//
|
||||
// auto light = obj->AddComponent<LightComponent>();
|
||||
// light->SetRadius(lightRadius(rng));
|
||||
// light->SetIntensity(lightIntensity(rng));
|
||||
// light->SetColor(HSVtoRGB(hueDist(rng), 0.8f, 1.0f));
|
||||
//
|
||||
// objects.push_back(obj);
|
||||
// }
|
||||
//}
|
||||
|
||||
|
||||
Logger::LogVerbose("Resverving Objects");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user