engine update

Author: malytomas

data/ants/explosion/explosion.assets

@@ -2,14 +2,12 @@
 []
 scheme = model
 normals = false
-
 scale = 2
 particle.blend
 
 []
 scheme = texture
 target = 2dArray
-animationLoop = false
 srgb = true
 particle/burn_$$.png
 

data/ants/skybox/skybox.obj_DefaultMaterial.cpm

@@ -6,7 +6,7 @@ emission = 2
 albedo = skybox.png
 
 [render]
-shader = /cage/shader/engine/skybox.glsl
+shader = /cage/shaders/engine/skybox.glsl
 layer = -10000
 
 [flags]

externals/cage

@@ -89,23 +89,30 @@ namespace
 			camera = engineEntities()->createUnique();
 			{
 				camera->value<TransformComponent>().position = Vec3(0, 0, 200);
-				CameraComponent &c = camera->value<CameraComponent>();
-				c.near = 1;
-				c.far = 500;
-				c.ambientColor = Vec3(1);
-				c.ambientIntensity = 0.1;
-				LightComponent &l = camera->value<LightComponent>();
-				l.lightType = LightTypeEnum::Directional;
-				l.color = Vec3(1);
-				l.intensity = 3;
-				l.ssaoFactor = 1;
+				{
+					CameraComponent &c = camera->value<CameraComponent>();
+					c.near = 1;
+					c.far = 500;
+					c.ambientColor = Vec3(1);
+					c.ambientIntensity = 0.1;
+				}
+				{
+					LightComponent &l = camera->value<LightComponent>();
+					l.lightType = LightTypeEnum::Directional;
+					l.ssaoFactor = 1;
+				}
+				{
+					ColorComponent &c = camera->value<ColorComponent>();
+					c.color = Vec3(1);
+					c.intensity = 3;
+				}
 				camera->value<ScreenSpaceEffectsComponent>().effects = ScreenSpaceEffectsFlags::Default & ~ScreenSpaceEffectsFlags::AmbientOcclusion;
 				camera->value<ListenerComponent>();
 			}
 			{
 				Entity *skybox = engineEntities()->createUnique();
 				skybox->value<TransformComponent>();
-				skybox->value<RenderComponent>().object = HashString("ants/skybox/skybox.object");
+				skybox->value<ModelComponent>().model = HashString("ants/skybox/skybox.object");
 			}
 			manualCamera = newFpsCamera(camera);
 			manualCamera->freeMove = true;

sources/camera.cpp

@@ -45,9 +45,8 @@ namespace
 				t.scale = 5;
 				OwnerComponent &owner = e->value<OwnerComponent>();
 				owner.owner = p % playersCount;
-				RenderComponent &r = e->value<RenderComponent>();
-				r.object = modelNames[randomRange(0u, (uint32)(sizeof(modelNames) / sizeof(modelNames[0])))];
-				r.color = playerColors[owner.owner];
+				e->value<ModelComponent>().model = modelNames[randomRange(0u, (uint32)(sizeof(modelNames) / sizeof(modelNames[0])))];
+				e->value<ColorComponent>().color = playerColors[owner.owner];
 				e->value<PhysicsComponent>().rotation = interpolate(Quat(), randomDirectionQuat(), 0.0003);
 				e->value<LifeComponent>().life = randomRange(1000000, 2000000);
 				e->value<PlanetComponent>().batch = randomRange(3 * batchScale, 5 * batchScale);
@@ -64,9 +63,8 @@ namespace
 		t.position = planetTransform.position + randomDirection3() * (t.scale + planetTransform.scale + 1e-5);
 		t.orientation = randomDirectionQuat();
 		e->value<OwnerComponent>().owner = planet->value<OwnerComponent>().owner;
-		RenderComponent &r = e->value<RenderComponent>();
-		r.color = planet->value<RenderComponent>().color;
-		r.object = HashString("ants/ships/1/1.object");
+		e->value<ModelComponent>().model = HashString("ants/ships/1/1.object");
+		e->value<ColorComponent>().color = planet->value<ColorComponent>().color;
 		e->value<PhysicsComponent>();
 		e->value<LifeComponent>().life = randomRange(200, 300);
 		e->value<ShipComponent>().longtermTarget = target;

sources/planets.cpp

@@ -171,9 +171,8 @@ namespace
 					tr.position = o;
 					tr.orientation = Quat(d, Vec3(0, 1, 0));
 					tr.scale = l;
-					RenderComponent &r = laser->value<RenderComponent>();
-					r.object = HashString("ants/laser/laser.obj");
-					r.color = e->value<RenderComponent>().color;
+					laser->value<ModelComponent>().model = HashString("ants/laser/laser.obj");
+					laser->value<ColorComponent>().color = e->value<ColorComponent>().color;
 					laser->value<TimeoutComponent>().ttl = 1;
 				}
 			}

sources/ships.cpp

@@ -18,9 +18,10 @@ namespace
 
 	void shipExplode(Entity *ship)
 	{
-		TransformComponent &st = ship->value<TransformComponent>();
-		RenderComponent &sr = ship->value<RenderComponent>();
-		PhysicsComponent &sp = ship->value<PhysicsComponent>();
+		const TransformComponent &st = ship->value<TransformComponent>();
+		const ModelComponent &sr = ship->value<ModelComponent>();
+		const ColorComponent &sc = ship->value<ColorComponent>();
+		const PhysicsComponent &sp = ship->value<PhysicsComponent>();
 		uint32 cnt = randomRange(4, 7);
 		for (uint32 i = 0; i < cnt; i++)
 		{
@@ -29,12 +30,12 @@ namespace
 			t.scale = st.scale;
 			t.position = st.position + randomDirection3() * st.scale;
 			t.orientation = randomDirectionQuat();
-			RenderComponent &r = e->value<RenderComponent>();
-			r.object = HashString("ants/explosion/particle.blend");
-			r.color = colorVariation(sr.color);
-			r.intensity = 2;
-			TextureAnimationComponent &at = e->value<TextureAnimationComponent>();
-			at.startTime = engineControlTime();
+			ModelComponent &r = e->value<ModelComponent>();
+			r.model = HashString("ants/explosion/particle.blend");
+			ColorComponent &c = e->value<ColorComponent>();
+			c.color = colorVariation(sc.color);
+			c.intensity = 2;
+			AnimationSpeedComponent &at = e->value<AnimationSpeedComponent>();
 			at.speed = randomRange(0.7, 1.5);
 			e->value<PhysicsComponent>().velocity = randomDirection3() * t.scale * 0.07 + sp.velocity;
 			e->value<TimeoutComponent>().ttl = numeric_cast<sint32>(Real(30) / at.speed);