Remove KRStockGeometry as its now handled by KRMeshManager
This commit is contained in:
@@ -31,7 +31,6 @@
|
|||||||
|
|
||||||
#include "KREngine-common.h"
|
#include "KREngine-common.h"
|
||||||
#include "KRCamera.h"
|
#include "KRCamera.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
#include "KRDirectionalLight.h"
|
#include "KRDirectionalLight.h"
|
||||||
#include "KRRenderPass.h"
|
#include "KRRenderPass.h"
|
||||||
|
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
#include "KRPipeline.h"
|
#include "KRPipeline.h"
|
||||||
#include "KRContext.h"
|
#include "KRContext.h"
|
||||||
#include "assert.h"
|
#include "assert.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
void KRDirectionalLight::InitNodeInfo(KrNodeInfo* nodeInfo)
|
void KRDirectionalLight::InitNodeInfo(KrNodeInfo* nodeInfo)
|
||||||
|
|||||||
@@ -39,7 +39,6 @@
|
|||||||
|
|
||||||
#include "KRPipelineManager.h"
|
#include "KRPipelineManager.h"
|
||||||
#include "KRPipeline.h"
|
#include "KRPipeline.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
#include "KRDirectionalLight.h"
|
#include "KRDirectionalLight.h"
|
||||||
#include "KRSpotLight.h"
|
#include "KRSpotLight.h"
|
||||||
#include "KRPointLight.h"
|
#include "KRPointLight.h"
|
||||||
|
|||||||
@@ -34,7 +34,6 @@
|
|||||||
#include "KRPointLight.h"
|
#include "KRPointLight.h"
|
||||||
#include "KRCamera.h"
|
#include "KRCamera.h"
|
||||||
#include "KRContext.h"
|
#include "KRContext.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
|
|
||||||
/* static */
|
/* static */
|
||||||
void KRPointLight::InitNodeInfo(KrNodeInfo* nodeInfo)
|
void KRPointLight::InitNodeInfo(KrNodeInfo* nodeInfo)
|
||||||
|
|||||||
@@ -35,7 +35,6 @@
|
|||||||
|
|
||||||
#include "KRScene.h"
|
#include "KRScene.h"
|
||||||
#include "KRNode.h"
|
#include "KRNode.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
#include "KRDirectionalLight.h"
|
#include "KRDirectionalLight.h"
|
||||||
#include "KRSpotLight.h"
|
#include "KRSpotLight.h"
|
||||||
#include "KRPointLight.h"
|
#include "KRPointLight.h"
|
||||||
|
|||||||
@@ -39,7 +39,6 @@
|
|||||||
|
|
||||||
#include "KRPipelineManager.h"
|
#include "KRPipelineManager.h"
|
||||||
#include "KRPipeline.h"
|
#include "KRPipeline.h"
|
||||||
#include "KRStockGeometry.h"
|
|
||||||
#include "KRDirectionalLight.h"
|
#include "KRDirectionalLight.h"
|
||||||
#include "KRSpotLight.h"
|
#include "KRSpotLight.h"
|
||||||
#include "KRPointLight.h"
|
#include "KRPointLight.h"
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
//
|
|
||||||
// KRStockGeometry.h
|
|
||||||
// Kraken Engine
|
|
||||||
//
|
|
||||||
// Copyright 2022 Kearwood Gilbert. All rights reserved.
|
|
||||||
//
|
|
||||||
// Redistribution and use in source and binary forms, with or without modification, are
|
|
||||||
// permitted provided that the following conditions are met:
|
|
||||||
//
|
|
||||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
|
||||||
// conditions and the following disclaimer.
|
|
||||||
//
|
|
||||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
|
||||||
// of conditions and the following disclaimer in the documentation and/or other materials
|
|
||||||
// provided with the distribution.
|
|
||||||
//
|
|
||||||
// THIS SOFTWARE IS PROVIDED BY KEARWOOD GILBERT ''AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
||||||
// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
|
||||||
// FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL KEARWOOD GILBERT OR
|
|
||||||
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
||||||
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
||||||
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
|
|
||||||
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
|
||||||
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
//
|
|
||||||
// The views and conclusions contained in the software and documentation are those of the
|
|
||||||
// authors and should not be interpreted as representing official policies, either expressed
|
|
||||||
// or implied, of Kearwood Gilbert.
|
|
||||||
//
|
|
||||||
|
|
||||||
#ifndef KRSTOCKGEOMETRY_H
|
|
||||||
#define KRSTOCKGEOMETRY_H
|
|
||||||
|
|
||||||
#include "KRMesh.h"
|
|
||||||
#include "KRDataBlock.h"
|
|
||||||
/*
|
|
||||||
static const float _KRENGINE_VBO_3D_CUBE_VERTEX_DATA[] = {
|
|
||||||
1.0, 1.0, 1.0,
|
|
||||||
-1.0, 1.0, 1.0,
|
|
||||||
1.0,-1.0, 1.0,
|
|
||||||
-1.0,-1.0, 1.0,
|
|
||||||
-1.0,-1.0,-1.0,
|
|
||||||
-1.0, 1.0, 1.0,
|
|
||||||
-1.0, 1.0,-1.0,
|
|
||||||
1.0, 1.0, 1.0,
|
|
||||||
1.0, 1.0,-1.0,
|
|
||||||
1.0,-1.0, 1.0,
|
|
||||||
1.0,-1.0,-1.0,
|
|
||||||
-1.0,-1.0,-1.0,
|
|
||||||
1.0, 1.0,-1.0,
|
|
||||||
-1.0, 1.0,-1.0
|
|
||||||
};
|
|
||||||
|
|
||||||
static KRDataBlock KRENGINE_VBO_3D_CUBE_VERTICES, KRENGINE_VBO_3D_CUBE_INDEXES;
|
|
||||||
KRENGINE_VBO_3D_CUBE_VERTICES.load((void *)_KRENGINE_VBO_3D_CUBE_VERTEX_DATA, sizeof(float) * 3 * 14);
|
|
||||||
|
|
||||||
static const __int32_t KRENGINE_VBO_3D_CUBE_ATTRIBS = (1 << KRMesh::KRENGINE_ATTRIB_VERTEX);
|
|
||||||
|
|
||||||
static const float _KRENGINE_VBO_2D_SQUARE_VERTEX_DATA[] = {
|
|
||||||
-1.0f, -1.0f, 0.0f, 0.0f, 0.0f,
|
|
||||||
1.0f, -1.0f, 0.0f, 1.0f, 0.0f,
|
|
||||||
-1.0f, 1.0f, 0.0f, 0.0f, 1.0f,
|
|
||||||
1.0f, 1.0f, 0.0f, 1.0f, 1.0f
|
|
||||||
};
|
|
||||||
|
|
||||||
static KRDataBlock KRENGINE_VBO_2D_SQUARE_VERTICES, KRENGINE_VBO_2D_SQUARE_INDEXES;
|
|
||||||
KRENGINE_VBO_2D_SQUARE_VERTICES.load((void *)_KRENGINE_VBO_2D_SQUARE_VERTEX_DATA, sizeof(float) * 5 * 4);
|
|
||||||
static const __int32_t KRENGINE_VBO_2D_SQUARE_ATTRIBS = (1 << KRMesh::KRENGINE_ATTRIB_VERTEX) | (1 << KRMesh::KRENGINE_ATTRIB_TEXUVA);
|
|
||||||
*/
|
|
||||||
#endif
|
|
||||||
Reference in New Issue
Block a user