asset work
Some checks reported errors
studiorailgun/Renderer/pipeline/head Something is wrong with the build of this commit
|
Before Width: | Height: | Size: 937 KiB |
|
Before Width: | Height: | Size: 489 KiB |
|
Before Width: | Height: | Size: 5.4 MiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.4 KiB |
@ -63,16 +63,6 @@
|
|||||||
"diffuse" : "/Textures/katana1.png"
|
"diffuse" : "/Textures/katana1.png"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Models/tree1.fbx": [
|
|
||||||
{
|
|
||||||
"meshName" : "Cube.002",
|
|
||||||
"diffuse" : "/Textures/Branch.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "Cylinder",
|
|
||||||
"diffuse" : "/Textures/Branch.png"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"Models/goblin1.fbx" : [
|
"Models/goblin1.fbx" : [
|
||||||
{
|
{
|
||||||
"meshName" : "makehuman1",
|
"meshName" : "makehuman1",
|
||||||
@ -115,12 +105,6 @@
|
|||||||
"diffuse" : "/Textures/b1.png"
|
"diffuse" : "/Textures/b1.png"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Models/building1.fbx" : [
|
|
||||||
{
|
|
||||||
"meshName" : "Cube.001",
|
|
||||||
"diffuse" : "/Textures/building_diffuse.png"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"Models/basic/geometry/unitcylinder.fbx" : [
|
"Models/basic/geometry/unitcylinder.fbx" : [
|
||||||
{
|
{
|
||||||
"meshName" : "Cylinder",
|
"meshName" : "Cylinder",
|
||||||
@ -233,32 +217,6 @@
|
|||||||
"isDefault" : true
|
"isDefault" : true
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"Models/shrine2.fbx" : [
|
|
||||||
{
|
|
||||||
"meshName" : "Roof",
|
|
||||||
"diffuse" : "/Textures/shrine2Roof.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "MainWalls",
|
|
||||||
"diffuse" : "/Textures/shrine2MainWalls.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "Feet",
|
|
||||||
"diffuse" : "/Textures/shrine2Feet.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "Platform",
|
|
||||||
"diffuse" : "/Textures/shrine2Platform.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "SupportBeams",
|
|
||||||
"diffuse" : "/Textures/shrine2SupportBeams.png"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"meshName" : "Stairs",
|
|
||||||
"diffuse" : "/Textures/shrine2Stairs.png"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"Models/foliage/foliageBlockTemplate1Test1.fbx" : [
|
"Models/foliage/foliageBlockTemplate1Test1.fbx" : [
|
||||||
{
|
{
|
||||||
"meshName" : "Plane",
|
"meshName" : "Plane",
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 2.5 MiB |
|
Before Width: | Height: | Size: 596 B |
|
Before Width: | Height: | Size: 70 KiB |
|
Before Width: | Height: | Size: 42 KiB |
|
Before Width: | Height: | Size: 450 B |
@ -1481,6 +1481,10 @@ Fix playerless scene updates
|
|||||||
More tool recipes
|
More tool recipes
|
||||||
UI test data fixes
|
UI test data fixes
|
||||||
|
|
||||||
|
(04/15/2025)
|
||||||
|
Cull unused assets
|
||||||
|
Update default texture
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -290,10 +290,9 @@ public class Globals {
|
|||||||
public static String textureSpecularDefault;
|
public static String textureSpecularDefault;
|
||||||
public static Material materialDefault;
|
public static Material materialDefault;
|
||||||
|
|
||||||
public static String blackTexture = "Textures/b1.png";
|
public static final String blackTexture = "Textures/b1.png";
|
||||||
public static String testingTexture = "Textures/Testing1.png";
|
public static final String whiteTexture = "Textures/w1.png";
|
||||||
public static String whiteTexture = "Textures/w1.png";
|
public static final String offWhiteTexture = "Textures/ow1.png";
|
||||||
public static String offWhiteTexture = "Textures/ow1.png";
|
|
||||||
|
|
||||||
public static String imagePlaneModelID;
|
public static String imagePlaneModelID;
|
||||||
public static String solidPlaneModelID;
|
public static String solidPlaneModelID;
|
||||||
@ -616,6 +615,7 @@ public class Globals {
|
|||||||
* Texture paths to be loaded when renderer inits
|
* Texture paths to be loaded when renderer inits
|
||||||
*/
|
*/
|
||||||
private static String[] defaultTexturePaths = new String[]{
|
private static String[] defaultTexturePaths = new String[]{
|
||||||
|
AssetDataStrings.TEXTURE_DEFAULT,
|
||||||
"Textures/default_diffuse.png",
|
"Textures/default_diffuse.png",
|
||||||
"Textures/default_specular.png",
|
"Textures/default_specular.png",
|
||||||
"Textures/b1.png",
|
"Textures/b1.png",
|
||||||
@ -661,8 +661,8 @@ public class Globals {
|
|||||||
|
|
||||||
//create default material
|
//create default material
|
||||||
materialDefault = new Material();
|
materialDefault = new Material();
|
||||||
materialDefault.set_diffuse("Textures/default_diffuse.png");
|
materialDefault.set_diffuse(AssetDataStrings.TEXTURE_DEFAULT);
|
||||||
materialDefault.set_specular("Textures/default_specular.png");
|
materialDefault.set_specular(AssetDataStrings.TEXTURE_DEFAULT);
|
||||||
|
|
||||||
//create font manager
|
//create font manager
|
||||||
fontManager = new FontManager();
|
fontManager = new FontManager();
|
||||||
|
|||||||
@ -32,6 +32,7 @@ public class AssetDataStrings {
|
|||||||
* Fundamental textures of the engine
|
* Fundamental textures of the engine
|
||||||
*/
|
*/
|
||||||
public static final String TEXTURE_TEAL_TRANSPARENT = "Textures/color/transparent_teal.png";
|
public static final String TEXTURE_TEAL_TRANSPARENT = "Textures/color/transparent_teal.png";
|
||||||
|
public static final String TEXTURE_DEFAULT = "Textures/color/Testing1.png";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Atlas texture paths
|
* Atlas texture paths
|
||||||
|
|||||||